Skip to content

Commit d99a561

Browse files
marcin212marcin212
committedAug 14, 2017
Update to 1.12.1
·
inb4release
1 parent b0a3231 commit d99a561

File tree

11 files changed

+81
-46
lines changed

11 files changed

+81
-46
lines changed
 

Diff for: ‎build.gradle

+9-7
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,27 @@ buildscript {
1111
}
1212
}
1313
dependencies {
14-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
14+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
1515
}
1616
}
1717

1818
apply plugin: 'net.minecraftforge.gradle.forge'
1919

20-
21-
def simpleVersion = "1.5.3"
20+
// java version
21+
sourceCompatibility = "1.8"
22+
targetCompatibility = "1.8"
23+
def simpleVersion = "1.5.4"
2224

2325
group= "com.bymarcin.openglasses" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
24-
archivesBaseName = "OpenGlasses-MC1.11.2"
26+
archivesBaseName = "OpenGlasses-MC1.12.1"
2527
version = simpleVersion
2628

2729
minecraft {
2830
replaceIn "com/bymarcin/openglasses/OpenGlasses.java"
2931
replace "@VERSION@", simpleVersion
3032
runDir = "run"
31-
version = "13.20.0.2366"
32-
mappings = "snapshot_20170323"
33+
version = "14.22.0.2453"
34+
mappings = "snapshot_20170806"
3335
}
3436

