From 044f0012626bd79758169d3df6f3832af249202d Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 10 Sep 2017 22:52:12 +0200 Subject: Fixed infuser and microwave, bump version --- build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties b/build.properties index 69711f70fe..a4d1035806 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -tectech.version=3.5.0 +tectech.version=3.5.1 ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 -- cgit From 6a51c2e7a8f99e76b081a9e6fb807ff2ec485d2a Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 10 Sep 2017 23:16:40 +0200 Subject: MAke it less explodey just in case --- .../multi/GT_MetaTileEntity_MultiblockBase_EM.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java index de40e3f5e8..89b8f84253 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java @@ -202,6 +202,15 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } //RATHER LEAVE ALONE Section + protected boolean EM_areChunksAroundLoaded(){ + if(isValidMetaTileEntity(this) && getBaseMetaTileEntity().isServerSide()){ + IGregTechTileEntity base=getBaseMetaTileEntity(); + final int x=base.getXCoord(); + final int y=base.getYCoord(); + final int z=base.getZCoord(); + return base.getWorld().checkChunksExist(x-48,y-48,z-48,x+48,y+48,z+48); + }else return false; + } public GT_MetaTileEntity_MultiblockBase_EM(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -464,7 +473,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt mMachine = checkMachine(aBaseMetaTileEntity, mInventory[1]); if (!mMachine) { - if ((ePowerPass && getEUVar() > V[3]) || (eDismantleBoom && mMaxProgresstime > 0)) + if ((ePowerPass && getEUVar() > V[3]) || (eDismantleBoom && mMaxProgresstime > 0 && EM_areChunksAroundLoaded())) explodeMultiblock(); if (outputEM != null) for (cElementalInstanceStackMap tree : outputEM) @@ -1084,7 +1093,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt for (GT_MetaTileEntity_Hatch_Param hatch : eParamHatches) hatch.getBaseMetaTileEntity().setActive(false); } - if ((ePowerPass && getEUVar()>V[3]) || (eDismantleBoom && mMaxProgresstime > 0)) explodeMultiblock(); + if ((ePowerPass && getEUVar()>V[3]) || (eDismantleBoom && mMaxProgresstime > 0 && EM_areChunksAroundLoaded())) explodeMultiblock(); if (outputEM != null) for (cElementalInstanceStackMap output : outputEM) if (output.hasStacks()) explodeMultiblock(); -- cgit From a02e0b088c44694cc3b144da207657ff1fd60efc Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 10 Sep 2017 23:25:51 +0200 Subject: Change the gui a bit --- .../textures/gui/multimachines/EMDisplay.png | Bin 4601 -> 262931 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png index 441ec3b713..b2e184022e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/EMDisplay.png differ -- cgit