diff options
15 files changed, 121 insertions, 97 deletions
diff --git a/build.properties b/build.properties index 90f22aff3f..ae249c84ff 100644 --- a/build.properties +++ b/build.properties @@ -1,10 +1,10 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -tectech.version=3.3.1 +tectech.version=3.3.3 ic2.version=2.2.790-experimental nei.version=1.0.3.74 -gregtech.jenkinsbuild=377 -gregtech.version=5.09.27.27 +gregtech.jenkinsbuild=392 +gregtech.version=5.09.27.34 yamcore.version=0.5.70
\ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/GT_CustomLoader.java b/src/main/java/com/github/technus/tectech/GT_CustomLoader.java index 918725f759..8026b4b6e2 100644 --- a/src/main/java/com/github/technus/tectech/GT_CustomLoader.java +++ b/src/main/java/com/github/technus/tectech/GT_CustomLoader.java @@ -11,13 +11,16 @@ public class GT_CustomLoader { public void run() { ElementalCasing = new GT_Loader_CasingsTT(); - ElementalLoader = new GT_Loader_Machines(); ElementalCasing.run(); + TecTech.Logger.info("Casing Init Done"); + ElementalLoader = new GT_Loader_Machines(); ElementalLoader.run(); + TecTech.Logger.info("Machine Init Done"); } public void run2() { ElementalRecipes = new GT_Loader_Recipes(); ElementalRecipes.run(); + TecTech.Logger.info("Recipe Init Done Done"); } } diff --git a/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java b/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java index f11bd7f3ff..2bda0b6c64 100644 --- a/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java +++ b/src/main/java/com/github/technus/tectech/GT_Loader_Machines.java @@ -1,6 +1,7 @@ package com.github.technus.tectech; import com.github.technus.tectech.elementalMatter.machine.*; +import org.apache.logging.log4j.Level; /** * Created by danie_000 on 16.11.2016. @@ -193,7 +194,5 @@ public class GT_Loader_Machines implements Runnable { // EM pipe // =================================================================================================== CustomItemList.EMpipe.set(new GT_MetaTileEntity_EMpipe(12179,"pipe.elementalmatter","Quantum tunnel").getStackForm(1L)); - - //System.out.println("ELEMENTAL INIT DONE"); } } diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index e281d9411a..7a0f5c51ca 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -50,7 +50,6 @@ public class TecTech { @EventHandler public void PreLoad(FMLPreInitializationEvent PreEvent) { Logger.setDebugOutput(true); - Rnd = new XSTR(); //ItemManager = new ModItemManager(Refstrings.MODID); diff --git a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java index 4613bc193f..ae005b1b94 100644 --- a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java +++ b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java @@ -26,7 +26,7 @@ public class TecTechConfig extends ConfigManager { ModAdminErrorLogs_Enabled = _mainConfig.getBoolean("AdminErrorLog", "Modules", ModAdminErrorLogs_Enabled, "If set to true, every op/admin will receive all errors occoured during the startup phase as ingame message on join"); DEBUG_MODE=_mainConfig.getBoolean("DebugPrint", "Debug", DEBUG_MODE, - "Enables logging into System.out"); + "Enables logging"); BOOM_ENABLE=_mainConfig.getBoolean("BoomEnable","Features", BOOM_ENABLE, "Set to false to disable explosions on everything bad that you can do (this will not be available after release)"); } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java index 55048c9547..98b84d9446 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java @@ -7,6 +7,7 @@ import gregtech.api.objects.XSTR; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import org.apache.logging.log4j.Level; import java.util.*; @@ -459,7 +460,7 @@ public final class dAtomDefinition extends cElementalDefinition { } //populate stable isotopes el: - for(int element=1;element<84;element++) + for(int element=1;element<84;element++)//Up to Astatine exclusive for(int isotope=0;isotope<130;isotope++){ xstr.setSeed((long) (element+1)*(isotope+100)); //stability curve @@ -475,7 +476,7 @@ public final class dAtomDefinition extends cElementalDefinition { } for(int element=84;element<150;element++) - for(int isotope=0;isotope<180;isotope++){ + for(int isotope=100;isotope<180;isotope++){ xstr.setSeed((long) (element+1)*(isotope+100)); //stability curve final int Isotope = stableIzoCurve(element); @@ -494,7 +495,7 @@ public final class dAtomDefinition extends cElementalDefinition { new cElementalDefinitionStack(dHadronDefinition.hadron_n,stableIsotopes.get(key).first()), new cElementalDefinitionStack(eLeptonDefinition.lepton_e,key))); if(TecTech.ModConfig.DEBUG_MODE) - System.out.println("Added Stable Atom:"+key+" "+stableIsotopes.get(key).first()+" "+stableAtoms.get(key).getMass()); + TecTech.Logger.info("Added Stable Atom:"+key+" "+stableIsotopes.get(key).first()+" "+stableAtoms.get(key).getMass()); } for(int key:mostStableUnstableIsotopes.keySet()){ unstableAtoms.put(key,new dAtomDefinition( @@ -502,7 +503,7 @@ public final class dAtomDefinition extends cElementalDefinition { new cElementalDefinitionStack(dHadronDefinition.hadron_n,mostStableUnstableIsotopes.get(key).lastEntry().getValue()), new cElementalDefinitionStack(eLeptonDefinition.lepton_e,key))); if(TecTech.ModConfig.DEBUG_MODE) - System.out.println("Added Unstable Atom:"+key+" "+mostStableUnstableIsotopes.get(key).lastEntry().getValue()+" "+unstableAtoms.get(key).getMass()); + TecTech.Logger.info("Added Unstable Atom:"+key+" "+mostStableUnstableIsotopes.get(key).lastEntry().getValue()+" "+unstableAtoms.get(key).getMass()); } alfa = new cElementalDefinitionStack( new dAtomDefinition( diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMdequantifier.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMdequantifier.java index aaa982e1d9..a8589a5eb5 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMdequantifier.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMdequantifier.java @@ -29,22 +29,21 @@ public class GT_MetaTileEntity_EMdequantifier extends GT_MetaTileEntity_Multiblo @Override public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir)!= QuantumGlass.INSTANCE) { - return false; - } + if (iGregTechTileEntity.getBlockOffset(xDir, yDir, zDir)!= QuantumGlass.INSTANCE) return false; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 2; h++) { - if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { - IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((i!=0 || j!=0 || h!=0)/*exclude center*/&&(xDir+i!=0 || yDir+h!=0 || zDir+j!=0)/*exclude this*/) { + IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, yDir + h, zDir + j); if ( (!addMaintenanceToMachineList(tTileEntity, 99)) && (!addElementalInputToMachineList(tTileEntity, 99)) && (!addClassicOutputToMachineList(tTileEntity, 99)) && (!addMufflerToMachineList(tTileEntity, 99)) && (!addEnergyIOToMachineList(tTileEntity, 99))) { - if ( iGregTechTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GT_Container_CasingsTT.sBlockCasingsTT || - iGregTechTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 3) { + if ( iGregTechTileEntity.getBlockOffset(xDir + i, yDir + h, zDir + j) != GT_Container_CasingsTT.sBlockCasingsTT || + iGregTechTileEntity.getMetaIDOffset(xDir + i, yDir + h, zDir + j) != 3) { return false; } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java index a413648483..031f01c816 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMjunction.java @@ -30,22 +30,21 @@ public class GT_MetaTileEntity_EMjunction extends GT_MetaTileEntity_MultiblockBa @Override public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir)!= QuantumGlass.INSTANCE) { - return false; - } + if (iGregTechTileEntity.getBlockOffset(xDir, yDir, zDir)!= QuantumGlass.INSTANCE) return false; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 2; h++) { - if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { - IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((i!=0 || j!=0 || h!=0)/*exclude center*/&&(xDir+i!=0 || yDir+h!=0 || zDir+j!=0)/*exclude this*/) { + IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, yDir + h, zDir + j); if ( (!addMaintenanceToMachineList(tTileEntity, 99)) && (!addElementalInputToMachineList(tTileEntity, 99)) && (!addElementalOutputToMachineList(tTileEntity, 99)) && (!addMufflerToMachineList(tTileEntity, 99)) && (!addEnergyIOToMachineList(tTileEntity, 99))) { - if ( iGregTechTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GT_Container_CasingsTT.sBlockCasingsTT || - iGregTechTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 3) { + if ( iGregTechTileEntity.getBlockOffset(xDir + i, yDir + h, zDir + j) != GT_Container_CasingsTT.sBlockCasingsTT || + iGregTechTileEntity.getMetaIDOffset(xDir + i, yDir + h, zDir + j) != 3) { return false; } } @@ -90,7 +89,7 @@ public class GT_MetaTileEntity_EMjunction extends GT_MetaTileEntity_MultiblockBa for(GT_MetaTileEntity_Hatch_InputElemental in: eInputHatches) if(in.getContainerHandler().hasStacks()) { mEUt=-(int)V[9]; - eAmpereRating =1+((eInputHatches.size()+eOutputHatches.size())>>1); + eAmpereFlow =1+((eInputHatches.size()+eOutputHatches.size())>>1); mMaxProgresstime=20; mEfficiencyIncrease=10000; return true; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMquantifier.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMquantifier.java index be96250b3f..9ce5d6a88a 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMquantifier.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMquantifier.java @@ -52,22 +52,21 @@ public class GT_MetaTileEntity_EMquantifier extends GT_MetaTileEntity_Multiblock @Override public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir)!= QuantumGlass.INSTANCE) { - return false; - } + if (iGregTechTileEntity.getBlockOffset(xDir, yDir, zDir)!= QuantumGlass.INSTANCE) return false; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 2; h++) { - if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { - IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((i!=0 || j!=0 || h!=0)/*exclude center*/&&(xDir+i!=0 || yDir+h!=0 || zDir+j!=0)/*exclude this*/) { + IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, yDir + h, zDir + j); if ( (!addMaintenanceToMachineList(tTileEntity, 99)) && (!addClassicInputToMachineList(tTileEntity, 99)) && (!addElementalOutputToMachineList(tTileEntity, 99)) && (!addMufflerToMachineList(tTileEntity, 99)) && (!addEnergyIOToMachineList(tTileEntity, 99))) { - if ( iGregTechTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GT_Container_CasingsTT.sBlockCasingsTT || - iGregTechTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 3) { + if ( iGregTechTileEntity.getBlockOffset(xDir + i, yDir + h, zDir + j) != GT_Container_CasingsTT.sBlockCasingsTT || + iGregTechTileEntity.getMetaIDOffset(xDir + i, yDir + h, zDir + j) != 3) { return false; } } @@ -94,7 +93,7 @@ public class GT_MetaTileEntity_EMquantifier extends GT_MetaTileEntity_Multiblock if (inI.length > 0) { for (ItemStack is : inI) { if(TecTech.ModConfig.DEBUG_MODE) - System.out.println(is.getItem().getUnlocalizedName()+"."+is.getItemDamage()); + TecTech.Logger.info("Quantifier-recipe "+is.getItem().getUnlocalizedName()+"."+is.getItemDamage()); cElementalDefinitionStack into = itemBinds.get(is.getItem().getUnlocalizedName()+"."+is.getItemDamage()); if (into != null && isInputEqual(true, false, nothingF, new ItemStack[]{new ItemStack(is.getItem(),1,is.getItemDamage())}, null, inI)) { @@ -102,7 +101,7 @@ public class GT_MetaTileEntity_EMquantifier extends GT_MetaTileEntity_Multiblock mEfficiencyIncrease=10000; float mass = into.getMass(); float euMult = mass / refMass; - eAmpereRating = (int) Math.ceil(euMult); + eAmpereFlow = (int) Math.ceil(euMult); if (mass > refUnstableMass) { mEUt = (int) -V[9]; } else { @@ -124,7 +123,7 @@ public class GT_MetaTileEntity_EMquantifier extends GT_MetaTileEntity_Multiblock mEfficiencyIncrease=10000; float mass = into.getMass(); float euMult = mass / refMass; - eAmpereRating = (int) Math.ceil(euMult); + eAmpereFlow = (int) Math.ceil(euMult); if (mass > refUnstableMass) { mEUt = (int) -V[9]; } else { @@ -153,7 +152,7 @@ public class GT_MetaTileEntity_EMquantifier extends GT_MetaTileEntity_Multiblock private static String getItem(OrePrefixes prefix, Materials material){ if(TecTech.ModConfig.DEBUG_MODE) - System.out.println(material.name()+" "+GT_OreDictUnificator.get(prefix, material, 1L).getUnlocalizedName()); + TecTech.Logger.info("Quantifier-init "+material.name()+" "+GT_OreDictUnificator.get(prefix, material, 1L).getUnlocalizedName()); return GT_OreDictUnificator.get(prefix, material, 1L).getUnlocalizedName(); } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMtransformer.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMtransformer.java index 34f5af0bbb..ce65ea205a 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMtransformer.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_EMtransformer.java @@ -41,16 +41,17 @@ public class GT_MetaTileEntity_EMtransformer extends GT_MetaTileEntity_Multibloc @Override public boolean checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir)!=sBlockCasingsTT || iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir)!=6) return false; + if (iGregTechTileEntity.getBlockOffset(xDir, yDir, zDir)!=sBlockCasingsTT || iGregTechTileEntity.getMetaIDOffset(xDir, yDir, zDir)!=6) return false; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int h = -1; h < 2; h++) { - if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { - IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); + if ((i!=0 || j!=0 || h!=0)/*exclude center*/&&(xDir+i!=0 || yDir+h!=0 || zDir+j!=0)/*exclude this*/) { + IGregTechTileEntity tTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir + i, yDir + h, zDir + j); if (!addEnergyIOToMachineList(tTileEntity, 99)) { - if ( iGregTechTileEntity.getBlockOffset(xDir + i, h, zDir + j) != sBlockCasingsTT || - iGregTechTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 3) { + if ( iGregTechTileEntity.getBlockOffset(xDir + i, yDir + h, zDir + j) != sBlockCasingsTT || + iGregTechTileEntity.getMetaIDOffset(xDir + i, yDir + h, zDir + j) != 3) { return false; } } @@ -81,7 +82,7 @@ public class GT_MetaTileEntity_EMtransformer extends GT_MetaTileEntity_Multibloc mEfficiencyIncrease=0; mMaxProgresstime=0; } - eAmpereRating=0; + eAmpereFlow =0; mEUt=0; eDismatleBoom=ePowerPass; return ePowerPass; @@ -99,4 +100,9 @@ public class GT_MetaTileEntity_EMtransformer extends GT_MetaTileEntity_Multibloc ePowerPass = aBaseMetaTileEntity.isAllowedToWork(); } } + + @Override + public boolean doRandomMaintenanceDamage() { + return true; + } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java index c2650d49f8..ff237108d8 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -102,7 +102,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta }else { if(deathDelay==2) { if (TecTech.ModConfig.BOOM_ENABLE && TecTech.Rnd.nextInt(10)==0) aBaseMetaTileEntity.setOnFire(); - else System.out.println("FIRE! " + getBaseMetaTileEntity().getXCoord() + " " + getBaseMetaTileEntity().getYCoord() + " " + getBaseMetaTileEntity().getZCoord()); + else TecTech.proxy.broadcast("FIRE! " + getBaseMetaTileEntity().getXCoord() + " " + getBaseMetaTileEntity().getYCoord() + " " + getBaseMetaTileEntity().getZCoord()); }else if(deathDelay==1) { IGregTechTileEntity tGTTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()); if (tGTTileEntity == null || !(tGTTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_MufflerElemental)) @@ -114,12 +114,12 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta aMetaTileEntity.overflowMatter += overflowMatter; if (aMetaTileEntity.overflowMatter > aMetaTileEntity.overflowMax) { if(TecTech.ModConfig.BOOM_ENABLE)tGTTileEntity.doExplosion(V[14]); - else System.out.println("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); + else TecTech.proxy.broadcast("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); } else overflowMatter = 0F; } }else if(deathDelay<1) { if (TecTech.ModConfig.BOOM_ENABLE) getBaseMetaTileEntity().doExplosion(V[14]); - else System.out.println("BOOM! " + getBaseMetaTileEntity().getXCoord() + " " + getBaseMetaTileEntity().getYCoord() + " " + getBaseMetaTileEntity().getZCoord()); + else TecTech.proxy.broadcast("BOOM! " + getBaseMetaTileEntity().getXCoord() + " " + getBaseMetaTileEntity().getYCoord() + " " + getBaseMetaTileEntity().getZCoord()); } deathDelay--; } @@ -235,6 +235,6 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta public void onRemoval() { if(isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) if(TecTech.ModConfig.BOOM_ENABLE)getBaseMetaTileEntity().doExplosion(V[15]); - else System.out.println("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); + else TecTech.proxy.broadcast("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_MufflerElemental.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_MufflerElemental.java index 7eaa69f628..8cc4d5543b 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_MufflerElemental.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_Hatch_MufflerElemental.java @@ -9,17 +9,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityExplodeFX; -import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import static com.github.technus.tectech.elementalMatter.commonValues.disperseAt; import static gregtech.api.enums.Dyes.MACHINE_METAL; @@ -145,29 +140,13 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ aBaseMetaTileEntity.getWorld().updateLightByType(EnumSkyBlock.Block,aBaseMetaTileEntity.getXCoord(),aBaseMetaTileEntity.getYCoord(),aBaseMetaTileEntity.getZCoord()); } } - }else if(aBaseMetaTileEntity.isClientSide() && this.getBaseMetaTileEntity().isActive()){ - particles(this.getBaseMetaTileEntity().getWorld()); + }else if(aBaseMetaTileEntity.isClientSide() && getBaseMetaTileEntity().isActive()){ + TecTech.proxy.particles(getBaseMetaTileEntity(),getBaseMetaTileEntity().getFrontFacing()); } super.onPostTick(aBaseMetaTileEntity, aTick); //DOES NOT CHECK FOR TOO MUCH, it is done only while putting stuff in (OPTIMIZATION!!!) } - public void particles(World aWorld){//CUTE! - IGregTechTileEntity aMuffler=this.getBaseMetaTileEntity(); - ForgeDirection aDir=ForgeDirection.getOrientation(aMuffler.getFrontFacing()); - float xPos=aDir.offsetX*0.76F+aMuffler.getXCoord()+0.25F; - float yPos=aDir.offsetY*0.76F+aMuffler.getYCoord()+0.25F; - float zPos=aDir.offsetZ*0.76F+aMuffler.getZCoord()+0.25F; - - float ySpd=0; - //aDir.offsetY*0.1F+0.2F+0.1F*floatGen.nextFloat(); - float xSpd=0; - float zSpd=0; - EntityFX particle=new EntityExplodeFX(aWorld, xPos + TecTech.Rnd.nextFloat()*0.5F, yPos + TecTech.Rnd.nextFloat()*0.5F, zPos + TecTech.Rnd.nextFloat()*0.5F, xSpd, ySpd, zSpd); - particle.setRBGColorF(0,0.6F*TecTech.Rnd.nextFloat(),0.8f); - Minecraft.getMinecraft().effectRenderer.addEffect(particle); - } - @Override public boolean isGivingInformation() { return true; @@ -187,6 +166,6 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ public void onRemoval() { if(isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) if(TecTech.ModConfig.BOOM_ENABLE)getBaseMetaTileEntity().doExplosion(V[15]); - else System.out.println("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); + else TecTech.proxy.broadcast("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java index 6fe2affcf0..4826474773 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/machine/GT_MetaTileEntity_MultiblockBase_Elemental.java @@ -8,6 +8,7 @@ import com.github.technus.tectech.elementalMatter.classes.tElementalException; import com.github.technus.tectech.elementalMatter.commonValues; import com.github.technus.tectech.elementalMatter.gui.GT_Container_MultiMachineEM; import com.github.technus.tectech.elementalMatter.gui.GT_GUIContainer_MultiMachineEM; +import eu.usrv.yamcore.YAMCore; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -33,6 +34,7 @@ import java.util.ArrayList; import static com.github.technus.tectech.elementalMatter.commonValues.*; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GT_Values.VN; /** * Created by danie_000 on 27.10.2016. @@ -64,9 +66,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta public boolean eParameters=true,ePowerPass=false,eSafeVoid=false,eDismatleBoom=false; public byte eCertainMode=0,eCertainStatus=0,minRepairStatus=3; - private int maxAmps=0; + private int eMaxAmpereFlow =0; private long maxEUinputMin=0,maxEUinputMax=0; - public int eAmpereRating =1; + public int eAmpereFlow =1; //init param states in constructor, or implement it in checkrecipe/outputfunction @@ -139,8 +141,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta aNBT.setLong("eMaxEUmin", maxEUinputMin); aNBT.setLong("eMaxEUmax", maxEUinputMax); - aNBT.setInteger("eRating", eAmpereRating); - aNBT.setInteger("eMaxA",maxAmps); + aNBT.setInteger("eRating", eAmpereFlow); + aNBT.setInteger("eMaxA", eMaxAmpereFlow); aNBT.setByte("eCertainM",eCertainMode); aNBT.setByte("eCertainS",eCertainStatus); aNBT.setByte("eMinRepair",minRepairStatus); @@ -187,8 +189,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta maxEUinputMin =aNBT.getLong("eMaxEUmin"); maxEUinputMax =aNBT.getLong("eMaxEUmax"); - eAmpereRating =aNBT.getInteger("eRating"); - maxAmps=aNBT.getInteger("eMaxA"); + eAmpereFlow =aNBT.getInteger("eRating"); + eMaxAmpereFlow =aNBT.getInteger("eMaxA"); eCertainMode=aNBT.getByte("eCertainM"); eCertainStatus=aNBT.getByte("eCertainS"); minRepairStatus=aNBT.getByte("eMinRepair"); @@ -237,7 +239,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta @Override public final long maxEUStore() { - return (maxEUinputMin*maxAmps)<<3; + return (maxEUinputMin* eMaxAmpereFlow)<<3; } @Override @@ -295,7 +297,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta mMachine = checkMachine(aBaseMetaTileEntity, mInventory[1]); if(!mMachine) - if(eDismatleBoom) explodeMultiblock(); + if(eDismatleBoom && mMaxProgresstime>0) explodeMultiblock(); else if(outputEM!=null) for(cElementalInstanceStackTree tree:outputEM) if(tree.hasStacks()) explodeMultiblock(); @@ -323,16 +325,17 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta if (hatch.maxEUInput() < maxEUinputMin) maxEUinputMin = hatch.maxEUInput(); if (hatch.maxEUInput() > maxEUinputMax) maxEUinputMax = hatch.maxEUInput(); } - maxAmps=0; + eMaxAmpereFlow =0; + //counts only full amps for(GT_MetaTileEntity_Hatch_Energy hatch:mEnergyHatches) - if(isValidMetaTileEntity(hatch))maxAmps+=hatch.maxEUInput()/ maxEUinputMin; + if(isValidMetaTileEntity(hatch)) eMaxAmpereFlow +=hatch.maxEUInput()/ maxEUinputMin; for(GT_MetaTileEntity_Hatch_EnergyMulti hatch:eEnergyMulti) - if(isValidMetaTileEntity(hatch))maxAmps+=(hatch.maxEUInput()/ maxEUinputMin)*hatch.Amperes; + if(isValidMetaTileEntity(hatch)) eMaxAmpereFlow +=(hatch.maxEUInput()/ maxEUinputMin)*hatch.Amperes; if(this.getEUVar()>maxEUStore())this.setEUVar(this.maxEUStore()); } else { maxEUinputMin=0; maxEUinputMax=0; - maxAmps=0; + eMaxAmpereFlow =0; this.setEUVar(0); } @@ -343,7 +346,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta }else{ maxEUinputMin=0; maxEUinputMax=0; - maxAmps=0; + eMaxAmpereFlow =0; this.setEUVar(0); } } @@ -542,9 +545,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta @Override public boolean onRunningTick(ItemStack aStack) { if(this.mEUt > 0) { - this.EMaddEnergyOutput((long)mEUt * (long)mEfficiency / getMaxEfficiency(aStack),eAmpereRating); + this.EMaddEnergyOutput((long)mEUt * (long)mEfficiency / getMaxEfficiency(aStack), eAmpereFlow); return true; - } else if(this.mEUt < 0 && !this.EMdrainEnergyInput((long)(-this.mEUt) * getMaxEfficiency(aStack) / (long)Math.max(1000, this.mEfficiency),eAmpereRating)) { + } else if(this.mEUt < 0 && !this.EMdrainEnergyInput((long)(-this.mEUt) * getMaxEfficiency(aStack) / (long)Math.max(1000, this.mEfficiency), eAmpereFlow)) { this.stopMachine(); return false; } else return true; @@ -620,7 +623,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta long euVar=EU*Amperes; if( getEUVar() < euVar || EU>maxEUinputMax || - (euVar+maxEUinputMin-1)/maxEUinputMin>maxAmps)return false; + (euVar+maxEUinputMin-1)/maxEUinputMin> eMaxAmpereFlow)return false; //sub eu setEUVar(getEUVar()-euVar); return true; @@ -783,7 +786,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta @Override public void explodeMultiblock() {//BEST METHOD EVER!!! if(!TecTech.ModConfig.BOOM_ENABLE) { - System.out.println("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); + TecTech.proxy.broadcast("BOOM! "+getBaseMetaTileEntity().getXCoord()+" "+getBaseMetaTileEntity().getYCoord()+" "+getBaseMetaTileEntity().getZCoord()); return; } GT_Pollution.addPollution(new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 600000); @@ -1106,9 +1109,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta EnumChatFormatting.YELLOW + Long.toString(maxEnergy) + EnumChatFormatting.RESET +" EU", (mEUt<=0?"Probably uses: ":"Probably makes: ")+ EnumChatFormatting.RED + Integer.toString(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t at "+ - EnumChatFormatting.RED + Integer.toString(eAmpereRating)+ EnumChatFormatting.RESET +" A", - "Tier Rating: "+EnumChatFormatting.YELLOW+getMaxEnergyInputTier()+EnumChatFormatting.RESET+" / "+EnumChatFormatting.GREEN+getMinEnergyInputTier()+EnumChatFormatting.RESET+ - " Amp Rating: "+EnumChatFormatting.GREEN+maxAmps+EnumChatFormatting.RESET + " A", + EnumChatFormatting.RED + Integer.toString(eAmpereFlow)+ EnumChatFormatting.RESET +" A", + "Tier Rating: "+EnumChatFormatting.YELLOW+VN[getMaxEnergyInputTier()]+EnumChatFormatting.RESET+" / "+EnumChatFormatting.GREEN+VN[getMinEnergyInputTier()]+EnumChatFormatting.RESET+ + " Amp Rating: "+EnumChatFormatting.GREEN+ eMaxAmpereFlow +EnumChatFormatting.RESET + " A", "Problems: "+EnumChatFormatting.RED+ (getIdealStatus() - getRepairStatus())+EnumChatFormatting.RESET+ " Efficiency: "+EnumChatFormatting.YELLOW+Float.toString(mEfficiency / 100.0F)+EnumChatFormatting.RESET + " %", "PowerPass: "+EnumChatFormatting.BLUE+ePowerPass+EnumChatFormatting.RESET+ @@ -1161,10 +1164,16 @@ public abstract class GT_MetaTileEntity_MultiblockBase_Elemental extends GT_Meta default: {//check for block (countable) int pointer = block - '0'; //countable air -> net.minecraft.block.BlockAir - if (aBaseMetaTileEntity.getBlockOffset(x, y, z) != blockType[pointer]) return false; - //System.out.println("Keked1:"+x+" "+y+" "+z+"/"+a+" "+c+"/"+aBaseMetaTileEntity.getBlockOffset (x,y,z)+" "+blockType[pointer]); - if (aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != blockMeta[pointer]) return false; - //System.out.println("Keked2:"+x+" "+y+" "+z+"/"+a+" "+c+"/"+aBaseMetaTileEntity.getMetaIDOffset(x,y,z)+" "+blockMeta[pointer]); + if (aBaseMetaTileEntity.getBlockOffset(x, y, z) != blockType[pointer]){ + if(TecTech.ModConfig.DEBUG_MODE) + TecTech.Logger.info("Struct-block-error "+x+" "+y+" "+z+"/"+a+" "+c+"/"+aBaseMetaTileEntity.getBlockOffset (x,y,z)+" "+blockType[pointer]); + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != blockMeta[pointer]){ + if(TecTech.ModConfig.DEBUG_MODE) + TecTech.Logger.info("Struct-meta-id-error "+x+" "+y+" "+z+"/"+a+" "+c+"/"+aBaseMetaTileEntity.getMetaIDOffset(x,y,z)+" "+blockMeta[pointer]); + return false; + } } } a++;//block in horizontal layer diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index 226c80f58f..8e34639345 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -1,21 +1,43 @@ package com.github.technus.tectech.proxy; +import com.github.technus.tectech.TecTech; import com.github.technus.tectech.blocks.QuantumGlassRender; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.particle.EntityExplodeFX; +import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; public class ClientProxy extends CommonProxy { + @Override public void registerRenderInfo() { QuantumGlassRender.renderID = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(QuantumGlassRender.renderID, new QuantumGlassRender()); } @Override + public void particles(IGregTechTileEntity aMuffler,byte facing){//CUTE! + ForgeDirection aDir=ForgeDirection.getOrientation(facing); + float xPos=aDir.offsetX*0.76F+aMuffler.getXCoord()+0.25F; + float yPos=aDir.offsetY*0.76F+aMuffler.getYCoord()+0.25F; + float zPos=aDir.offsetZ*0.76F+aMuffler.getZCoord()+0.25F; + + float ySpd=0; + //aDir.offsetY*0.1F+0.2F+0.1F*floatGen.nextFloat(); + float xSpd=0; + float zSpd=0; + EntityFX particle=new EntityExplodeFX(aMuffler.getWorld(), xPos + TecTech.Rnd.nextFloat()*0.5F, yPos + TecTech.Rnd.nextFloat()*0.5F, zPos + TecTech.Rnd.nextFloat()*0.5F, xSpd, ySpd, zSpd); + particle.setRBGColorF(0,0.6F*TecTech.Rnd.nextFloat(),0.8f); + Minecraft.getMinecraft().effectRenderer.addEffect(particle); + } + + @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { return null; } @@ -50,6 +72,5 @@ public class ClientProxy extends CommonProxy { fontRenderer.setUnicodeFlag(origFont); } else fontRenderer.drawSplitString(str, x, y, maxWidth, color); - } } diff --git a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java index f26a2bfd16..7705bf9efc 100644 --- a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java @@ -1,7 +1,10 @@ package com.github.technus.tectech.proxy; import cpw.mods.fml.common.network.IGuiHandler; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class CommonProxy implements IGuiHandler { @@ -9,6 +12,9 @@ public class CommonProxy implements IGuiHandler { } + public void particles(IGregTechTileEntity aMuffler,byte facing){//CUTE! + } + @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { return null; @@ -31,4 +37,8 @@ public class CommonProxy implements IGuiHandler { public void setCustomRenderers() { } + + public void broadcast(String str){ + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentText(str)); + } } |