diff --git a/build.gradle b/build.gradle index eab70cb..6c09481 100644 --- a/build.gradle +++ b/build.gradle @@ -373,7 +373,7 @@ catch (Exception ignored) { // Pulls version first from the VERSION env and then git tag String identifiedVersion = null -String versionOverride = '0.0.17p10' +String versionOverride = '0.0.17p11' try { // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty if (versionOverride == null) { diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java index 7058bb4..5d0a96f 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java @@ -1245,6 +1245,7 @@ public int fluidSlotsPerRow() { public void startRecipeProcessing() { if (program) program(); + shared.startRecipeProcessing(); } @Override @@ -1298,6 +1299,8 @@ private void fillStacksIntoFirstSlotsExtraCircuit() { public CheckRecipeResult endRecipeProcessing(GT_MetaTileEntity_MultiBlockBase controller) { this.markDirty(); updateSlots(); + boolean success=shared.endRecipeProcessing(controller); + if(!success) return CheckRecipeResultRegistry.CRASH; return CheckRecipeResultRegistry.SUCCESSFUL; } @Override @@ -1628,6 +1631,14 @@ public class OptioanlSharedContents{ public void reinit(){ while(circuitInv.size()0) diff --git a/src/main/java/reobf/proghatches/main/MyMod.java b/src/main/java/reobf/proghatches/main/MyMod.java index b1e96fd..1c64bc0 100644 --- a/src/main/java/reobf/proghatches/main/MyMod.java +++ b/src/main/java/reobf/proghatches/main/MyMod.java @@ -164,7 +164,7 @@ public void preInit(FMLPreInitializationEvent event) { net.registerMessage(new OpenPartGuiMessage.Handler(), OpenPartGuiMessage.class, 0, Side.CLIENT); net.registerMessage(new PriorityMessage.Handler(), PriorityMessage.class, 1, Side.SERVER); net.registerMessage(new RenameMessage.Handler(), RenameMessage.class, 2, Side.SERVER); - net.registerMessage(new UpgradesMessage.Handler(), UpgradesMessage.class, 2, Side.CLIENT); + net.registerMessage(new UpgradesMessage.Handler(), UpgradesMessage.class, 3, Side.CLIENT); proxy.preInit(event); } diff --git a/src/main/java/reobf/proghatches/net/UpgradesMessage.java b/src/main/java/reobf/proghatches/net/UpgradesMessage.java index e63c26b..638b17e 100644 --- a/src/main/java/reobf/proghatches/net/UpgradesMessage.java +++ b/src/main/java/reobf/proghatches/net/UpgradesMessage.java @@ -2,6 +2,7 @@ import java.io.IOException; +import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -49,13 +50,7 @@ public void fromBytes(ByteBuf buf) { y=buf.readInt(); z=buf.readInt(); - try { - byte[] b=new byte[buf.readInt()];buf.readBytes(b); - tag=CompressedStreamTools.func_152457_a(b,new NBTSizeTracker(Integer.MAX_VALUE)); - } catch (IOException e) { - - e.printStackTrace(); - } + tag=ByteBufUtils.readTag(buf); } @Override @@ -63,11 +58,5 @@ public void toBytes(ByteBuf buf) { buf.writeInt(x); buf.writeInt(y); buf.writeInt(z); - try {byte[] b = CompressedStreamTools.compress(tag); - buf.writeInt(b.length); - buf.writeBytes(b); - } catch (IOException e) { - - e.printStackTrace(); - } + ByteBufUtils.writeTag(buf, tag); }} \ No newline at end of file