diff options
8 files changed, 21 insertions, 14 deletions
diff --git a/build.properties b/build.properties index c9ab2285a7..34ee03397c 100644 --- a/build.properties +++ b/build.properties @@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=856 -gregtech.version=5.09.32.05 +gregtech.jenkinsbuild=884 +gregtech.version=5.09.32.06 cofhcore.cf=2246/920 cofhcore.version=[1.7.10]3.0.3-303-dev cofhlib.cf=2246/918 diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java index 97c1c8c98f..ea34530057 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalDefinition.java @@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; * Created by danie_000 on 11.11.2016. */ public interface iElementalDefinition extends Comparable<iElementalDefinition>,Cloneable {//IMMUTABLE - float stableRawLifeTime=1.5e25f; + float STABLE_RAW_LIFE_TIME =1.5e25f; //Nomenclature String getName(); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java index 0c4278a344..be4e5150df 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dAtomDefinition.java @@ -143,13 +143,13 @@ public final class dAtomDefinition extends cElementalDefinition { else rawLifeTimeTemp= calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti); - this.rawLifeTime=rawLifeTimeTemp>stableRawLifeTime?stableRawLifeTime:rawLifeTimeTemp; + this.rawLifeTime=rawLifeTimeTemp> STABLE_RAW_LIFE_TIME ? STABLE_RAW_LIFE_TIME :rawLifeTimeTemp; if (izoDiff == 0) this.decayMode = 0; else this.decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4); - this.stable = this.rawLifeTime>=stableRawLifeTime; + this.stable = this.rawLifeTime>= STABLE_RAW_LIFE_TIME; } private static int stableIzoCurve(int element) { @@ -517,7 +517,7 @@ public final class dAtomDefinition extends cElementalDefinition { final int izoDiff = isotope - StableIsotope; final int izoDiffAbs = Math.abs(izoDiff); final float rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false); - if (rawLifeTime>=stableRawLifeTime) { + if (rawLifeTime>= STABLE_RAW_LIFE_TIME) { TreeSet<Integer> isotopes = stableIsotopes.get(element); if (isotopes == null) stableIsotopes.put(element, isotopes = new TreeSet<>()); isotopes.add(isotope); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java index 88c5148c21..d473abcb6d 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/dHadronDefinition.java @@ -89,7 +89,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi int mult = this.amount * this.amount * (this.amount - 1); this.mass = mass * 5.543F * (float) mult;//yes it becomes heavier - if (this.mass == protonMass && this.amount == 3) this.rawLifeTime = stableRawLifeTime; + if (this.mass == protonMass && this.amount == 3) this.rawLifeTime = STABLE_RAW_LIFE_TIME; else if (this.mass == neutronMass && this.amount == 3) this.rawLifeTime = 882F; else { if (this.amount == 3) { diff --git a/src/main/java/com/github/technus/tectech/loader/AtomOverrider.java b/src/main/java/com/github/technus/tectech/loader/AtomOverrider.java index 112cb793ad..34bbbf4d93 100644 --- a/src/main/java/com/github/technus/tectech/loader/AtomOverrider.java +++ b/src/main/java/com/github/technus/tectech/loader/AtomOverrider.java @@ -6,7 +6,7 @@ import com.github.technus.tectech.elementalMatter.definitions.complex.dAtomDefin import com.github.technus.tectech.elementalMatter.definitions.complex.dHadronDefinition; import com.github.technus.tectech.elementalMatter.definitions.primitive.eLeptonDefinition; -import static com.github.technus.tectech.elementalMatter.core.interfaces.iElementalDefinition.stableRawLifeTime; +import static com.github.technus.tectech.elementalMatter.core.interfaces.iElementalDefinition.STABLE_RAW_LIFE_TIME; import static com.github.technus.tectech.elementalMatter.definitions.complex.dAtomDefinition.addOverride; /** @@ -20,13 +20,13 @@ public class AtomOverrider implements Runnable{ new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 2), dHadronDefinition.hadron_p2, new cElementalDefinitionStack(dHadronDefinition.hadron_n, 3) - ), stableRawLifeTime);//He3 + ), STABLE_RAW_LIFE_TIME);//He3 addOverride(new dAtomDefinition( eLeptonDefinition.lepton_e1, dHadronDefinition.hadron_p1, dHadronDefinition.hadron_n1 - ), stableRawLifeTime);//D + ), STABLE_RAW_LIFE_TIME);//D addOverride(new dAtomDefinition( eLeptonDefinition.lepton_e1, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java index a5afef3024..9395d5de37 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java @@ -20,7 +20,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; import static com.github.technus.tectech.Util.VN; -import static com.github.technus.tectech.elementalMatter.core.interfaces.iElementalDefinition.stableRawLifeTime; +import static com.github.technus.tectech.elementalMatter.core.interfaces.iElementalDefinition.STABLE_RAW_LIFE_TIME; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; @@ -112,7 +112,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase @Override public boolean checkRecipe_EM(ItemStack itemStack) { cElementalInstanceStackMap map= getInputsClone_EM(); - if(map!=null && map.hasStacks() && map.getFirst().getLifeTime()<stableRawLifeTime){ + if(map!=null && map.hasStacks() && map.getFirst().getLifeTime()< STABLE_RAW_LIFE_TIME){ return startRecipe(map.getFirst()); } mEfficiencyIncrease = 0; 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 3596b9128b..97f8a8607b 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 @@ -1080,13 +1080,14 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt @Override public final void explodeMultiblock() { if(explodedThisTick)return; - extraExplosions_EM(); + explodedThisTick=true; if (!TecTech.ModConfig.BOOM_ENABLE) { TecTech.proxy.broadcast("Multi Explode BOOM! " + getBaseMetaTileEntity().getXCoord() + " " + getBaseMetaTileEntity().getYCoord() + " " + getBaseMetaTileEntity().getZCoord()); StackTraceElement[] ste = Thread.currentThread().getStackTrace(); TecTech.proxy.broadcast("Multi Explode BOOM! " + ste[2].toString()); return; } + extraExplosions_EM(); GT_Pollution.addPollution(getBaseMetaTileEntity(), 600000); mInventory[1] = null; for (MetaTileEntity tTileEntity : mInputBusses) tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); @@ -1107,12 +1108,12 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt for (MetaTileEntity tTileEntity : eInputData) tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); for (MetaTileEntity tTileEntity : eOutputData) tTileEntity.getBaseMetaTileEntity().doExplosion(V[9]); getBaseMetaTileEntity().doExplosion(V[15]); - explodedThisTick=true; } @Override public void doExplosion(long aExplosionPower) { explodeMultiblock(); + super.doExplosion(aExplosionPower); }//Redirecting to explodemultiblock @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo index 72adab9050..e24b3ff4c9 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo @@ -22,3 +22,9 @@ BlockFakeLight.java for turrets: floodlightb + + + +fix eu/t checks if needs maintenance!!! + +make microwave grinder cap autosmelting based on power |