Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Jul 22, 2024
1 parent 349228e commit aee1e49
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,7 @@ public int fluidSlotsPerRow() {
public void startRecipeProcessing() {
if (program)
program();
shared.startRecipeProcessing();
}

@Override
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1628,6 +1631,14 @@ public class OptioanlSharedContents{
public void reinit(){

while(circuitInv.size()<circuitUpgrades)circuitInv.add(null);
}
public boolean endRecipeProcessing(GT_MetaTileEntity_MultiBlockBase controller) {

return true;
}
public void startRecipeProcessing() {


}
public void onDestroy() {IGregTechTileEntity te = getBaseMetaTileEntity();
if(circuitUpgrades>0)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/reobf/proghatches/main/MyMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
17 changes: 3 additions & 14 deletions src/main/java/reobf/proghatches/net/UpgradesMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -49,25 +50,13 @@ 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
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);
}}

0 comments on commit aee1e49

Please sign in to comment.