3537
runClient {
@@ -44,7 +46,7 @@ repositories {
4446
maven { url = "http://maven.cil.li/" }
4547
}
4648
dependencies {
47-
provided "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.32"
49+
provided "li.cil.oc:OpenComputers:MC1.12.1-1.7.0.4"
4850
}
4951

5052
processResources

Diff for: ‎src/main/java/com/bymarcin/openglasses/OpenGlasses.java

+59-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.bymarcin.openglasses;
22

3+
import java.util.Arrays;
4+
35
import com.bymarcin.openglasses.block.OpenGlassesTerminalBlock;
46
import com.bymarcin.openglasses.item.OpenGlassesItem;
57
import com.bymarcin.openglasses.network.NetworkRegistry;
@@ -9,20 +11,33 @@
911
import com.bymarcin.openglasses.proxy.CommonProxy;
1012
import com.bymarcin.openglasses.tileentity.OpenGlassesTerminalTileEntity;
1113
import li.cil.oc.api.Items;
14+
15+
import net.minecraft.block.Block;
1216
import net.minecraft.creativetab.CreativeTabs;
1317
import net.minecraft.item.Item;
1418
import net.minecraft.item.ItemBlock;
1519
import net.minecraft.item.ItemStack;
20+
import net.minecraft.item.crafting.IRecipe;
21+
import net.minecraft.item.crafting.ShapedRecipes;
22+
import net.minecraft.util.NonNullList;
23+
import net.minecraft.util.ResourceLocation;
24+
25+
import net.minecraftforge.client.event.ModelRegistryEvent;
26+
import net.minecraftforge.common.MinecraftForge;
1627
import net.minecraftforge.common.config.Configuration;
28+
import net.minecraftforge.event.RegistryEvent;
1729
import net.minecraftforge.fml.common.Mod;
1830
import net.minecraftforge.fml.common.Mod.EventHandler;
1931
import net.minecraftforge.fml.common.Mod.Instance;
2032
import net.minecraftforge.fml.common.SidedProxy;
2133
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
2234
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
2335
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
36+
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
2437
import net.minecraftforge.fml.common.registry.GameRegistry;
2538
import net.minecraftforge.fml.relauncher.Side;
39+
import net.minecraftforge.oredict.ShapedOreRecipe;
40+
2641
import org.apache.logging.log4j.LogManager;
2742
import org.apache.logging.log4j.Logger;
2843

@@ -45,6 +60,7 @@ public class OpenGlasses
4560

4661
public static Item openGlasses;
4762
public static OpenGlassesTerminalBlock openTerminal;
63+
public static Item openTerminalItem;
4864

4965
public static int energyBuffer = 100;
5066
public static double energyMultiplier = 1;
@@ -53,24 +69,61 @@ public class OpenGlasses
5369
@EventHandler
5470
public void preInit(FMLPreInitializationEvent event)
5571
{
72+
MinecraftForge.EVENT_BUS.register(this);
5673
config = new Configuration(event.getSuggestedConfigurationFile());
5774
config.load();
5875
NetworkRegistry.initialize();
5976
energyBuffer = config.get("Energy", "energyBuffer", 100).getInt(100);
6077
energyMultiplier = config.get("Energy", "energyMultiplier", 1.0, "PowerDrain= (NumberOfWidgets / 10) * energyMultiplier").getDouble(1.0);
6178

6279

63-
openTerminal = GameRegistry.register(new OpenGlassesTerminalBlock());
64-
Item i = GameRegistry.register(new ItemBlock(openTerminal).setRegistryName(openTerminal.getRegistryName()));
65-
proxy.registermodel(i, 0);
80+
openTerminal = new OpenGlassesTerminalBlock();
81+
openTerminalItem = new ItemBlock(openTerminal).setRegistryName(openTerminal.getRegistryName());
82+
6683

6784

6885
GameRegistry.registerTileEntity(OpenGlassesTerminalTileEntity.class, "openglassesterminalte");
6986

70-
GameRegistry.register(openGlasses = new OpenGlassesItem());
71-
proxy.registermodel(openGlasses, 0);
87+
openGlasses = new OpenGlassesItem();
88+
7289
proxy.init();
7390
}
91+
92+
@SubscribeEvent
93+
public void registerBlocks(RegistryEvent.Register<Block> event) {
94+
event.getRegistry().register(openTerminal);
95+
}
96+
97+
@SubscribeEvent
98+
public void registerModels(ModelRegistryEvent event) {
99+
proxy.registermodel(openTerminalItem, 0);
100+
proxy.registermodel(openGlasses, 0);
101+
}
102+
103+
@SubscribeEvent
104+
public void registerItems(RegistryEvent.Register<Item> event) {
105+
event.getRegistry().register(openTerminalItem);
106+
event.getRegistry().register(openGlasses);
107+
108+
}
109+
110+
@SubscribeEvent
111+
public void registerRecipes(RegistryEvent.Register<IRecipe> event) {
112+
ItemStack ram = Items.get("ram5").createItemStack(1);
113+
ItemStack graphics = Items.get("graphicscard3").createItemStack(1);
114+
ItemStack wlanCard = Items.get("wlancard").createItemStack(1);
115+
ItemStack server = Items.get("geolyzer").createItemStack(1);
116+
ItemStack screen = Items.get("screen3").createItemStack(1);
117+
ItemStack cpu = Items.get("cpu3").createItemStack(1);
118+
119+
ShapedOreRecipe r1 = new ShapedOreRecipe(new ResourceLocation(OpenGlasses.MODID, "openglasses"), new ItemStack(openGlasses), "SCS", " W ", " ", 'S', screen, 'W', wlanCard, 'C', graphics);
120+
ShapedOreRecipe r2 = new ShapedOreRecipe(new ResourceLocation(OpenGlasses.MODID, "openterminal"), new ItemStack(openTerminal), "R ", "S ", "M ", 'S', server, 'R', ram, 'M', cpu);
121+
r1.setRegistryName(OpenGlasses.MODID, "openglasses");
122+
r2.setRegistryName(OpenGlasses.MODID, "openterminal");
123+
event.getRegistry().register(r1);
124+
event.getRegistry().register(r2);
125+
}
126+
74127

75128
@EventHandler
76129
public void init(FMLInitializationEvent event)
@@ -85,15 +138,7 @@ public void init(FMLInitializationEvent event)
85138
@EventHandler
86139
public void postInit(FMLPostInitializationEvent event)
87140
{
88-
ItemStack ram= Items.get("ram5").createItemStack(1);
89-
ItemStack graphics = Items.get("graphicscard3").createItemStack(1);
90-
ItemStack wlanCard = Items.get("wlancard").createItemStack(1);
91-
ItemStack server = Items.get("geolyzer").createItemStack(1);
92-
ItemStack screen = Items.get("screen3").createItemStack(1);
93-
ItemStack cpu = Items.get("cpu3").createItemStack(1);
94-
95-
GameRegistry.addRecipe(new ItemStack(openGlasses),"SCS"," W "," ", 'S', screen, 'W', wlanCard, 'C', graphics);
96-
GameRegistry.addRecipe(new ItemStack(openTerminal),"R ","S ","M ", 'S', server, 'R', ram, 'M', cpu);
141+
97142

98143
config.save();
99144
}

Diff for: ‎src/main/java/com/bymarcin/openglasses/item/OpenGlassesItem.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package com.bymarcin.openglasses.item;
22

3+
import javax.annotation.Nullable;
34
import java.util.List;
45

6+
import net.minecraft.client.util.ITooltipFlag;
57
import net.minecraft.entity.Entity;
68
import net.minecraft.entity.player.EntityPlayer;
79
import net.minecraft.inventory.EntityEquipmentSlot;
810
import net.minecraft.item.ItemArmor;
911
import net.minecraft.item.ItemStack;
1012
import net.minecraft.nbt.NBTTagCompound;
1113
import net.minecraft.util.math.BlockPos;
14+
import net.minecraft.world.World;
1215

1316
import net.minecraftforge.fml.relauncher.Side;
1417
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -40,16 +43,15 @@ public static Location getUUID(ItemStack itemStack){
4043
return new Location(new BlockPos(tag.getInteger("X"),tag.getInteger("Y"),tag.getInteger("Z")),tag.getInteger("DIM"), tag.getLong("uniqueKey"));
4144
}
4245

43-
@Override
4446
@SideOnly(Side.CLIENT)
45-
@SuppressWarnings({ "unchecked", "rawtypes" })
46-
public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) {
47-
super.addInformation(itemStack, player, list, par4);
48-
Location uuid = getUUID(itemStack);
47+
@Override
48+
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
49+
super.addInformation(stack, worldIn, tooltip, flagIn);
50+
Location uuid = getUUID(stack);
4951
if (uuid != null){
50-
list.add("Link to:");
52+
tooltip.add("Link to:");
5153
for(String s : uuid.toArrayString()){
52-
list.add(s);
54+
tooltip.add(s);
5355
}
5456
}
5557
}

