diff options
Diffstat (limited to 'src')
6 files changed, 111 insertions, 79 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java index 8e55ba4988..263a46a9d3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java @@ -21,6 +21,7 @@ import static com.github.technus.tectech.Util.StructureBuilderExtreme; 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; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -54,9 +55,9 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -90,8 +91,8 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "The most precise way of making stuff.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "(Trans-Planck process)" + translateToLocal("gt.blockmachines.multimachine.em.crafter.desc.0"),//The most precise way of making stuff. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.crafter.desc.1")// }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 71be7013be..4e8e8d27ec 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -27,6 +27,7 @@ import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.GregTech_API.mEUtoRF; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -45,8 +46,8 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.infuser.hint"),//1 - Classic Hatches or High Power Casing }; //endregion @@ -155,10 +156,10 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_GENERAL, - "Power Transfer Extreme!", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Insanely fast charging!", - EnumChatFormatting.BLUE + "Doesn't work while broken!", - EnumChatFormatting.BLUE + "Power loss is a thing." + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.0"),//Power Transfer Extreme! + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.1"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.2"), + EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.em.infuser.desc.3") }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java index a51e8a781f..b159827012 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java @@ -14,6 +14,7 @@ import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -34,9 +35,9 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -62,8 +63,8 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "Alters time to stabilize matter", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Wibbly wobbly timey wimey, stuff." + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.desc.0"),//Alters time to stabilize matter + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.stabilizer.desc.1")//Wibbly wobbly timey wimey, stuff. }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java index 20d20921d4..034fdca334 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java @@ -22,6 +22,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -53,9 +54,9 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing", + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.1"),//2 - Elemental Hatches or Molecular Casing }; //endregion @@ -81,8 +82,8 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB public String[] getDescription() { return new String[]{ CommonValues.TEC_MARK_EM, - "It is not full of worms.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "It is full of anti-worms!!!" + translateToLocal("gt.blockmachines.multimachine.em.wormhole.desc.0"),//It is not full of worms. + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.wormhole.desc.1")//It is full of anti-worms!!! }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java index f928e99925..d45fbc31d7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java @@ -25,6 +25,7 @@ import static com.github.technus.tectech.Util.StructureBuilderExtreme; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; +import static net.minecraft.util.StatCollector.translateToLocal; /** * Created by danie_000 on 17.12.2016. @@ -48,35 +49,35 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa {"B0", "A!!!", "0!!!0", "A!!!", "B0",},}; private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMeta = new byte[]{4, 0, 5, 6}; - private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList,this::addElementalToMachineList}; + private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList, this::addElementalToMachineList}; private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4}; private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; private static final byte[] blockMetaFallback = new byte[]{0, 4}; private static final String[] description = new String[]{ - EnumChatFormatting.AQUA + "Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Hatches or Molecular Casing",}; + EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":", + translateToLocal("gt.blockmachines.multimachine.em.processing.hint.0"),//1 - Classic Hatches or High Power Casing + translateToLocal("gt.blockmachines.multimachine.em.processing.hint.1"),};//2 - Elemental Hatches or Molecular Casing //endregion //region parameters protected Parameters.Group.ParameterIn[] inputMux; protected Parameters.Group.ParameterIn[] outputMux; private static final IStatusFunction<GT_MetaTileEntity_EM_machine> SRC_STATUS = - (base,p)-> { + (base, p) -> { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - v=(int)v; + v = (int) v; if (v < 0) return STATUS_TOO_LOW; if (v == 0) return STATUS_NEUTRAL; if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH; return STATUS_OK; }; private static final IStatusFunction<GT_MetaTileEntity_EM_machine> DST_STATUS = - (base,p)->{ - if(base.inputMux[p.hatchId()].getStatus(false)== STATUS_OK){ + (base, p) -> { + if (base.inputMux[p.hatchId()].getStatus(false) == STATUS_OK) { double v = p.get(); if (Double.isNaN(v)) return STATUS_WRONG; - v=(int)v; + v = (int) v; if (v < 0) return STATUS_TOO_LOW; if (v == 0) return STATUS_LOW; if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH; @@ -84,8 +85,8 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa } return STATUS_NEUTRAL; }; - private static final INameFunction<GT_MetaTileEntity_EM_machine> ROUTE_NAME= - (base,p)->(p.parameterId()==0?"Source ":"Destination ")+p.hatchId(); + private static final INameFunction<GT_MetaTileEntity_EM_machine> ROUTE_NAME = + (base, p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId(); //endregion public GT_MetaTileEntity_EM_machine(int aID, String aName, String aNameRegional) { @@ -96,29 +97,29 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa super(aName); } - private boolean setCurrentBehaviour(){ - ItemStack newMachine=mInventory[1]; - if(ItemStack.areItemStacksEqual(newMachine, loadedMachine)){ + private boolean setCurrentBehaviour() { + ItemStack newMachine = mInventory[1]; + if (ItemStack.areItemStacksEqual(newMachine, loadedMachine)) { return false; } - loadedMachine=newMachine; - Supplier<IBehaviour> behaviourSupplier=GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new Util.ItemStack_NoNBT(newMachine)); - if(currentBehaviour==null && behaviourSupplier==null) { + loadedMachine = newMachine; + Supplier<IBehaviour> behaviourSupplier = GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new Util.ItemStack_NoNBT(newMachine)); + if (currentBehaviour == null && behaviourSupplier == null) { return false; } - if(currentBehaviour!=null){ - for(int i=6;i<10;i++){ + if (currentBehaviour != null) { + for (int i = 6; i < 10; i++) { parametrization.removeGroup(i); } } - if(behaviourSupplier!=null){ - currentBehaviour=behaviourSupplier.get(); + if (behaviourSupplier != null) { + currentBehaviour = behaviourSupplier.get(); currentBehaviour.parametersInstantiation(this, parametrization); - for(int i=6;i<10;i++){ - parametrization.setToDefaults(i,true,true); + for (int i = 6; i < 10; i++) { + parametrization.setToDefaults(i, true, true); } } else { - currentBehaviour=null; + currentBehaviour = null; } return true; @@ -128,12 +129,13 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa public static void registerBehaviour(Supplier<IBehaviour> behaviour, ItemStack is) { BEHAVIOUR_MAP.put(new Util.ItemStack_NoNBT(is), behaviour); - TecTech.LOGGER.info("Registered EM machine behaviour "+behaviour.get().getClass().getSimpleName()+' '+new Util.ItemStack_NoNBT(is).toString()); + TecTech.LOGGER.info("Registered EM machine behaviour " + behaviour.get().getClass().getSimpleName() + ' ' + new Util.ItemStack_NoNBT(is).toString()); } public interface IBehaviour { /** * instantiate parameters, u can also check machine tier here + * * @param te * @param parameters */ @@ -141,7 +143,8 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa /** * handle parameters per recipe - * @param te this te instance + * + * @param te this te instance * @param parameters of this te * @return return true if machine can start with current parameters, false if not */ @@ -149,22 +152,23 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa /** * do recipe handling - * @param inputs from muxed inputs + * + * @param inputs from muxed inputs * @param parameters array passed from previous method! * @return null if recipe should not start, control object to set machine state and start recipe */ MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters); } - private void quantumStuff(boolean shouldIExist){ - IGregTechTileEntity base=getBaseMetaTileEntity(); - if(base!=null && base.getWorld()!=null) { - int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 2+base.getXCoord(); - int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 2+base.getYCoord(); - int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 2+base.getZCoord(); + private void quantumStuff(boolean shouldIExist) { + IGregTechTileEntity base = getBaseMetaTileEntity(); + if (base != null && base.getWorld() != null) { + int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 2 + base.getXCoord(); + int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 2 + base.getYCoord(); + int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 2 + base.getZCoord(); Block block = base.getWorld().getBlock(xDir, yDir, zDir); if (shouldIExist) { - if(block != null && block.getMaterial()== Material.air) { + if (block != null && block.getMaterial() == Material.air) { base.getWorld().setBlock(xDir, yDir, zDir, QuantumStuffBlock.INSTANCE, 0, 2); } } else { @@ -188,7 +192,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - if(aNBT.hasKey("eLoadedMachine")){ + if (aNBT.hasKey("eLoadedMachine")) { loadedMachine = ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag("eLoadedMachine")); } } @@ -196,31 +200,35 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); - if(loadedMachine !=null) { + if (loadedMachine != null) { aNBT.setTag("eLoadedMachine", loadedMachine.writeToNBT(new NBTTagCompound())); } } @Override protected void parametersInstantiation_EM() { - inputMux=new Parameters.Group.ParameterIn[6]; - outputMux=new Parameters.Group.ParameterIn[6]; - for (int i=0;i<6;i++){ - Parameters.Group hatch=parametrization.getGroup(i); - inputMux[i]=hatch.makeInParameter(0,i,ROUTE_NAME,SRC_STATUS); - outputMux[i]=hatch.makeInParameter(1,i,ROUTE_NAME,DST_STATUS); + inputMux = new Parameters.Group.ParameterIn[6]; + outputMux = new Parameters.Group.ParameterIn[6]; + for (int i = 0; i < 6; i++) { + Parameters.Group hatch = parametrization.getGroup(i); + inputMux[i] = hatch.makeInParameter(0, i, ROUTE_NAME, SRC_STATUS); + outputMux[i] = hatch.makeInParameter(1, i, ROUTE_NAME, DST_STATUS); } } @Override public String[] getDescription() { - return new String[]{CommonValues.TEC_MARK_EM, "Processing quantum matter since...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "the time u started using it."}; + return new String[]{ + CommonValues.TEC_MARK_EM, + translateToLocal("gt.blockmachines.multimachine.em.processing.desc.0"),//Processing quantum matter since... + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.processing.desc.1")//the time u started using it. + }; } @Override public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) { setCurrentBehaviour(); - if(aBaseMetaTileEntity.isServerSide()) { + if (aBaseMetaTileEntity.isServerSide()) { quantumStuff(aBaseMetaTileEntity.isActive()); } } @@ -234,7 +242,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public boolean checkRecipe_EM(ItemStack itemStack) { setCurrentBehaviour(); - if(currentBehaviour==null){ + if (currentBehaviour == null) { return false; } @@ -244,7 +252,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6]; for (int i = 0; i < 6; i++) { - int pointer = (int)inputMux[i].get(); + int pointer = (int) inputMux[i].get(); if (pointer >= 0 && pointer < eInputHatches.size()) { handles[i] = eInputHatches.get(pointer).getContainerHandler(); } @@ -260,7 +268,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa } } - MultiblockControl<cElementalInstanceStackMap[]> control = currentBehaviour.process(handles,this, parametrization); + MultiblockControl<cElementalInstanceStackMap[]> control = currentBehaviour.process(handles, this, parametrization); if (control == null) { return false; } @@ -276,12 +284,11 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa mMaxProgresstime = control.getMaxProgressTime(); eRequiredData = control.getRequiredData(); mEfficiencyIncrease = control.getEffIncrease(); - boolean polluted=polluteEnvironment(control.getPollutionToAdd()); + boolean polluted = polluteEnvironment(control.getPollutionToAdd()); quantumStuff(polluted); return polluted; } - @Override public void stopMachine() { quantumStuff(false); @@ -302,7 +309,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6]; for (int i = 0; i < 6; i++) { - int pointer = (int)outputMux[i].get(); + int pointer = (int) outputMux[i].get(); if (pointer >= 0 && pointer < eOutputHatches.size()) { handles[i] = eOutputHatches.get(pointer).getContainerHandler(); } @@ -328,22 +335,22 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if(aBaseMetaTileEntity.isClientSide() && (aTick & 0x2)==0){ - if((aTick&0x10)==0) { + if (aBaseMetaTileEntity.isClientSide() && (aTick & 0x2) == 0) { + if ((aTick & 0x10) == 0) { setCurrentBehaviour(); } - if(aBaseMetaTileEntity.isActive()){ - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX*2+aBaseMetaTileEntity.getXCoord(); - int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY*2+aBaseMetaTileEntity.getYCoord(); - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ*2+aBaseMetaTileEntity.getZCoord(); - aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir,yDir,zDir,xDir,yDir,zDir); + if (aBaseMetaTileEntity.isActive()) { + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 2 + aBaseMetaTileEntity.getXCoord(); + int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY * 2 + aBaseMetaTileEntity.getYCoord(); + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 2 + aBaseMetaTileEntity.getZCoord(); + aBaseMetaTileEntity.getWorld().markBlockRangeForRenderUpdate(xDir, yDir, zDir, xDir, yDir, zDir); } } } @Override public void construct(int stackSize, boolean hintsOnly) { - StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 1, getBaseMetaTileEntity(), this,hintsOnly); + StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 1, getBaseMetaTileEntity(), this, hintsOnly); } @Override diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index c1ba86678c..a80a03ed18 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -453,14 +453,35 @@ gt.blockmachines.multimachine.em.collider.mode.2=Mode: Undefined gt.blockmachines.multimachine.em.collider.mode.3=Currently Slaves... gt.blockmachines.multimachine.em.infuser.name=Energy Infuser +gt.blockmachines.multimachine.em.infuser.hint=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.infuser.desc.0=Power Transfer Extreme! +gt.blockmachines.multimachine.em.infuser.desc.1=Insanely fast charging! +gt.blockmachines.multimachine.em.infuser.desc.2=Doesn't work while broken! +gt.blockmachines.multimachine.em.infuser.desc.3=Power loss is a thing. gt.blockmachines.multimachine.em.processing.name=Quantum Processing Machine +gt.blockmachines.multimachine.em.processing.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.processing.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.processing.desc.0=Processing quantum matter since... +gt.blockmachines.multimachine.em.processing.desc.1=the time u started using it. gt.blockmachines.multimachine.em.crafter.name=Matter Assembler +gt.blockmachines.multimachine.em.crafter.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.crafter.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.crafter.desc.0=The most precise way of making stuff. +gt.blockmachines.multimachine.em.crafter.desc.1=(Trans-Planck process) gt.blockmachines.multimachine.em.stabilizer.name=Elemental Stabilizer +gt.blockmachines.multimachine.em.stabilizer.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.stabilizer.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.stabilizer.desc.0=Alters time to stabilize matter +gt.blockmachines.multimachine.em.stabilizer.desc.1=Wibbly wobbly timey wimey, stuff. gt.blockmachines.multimachine.em.wormhole.name=Wormhole +gt.blockmachines.multimachine.em.wormhole.hint.0=1 - Classic Hatches or High Power Casing +gt.blockmachines.multimachine.em.wormhole.hint.1=2 - Elemental Hatches or Molecular Casing +gt.blockmachines.multimachine.em.wormhole.desc.0=It is not full of worms. +gt.blockmachines.multimachine.em.wormhole.desc.1=It is full of anti-worms!!! gt.blockmachines.multimachine.em.decay.name=Decay Generator |