Diff for: ‎src/main/java/com/bymarcin/openglasses/network/Utils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static TileEntity getTileEntity(int dimensionId, BlockPos pos) {
1717
}
1818

1919
public static TileEntity getTileEntityServer(int dimensionId, BlockPos pos) {
20-
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(dimensionId);
20+
World world = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(dimensionId);
2121
if (world == null)
2222
return null;
2323
return world.getTileEntity(pos);

Diff for: ‎src/main/java/com/bymarcin/openglasses/network/packet/GlassesEventPacket.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected IMessage executeOnServer() {
110110
terminal.sendInteractEvent(eventType.name(),
111111
playerMP.getName(),
112112
playerMP.posX, playerMP.posY, playerMP.posZ,
113-
look.xCoord, look.yCoord, look.zCoord,
113+
look.x, look.y, look.z,
114114
playerMP.getEyeHeight()
115115
);
116116
break;

Diff for: ‎src/main/java/com/bymarcin/openglasses/proxy/CommonProxy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void init() {
1616
}
1717

1818
public World getWorld(int dimensionId) {
19-
return FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(dimensionId);
19+
return FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(dimensionId);
2020
}
2121

2222
public int getCurrentClientDimension() {

Diff for: ‎src/main/java/com/bymarcin/openglasses/surface/widgets/component/face/Dot.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package com.bymarcin.openglasses.surface.widgets.component.face;
22

33
import io.netty.buffer.ByteBuf;
4-
5-
import net.minecraft.client.renderer.Tessellator;
6-
import net.minecraft.client.renderer.VertexBuffer;
7-
import net.minecraft.client.renderer.vertex.VertexFormat;
84
import net.minecraft.entity.player.EntityPlayer;
95

106
import net.minecraftforge.fml.relauncher.Side;

Diff for: ‎src/main/java/com/bymarcin/openglasses/surface/widgets/component/face/Quad.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package com.bymarcin.openglasses.surface.widgets.component.face;
22

33
import io.netty.buffer.ByteBuf;
4-
5-
import net.minecraft.client.renderer.Tessellator;
6-
import net.minecraft.client.renderer.VertexBuffer;
7-
import net.minecraft.client.renderer.vertex.VertexFormat;
84
import net.minecraft.entity.player.EntityPlayer;
95

106
import net.minecraftforge.fml.relauncher.Side;

Diff for: ‎src/main/java/com/bymarcin/openglasses/surface/widgets/component/face/SquareWidget.java

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import io.netty.buffer.ByteBuf;
44

5-
import net.minecraft.client.renderer.Tessellator;
6-
import net.minecraft.client.renderer.VertexBuffer;
7-
import net.minecraft.client.renderer.vertex.VertexFormat;
85
import net.minecraft.entity.player.EntityPlayer;
96

107
import net.minecraftforge.fml.relauncher.Side;

Diff for: ‎src/main/java/com/bymarcin/openglasses/surface/widgets/component/face/TriangleWidget.java

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import io.netty.buffer.ByteBuf;
44

5-
import net.minecraft.client.renderer.Tessellator;
6-
import net.minecraft.client.renderer.VertexBuffer;
7-
import net.minecraft.client.renderer.vertex.VertexFormat;
85
import net.minecraft.entity.player.EntityPlayer;
96

107
import net.minecraftforge.fml.relauncher.Side;

Diff for: ‎src/main/java/com/bymarcin/openglasses/utils/Location.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public String[] toArrayString() {
4545
}
4646

4747
public TileEntity getTileEntity(){
48-
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(dimID);
48+
World world = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(dimID);
4949
if(world==null)
5050
return null;
5151
return world.getTileEntity(new BlockPos(x, y, z));

0 commit comments

Comments
 (0)
Please sign in to comment.