From 258f37066093a6b1ebb5d2a2e24157eaaa2ee866 Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 6 Sep 2017 21:03:25 +0200 Subject: Refactor m8 --- .../com/github/technus/tectech/CommonValues.java | 20 +- .../technus/tectech/auxiliary/Reference.java | 2 +- .../dreamcraft/DreamCraftRecipeLoader.java | 11 ++ .../tectech/compatibility/gtpp/GtppAtomLoader.java | 45 +++++ .../compatibility/thaumcraft/EssentiaCompat.java | 30 +++ .../thaumcraft/EssentiaCompatEnabled.java | 69 +++++++ .../definitions/AspectDefinitionCompat.java | 30 +++ .../definitions/AspectDefinitionCompatEnabled.java | 81 ++++++++ .../definitions/dComplexAspectDefinition.java | 209 +++++++++++++++++++++ .../definitions/ePrimalAspectDefinition.java | 42 +++++ .../thaumcraft/definitions/iElementalAspect.java | 8 + .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 139 ++++++++++++++ .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 144 ++++++++++++++ .../definitions/dAtomDefinition.java | 2 +- .../technus/tectech/gtppAddon/GtppAtomLoader.java | 45 ----- .../tectech/loader/DreamCraftRecipeLoader.java | 11 -- .../technus/tectech/loader/ElementalLoader.java | 4 +- .../technus/tectech/loader/MachineLoader.java | 4 +- .../github/technus/tectech/loader/MainLoader.java | 12 +- .../technus/tectech/loader/RecipeLoader.java | 1 + .../technus/tectech/magicAddon/EssentiaCompat.java | 30 --- .../tectech/magicAddon/EssentiaCompatEnabled.java | 69 ------- .../definitions/AspectDefinitionCompat.java | 30 --- .../definitions/AspectDefinitionCompatEnabled.java | 81 -------- .../definitions/dComplexAspectDefinition.java | 209 --------------------- .../definitions/ePrimalAspectDefinition.java | 42 ----- .../magicAddon/definitions/iElementalAspect.java | 8 - .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 139 -------------- .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 144 -------------- .../tectech/thing/block/QuantumGlassItem.java | 4 +- .../tectech/thing/casing/GT_Item_CasingsTT.java | 4 +- .../tectech/thing/casing/GT_Item_HintTT.java | 4 +- .../thing/item/ConstructableTriggerItem.java | 2 +- .../tectech/thing/item/DebugContainer_EM.java | 2 +- .../tectech/thing/item/DefinitionContainer_EM.java | 2 +- .../tectech/thing/item/ParametrizerMemoryCard.java | 2 +- .../GT_MetaTileEntity_Hatch_DataConnector.java | 6 +- .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 2 +- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 8 +- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 2 +- .../hatch/GT_MetaTileEntity_Hatch_Holder.java | 2 +- .../GT_MetaTileEntity_Hatch_MufflerElemental.java | 6 +- .../hatch/GT_MetaTileEntity_Hatch_Param.java | 2 +- .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 6 +- .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 2 +- .../multi/GT_MetaTileEntity_EM_annihilation.java | 2 +- .../multi/GT_MetaTileEntity_EM_bhg.java | 2 +- .../multi/GT_MetaTileEntity_EM_collider.java | 2 +- .../multi/GT_MetaTileEntity_EM_computer.java | 2 +- .../multi/GT_MetaTileEntity_EM_crafting.java | 2 +- .../multi/GT_MetaTileEntity_EM_decay.java | 2 +- .../multi/GT_MetaTileEntity_EM_dequantizer.java | 2 +- .../multi/GT_MetaTileEntity_EM_infuser.java | 2 +- .../multi/GT_MetaTileEntity_EM_junction.java | 2 +- .../multi/GT_MetaTileEntity_EM_machine.java | 2 +- .../multi/GT_MetaTileEntity_EM_quantizer.java | 2 +- .../multi/GT_MetaTileEntity_EM_research.java | 2 +- .../multi/GT_MetaTileEntity_EM_scanner.java | 2 +- .../multi/GT_MetaTileEntity_EM_stabilizer.java | 2 +- .../multi/GT_MetaTileEntity_EM_switch.java | 2 +- .../multi/GT_MetaTileEntity_EM_transformer.java | 2 +- .../multi/GT_MetaTileEntity_EM_wormhole.java | 2 +- .../multi/GT_MetaTileEntity_MultiblockBase_EM.java | 14 +- .../multi/GT_MetaTileEntity_TM_microwave.java | 2 +- .../pipe/GT_MetaTileEntity_Pipe_Data.java | 2 +- .../pipe/GT_MetaTileEntity_Pipe_EM.java | 2 +- .../GT_MetaTileEntity_DebugPowerGenerator.java | 2 +- .../GT_MetaTileEntity_DebugStructureWriter.java | 2 +- .../blocks/turretbases/TurretBaseItemEM.java | 2 +- .../blocks/turretheads/TurretHeadItemEM.java | 4 +- 70 files changed, 891 insertions(+), 890 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java delete mode 100644 src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java delete mode 100644 src/main/java/com/github/technus/tectech/loader/DreamCraftRecipeLoader.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompat.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompatEnabled.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompat.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompatEnabled.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/definitions/iElementalAspect.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java delete mode 100644 src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/CommonValues.java b/src/main/java/com/github/technus/tectech/CommonValues.java index 0b01377a95..aba9944770 100644 --- a/src/main/java/com/github/technus/tectech/CommonValues.java +++ b/src/main/java/com/github/technus/tectech/CommonValues.java @@ -6,22 +6,22 @@ import net.minecraft.util.EnumChatFormatting; * Created by danie_000 on 11.01.2017. */ public final class CommonValues { - public final static String tecMark = + public final static String TEC_MARK = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.BLUE + ": Elemental Matter"; - public final static String bassMark = + public final static String BASS_MARK = EnumChatFormatting.BLUE + "Bass" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.BLUE + ": Theta Movement"; - public final static byte decayAt = 0;// hatches compute decays - public final static byte multiPurge1At = 2;// multiblocks clean their hatches 1 - public final static byte moveAt = 4;// move stuff around - public final static byte recipeAt = 6;// move stuff around - public final static byte multiPurge2At = 8;// multiblocks clean their hatches 2 - public final static byte overflowAt = 10;// then hatches clean themselves + public final static byte DECAY_AT = 0;// hatches compute decays + public final static byte MULTI_PURGE_1_AT = 2;// multiblocks clean their hatches 1 + public final static byte MOVE_AT = 4;// move stuff around + public final static byte RECIPE_AT = 6;// move stuff around + public final static byte MULTI_PURGE_2_AT = 8;// multiblocks clean their hatches 2 + public final static byte OVERFLOW_AT = 10;// then hatches clean themselves // - in case some hatches are not in multiblock structure - public final static byte multiCheckAt = 12;// multiblock checks it's state - public final static byte disperseAt = 14;// overflow hatches perform disperse + public final static byte MULTI_CHECK_AT = 12;// multiblock checks it's state + public final static byte DISPERSE_AT = 14;// overflow hatches perform disperse } diff --git a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java index 4363d8ca88..cc5202636a 100644 --- a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java +++ b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.auxiliary; -public class Reference { +public final class Reference { public static final String MODID = "tectech"; public static final String NAME = "TecTech - Tec Technology!"; public static final String VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java new file mode 100644 index 0000000000..c870d7d829 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -0,0 +1,11 @@ +package com.github.technus.tectech.compatibility.dreamcraft; + +/** + * Created by Tec on 06.08.2017. + */ +public class DreamCraftRecipeLoader implements Runnable { + @Override + public void run() { + + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java new file mode 100644 index 0000000000..13e76073a5 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java @@ -0,0 +1,45 @@ +package com.github.technus.tectech.compatibility.gtpp; + +import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack; +import gregtech.api.enums.OrePrefixes; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialGenerator; + +import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.getBestUnstableIsotope; +import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.getFirstStableIsotope; +import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.transformation; + +public class GtppAtomLoader implements Runnable{ + @Override + public void run() { + transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), 144), ELEMENT.getInstance().NEON.getFluid(144)); + MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), 144), OrePrefixes.dust, ELEMENT.getInstance().GERMANIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), 144), OrePrefixes.dust, ELEMENT.getInstance().SELENIUM.getUnlocalizedName(),1); + transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), 144), ELEMENT.getInstance().BROMINE.getFluid(144)); + transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), 144), ELEMENT.getInstance().KRYPTON.getFluid(144)); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), 144),OrePrefixes.dust, ELEMENT.getInstance().ZIRCONIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), 144),OrePrefixes.dust, ELEMENT.getInstance().TECHNETIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), 144),OrePrefixes.dust, ELEMENT.getInstance().RUTHENIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), 144),OrePrefixes.dust, ELEMENT.getInstance().RHODIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), 144),OrePrefixes.dust, ELEMENT.getInstance().IODINE.getUnlocalizedName(),1); + transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), 144),ELEMENT.getInstance().XENON.getFluid(144)); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), 144),OrePrefixes.dust, ELEMENT.getInstance().HAFNIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), 144),OrePrefixes.dust, ELEMENT.getInstance().RHENIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), 144),OrePrefixes.dust, ELEMENT.getInstance().THALLIUM.getUnlocalizedName(),1); + + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),144),OrePrefixes.dust, ELEMENT.getInstance().POLONIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85),144),OrePrefixes.dust, ELEMENT.getInstance().ASTATINE.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),144),OrePrefixes.dust, ELEMENT.getInstance().FRANCIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),144),OrePrefixes.dust, ELEMENT.getInstance().RADIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),144),OrePrefixes.dust, ELEMENT.getInstance().ACTINIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),144),OrePrefixes.dust, ELEMENT.getInstance().PROTACTINIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),144),OrePrefixes.dust, ELEMENT.getInstance().NEPTUNIUM.getUnlocalizedName(),1); + + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96),144),OrePrefixes.dust, ELEMENT.getInstance().CURIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97),144),OrePrefixes.dust, ELEMENT.getInstance().BERKELIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98),144),OrePrefixes.dust, ELEMENT.getInstance().CALIFORNIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99),144),OrePrefixes.dust, ELEMENT.getInstance().EINSTEINIUM.getUnlocalizedName(),1); + transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100),144),OrePrefixes.dust, ELEMENT.getInstance().FERMIUM.getUnlocalizedName(),1); + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java new file mode 100644 index 0000000000..dc0c55439d --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java @@ -0,0 +1,30 @@ +package com.github.technus.tectech.compatibility.thaumcraft; + +import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; +import net.minecraft.tileentity.TileEntity; + +/** + * Created by Tec on 21.05.2017. + */ +public class EssentiaCompat { + public static EssentiaCompat essentiaContainerCompat; + + public void run(){} + + public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta){ + return false; + } + + public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta){ + return null; + } + + public boolean putElementalInstanceStack(TileEntity conatainer, cElementalInstanceStack stack){ + return false; + } + + public cElementalInstanceStack getFromContainer(TileEntity container){ + return null; + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java new file mode 100644 index 0000000000..fd50ff3af1 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java @@ -0,0 +1,69 @@ +package com.github.technus.tectech.compatibility.thaumcraft; + +import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; +import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.iElementalAspect; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; +import net.minecraft.tileentity.TileEntity; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.aspects.IAspectContainer; +import thaumcraft.common.tiles.TileEssentiaReservoir; +import thaumcraft.common.tiles.TileJarFillable; + +import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectToDef; + +/** + * Created by Tec on 21.05.2017. + */ +public class EssentiaCompatEnabled extends EssentiaCompat { + @Override + public void run() { + + } + + @Override + public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta) { + TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); + return tile!=null && (tile instanceof TileEssentiaReservoir) || (tile instanceof TileJarFillable); + } + + @Override + public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta) { + TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); + return tile!=null && !tile.isInvalid() && (tile instanceof TileEssentiaReservoir) || (tile instanceof TileJarFillable)?tile:null; + } + + @Override + public boolean putElementalInstanceStack(TileEntity container,cElementalInstanceStack stack){ + if(container==null || container.isInvalid())return false; + if((container instanceof IAspectContainer) && (stack.definition instanceof iElementalAspect)){ + Aspect aspect=(Aspect)(((iElementalAspect) stack.definition).materializeIntoAspect()); + if(aspect!=null){ + ((IAspectContainer) container).addToContainer(aspect,1); + return true; + } + } + return false; + } + + @Override + public cElementalInstanceStack getFromContainer(TileEntity container){ + if(container==null || container.isInvalid())return null; + if(container instanceof IAspectContainer){ + AspectList aspects=((IAspectContainer) container).getAspects(); + if(aspects!=null){ + Aspect[] aspectsArr= aspects.getAspects(); + if(aspectsArr!=null && aspectsArr[0]!=null){ + if (((IAspectContainer) container).takeFromContainer(aspectsArr[0],1)){ + cElementalDefinition def=aspectToDef.get(aspectsArr[0].getTag()); + if(def!=null){ + return new cElementalInstanceStack(def,1); + } + } + } + } + } + return null; + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java new file mode 100644 index 0000000000..8e2c3a6684 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java @@ -0,0 +1,30 @@ +package com.github.technus.tectech.compatibility.thaumcraft.definitions; + + +import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; +import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; + +import java.util.HashMap; + +/** + * Created by Tec on 21.05.2017. + */ +public class AspectDefinitionCompat { + public static AspectDefinitionCompat aspectDefinitionCompat; + static final HashMap defToAspect = new HashMap<>(); + public static final HashMap aspectToDef = new HashMap<>(); + + public void run(){} + + Object getAspect(cElementalDefinition definition){ + return null; + } + + String getAspectTag(cElementalDefinition definition){ + return null; + } + + iElementalDefinition getDefinition(String aspect){ + return null; + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java new file mode 100644 index 0000000000..c8ce016a20 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java @@ -0,0 +1,81 @@ +package com.github.technus.tectech.compatibility.thaumcraft.definitions; + +import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; +import com.github.technus.tectech.elementalMatter.classes.tElementalException; +import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; +import thaumcraft.api.aspects.Aspect; + +import java.util.ArrayList; + +import static com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition.*; + +/** + * Created by Tec on 21.05.2017. + */ +public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat { + public void run(){ + defToAspect.put(magic_air,"aer"); + defToAspect.put(magic_earth,"terra"); + defToAspect.put(magic_fire,"ignis"); + defToAspect.put(magic_water,"aqua"); + defToAspect.put(magic_order,"ordo"); + defToAspect.put(magic_entropy,"perditio"); + + aspectToDef.put("aer",magic_air); + aspectToDef.put("terra",magic_earth); + aspectToDef.put("ignis",magic_fire); + aspectToDef.put("aqua",magic_water); + aspectToDef.put("ordo",magic_order); + aspectToDef.put("perditio",magic_entropy); + + ArrayList list=Aspect.getCompoundAspects(); + Aspect[] array=list.toArray(new Aspect[0]); + while (!list.isEmpty()) { + for (Aspect aspect : array) { + if (list.contains(aspect)) { + Aspect[] content = aspect.getComponents(); + if (content.length != 2) { + list.remove(aspect); + }else if(aspectToDef.containsKey(content[0].getTag()) && + aspectToDef.containsKey(content[1].getTag())){ + try { + dComplexAspectDefinition newAspect; + if(content[0].getTag().equals(content[1].getTag())){ + newAspect = new dComplexAspectDefinition( + aspectToDef.get(content[0].getTag()).getStackForm(2) + ); + }else{ + newAspect = new dComplexAspectDefinition( + aspectToDef.get(content[0].getTag()).getStackForm(1), + aspectToDef.get(content[1].getTag()).getStackForm(1) + ); + } + aspectToDef.put(aspect.getTag(),newAspect); + defToAspect.put(newAspect,aspect.getTag()); + }catch (tElementalException e) { + /**/ + }finally { + list.remove(aspect); + } + } + } + } + } + } + + @Override + Aspect getAspect(cElementalDefinition definition) { + return Aspect.getAspect(defToAspect.get(definition)); + } + + @Override + String getAspectTag(cElementalDefinition definition) { + return defToAspect.get(definition); + } + + @Override + iElementalDefinition getDefinition(String aspect) { + return aspectToDef.get(aspect); + } + +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java new file mode 100644 index 0000000000..667072a62e --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java @@ -0,0 +1,209 @@ +package com.github.technus.tectech.compatibility.thaumcraft.definitions; + +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.elementalMatter.classes.*; +import com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition; +import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; +import net.minecraft.nbt.NBTTagCompound; + +import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; +import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay; +import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat; + +/** + * Created by Tec on 06.05.2017. + */ +public final class dComplexAspectDefinition extends cElementalDefinition implements iElementalAspect { + private final int hash; + public final float mass; + + private static final byte nbtType = (byte) 'c'; + + private final cElementalDefinitionStackMap aspectStacks; + + @Deprecated + public dComplexAspectDefinition(cElementalDefinition... aspects) throws tElementalException { + this(true, new cElementalDefinitionStackMap(aspects)); + } + + @Deprecated + private dComplexAspectDefinition(boolean check, cElementalDefinition... aspects) throws tElementalException { + this(check, new cElementalDefinitionStackMap(aspects)); + } + + public dComplexAspectDefinition(cElementalDefinitionStack... aspects) throws tElementalException { + this(true, new cElementalDefinitionStackMap(aspects)); + } + + private dComplexAspectDefinition(boolean check, cElementalDefinitionStack... aspects) throws tElementalException { + this(check, new cElementalDefinitionStackMap(aspects)); + } + + public dComplexAspectDefinition(cElementalDefinitionStackMap aspects) throws tElementalException { + this(true, aspects); + } + + private dComplexAspectDefinition(boolean check, cElementalDefinitionStackMap aspects) throws tElementalException { + if (check && !canTheyBeTogether(aspects)) throw new tElementalException("Hadron Definition error"); + this.aspectStacks = aspects; + float mass=0; + for(cElementalDefinitionStack stack:aspects.values()){ + mass+=stack.getMass(); + } + this.mass=mass; + hash=super.hashCode(); + } + + //public but u can just try{}catch(){} the constructor it still calls this method + private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) { + int amount = 0; + for (cElementalDefinitionStack aspects : stacks.values()) { + if (aspects.definition instanceof dComplexAspectDefinition || aspects.definition instanceof ePrimalAspectDefinition) + amount += aspects.amount; + else return false; + } + return amount==2; + } + + @Override + public String getName() { + String name= aspectDefinitionCompat.getAspectTag(this); + if(name!=null){ + name=name.substring(0,1).toUpperCase()+name.substring(1); + }else{ + name=getSymbol(); + } + return "Aspect: "+name; + } + + @Override + public String getSymbol() { + String symbol = ""; + for (cElementalDefinitionStack aspect : aspectStacks.values()) { + if (aspect.definition instanceof ePrimalAspectDefinition) { + for (int i = 0; i < aspect.amount; i++) { + symbol += aspect.definition.getSymbol(); + } + } else { + symbol+="("; + for (int i = 0; i < aspect.amount; i++) { + symbol += aspect.definition.getSymbol(); + } + symbol+=")"; + } + } + return symbol; + } + + @Override + public NBTTagCompound toNBT() { + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setByte("t", nbtType); + cElementalDefinitionStack[] quarkStacksValues = aspectStacks.values(); + nbt.setInteger("i", quarkStacksValues.length); + for (int i = 0; i < quarkStacksValues.length; i++) + nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT()); + return nbt; + } + + public static iElementalDefinition fromNBT(NBTTagCompound nbt) { + cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")]; + for (int i = 0; i < stacks.length; i++) + stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i))); + try { + return new dComplexAspectDefinition(stacks); + } catch (tElementalException e) { + if (DEBUG_MODE) e.printStackTrace(); + return null; + } + } + + @Override + public float getRawLifeTime() { + return -1; + } + + @Override + public int getCharge() { + return 0; + } + + @Override + public byte getType() { + return 0; + } + + @Override + public byte getColor() { + return -1; + } + + @Override + public cElementalDefinitionStackMap getSubParticles() { + return aspectStacks; + } + + @Override + public cElementalDecay[] getEnergeticDecayInstant() { + return new cElementalDecay[]{new cElementalDecay(0.75F, aspectStacks), eBosonDefinition.deadEnd}; + } + + @Override + public cElementalDecay[] getNaturalDecayInstant() { + return noDecay; + } + + @Override + public cElementalDecay[] getDecayArray() { + return noDecay; + } + + @Override + public float getMass() { + return mass; + } + + @Override + public aFluidDequantizationInfo someAmountIntoFluidStack() { + return null; + } + + @Override + public aItemDequantizationInfo someAmountIntoItemsStack() { + return null; + } + + @Override + public aOredictDequantizationInfo someAmountIntoOredictStack() { + return null; + } + + public Object materializeIntoAspect() { + return aspectDefinitionCompat.getAspect(this); + } + + @Override + public iElementalDefinition getAnti() { + return null; + } + + public static void run() { + try { + cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-96); + } catch (Exception e) { + if (DEBUG_MODE) e.printStackTrace(); + } + if(DEBUG_MODE) + TecTech.Logger.info("Registered Elemental Matter Class: ComplexAspect "+nbtType+" "+(-96)); + } + + @Override + public byte getClassType() { + return -96; + } + + @Override + public int hashCode() { + return hash; + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java new file mode 100644 index 0000000000..ff203da5bc --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java @@ -0,0 +1,42 @@ +package com.github.technus.tectech.compatibility.thaumcraft.definitions; + +import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive; + +import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay; +import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat; + +/** + * Created by Tec on 06.05.2017. + */ +public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect { + public static final ePrimalAspectDefinition + magic_air = new ePrimalAspectDefinition("Air", "a`", 0, 1e1F, 0, -1, 35), + magic_earth = new ePrimalAspectDefinition("Earth", "e`", 0, 1e9F, 0, -1, 34), + magic_fire = new ePrimalAspectDefinition("Fire", "f`", 0, 1e3F, 0, -1, 33), + magic_water = new ePrimalAspectDefinition("Water", "w`", 0, 1e7F, 0, -1, 32), + magic_order = new ePrimalAspectDefinition("Order", "o`", 0, 1e5F, 0, -1, 30), + magic_entropy = new ePrimalAspectDefinition("Entropy", "e`", 0, 1e5F, 0, -1, 31); + + private ePrimalAspectDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) { + super(name, symbol, type, mass, charge, color, ID); + } + + public static void run() { + magic_air.init(null, -1F, -1, -1, noDecay); + magic_earth.init(null, -1F, -1, -1, noDecay); + magic_fire.init(null, -1F, -1, -1, noDecay); + magic_water.init(null, -1F, -1, -1, noDecay); + magic_order.init(null, -1F, -1, -1, noDecay); + magic_entropy.init(null, -1F, -1, -1, noDecay); + } + + @Override + public String getName() { + return "Primal: " + name; + } + + public Object materializeIntoAspect() { + return aspectDefinitionCompat.getAspect(this); + } +} + diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java new file mode 100644 index 0000000000..0f96d3d4be --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/iElementalAspect.java @@ -0,0 +1,8 @@ +package com.github.technus.tectech.compatibility.thaumcraft.definitions; + +/** + * Created by Tec on 21.05.2017. + */ +public interface iElementalAspect { + Object materializeIntoAspect(); +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java new file mode 100644 index 0000000000..4ad1d4e9b1 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -0,0 +1,139 @@ +package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi; + +import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; +import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition; +import com.github.technus.tectech.thing.block.QuantumGlassBlock; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.metaTileEntity.IConstructable; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + +import static com.github.technus.tectech.Util.StructureBuilder; +import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat; +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.enums.GT_Values.E; +import static com.github.technus.tectech.Util.V; + +/** + * Created by danie_000 on 17.12.2016. + */ +public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + private TileEntity container; + + //region Structure + //use multi A energy inputs, use less power the longer it runs + private static final String[][] shape = new String[][]{ + {" "," . "," ",}, + {"0A0",E,"0A0",}, + {"121","232","121",}, + {"\"\"\"","\"2\"","\"\"\"",}, + {"202","0!0","202",}, + }; + private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMeta = new byte[]{0,0,4,8}; + private static final String[] addingMethods = new String[]{"addClassicToMachineList", "addElementalInputToMachineList", "addElementalMufflerToMachineList"}; + private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4}; + private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; + private static final String[] description = new String[]{ + EnumChatFormatting.AQUA+"Hint Details:", + "1 - Classic Hatches or High Power Casing", + "2 - Elemental Input Hatch", + "3 - Elemental Overflow Hatches or Elemental Casing", + "General - Some sort of Essentia Storage", + }; + //endregion + + public GT_MetaTileEntity_EM_essentiaDequantizer(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GT_MetaTileEntity_EM_essentiaDequantizer(String aName) { + super(aName); + } + + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_EM_essentiaDequantizer(this.mName); + } + + @Override + public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { + return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0); + } + + @Override + public void construct(int stackSize, boolean hintsOnly) { + IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); + int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; + int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; + if(hintsOnly){ + TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), + iGregTechTileEntity.getXCoord()+xDir, + iGregTechTileEntity.getYCoord()+yDir, + iGregTechTileEntity.getZCoord()+zDir, + TT_Container_Casings.sHintCasingsTT,12); + } else{ + if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) + iGregTechTileEntity.getWorld().setBlock( + iGregTechTileEntity.getXCoord()+xDir, + iGregTechTileEntity.getYCoord()+yDir, + iGregTechTileEntity.getZCoord()+zDir, + TT_Container_Casings.sHintCasingsTT,12,2); + } + StructureBuilder(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,hintsOnly); + } + + @Override + public String[] getStructureDescription(int stackSize) { + return description; + } + + @Override + public boolean checkRecipe_EM(ItemStack itemStack) { + container=essentiaContainerCompat.getContainer(this); + if (eInputHatches.size() < 1 || container==null) { + stopMachine(); + return false; + } + cElementalInstanceStackMap inputHatchContainer=eInputHatches.get(0).getContainerHandler(); + if(inputHatchContainer.hasStacks()){ + cElementalInstanceStack stack = inputHatchContainer.getFirst(); + inputHatchContainer.removeAmount(false,new cElementalInstanceStack(stack.definition,1)); + if(!essentiaContainerCompat.putElementalInstanceStack(container,stack)) + cleanStackEM_EM(stack); + mMaxProgresstime = 20; + mEfficiencyIncrease = 10000; + eAmpereFlow=1; + if (stack.definition instanceof ePrimalAspectDefinition) { + mEUt = (int) -V[8]; + } else { + mEUt = (int) -V[10]; + } + return true; + } + mEfficiencyIncrease = 0; + mMaxProgresstime = 0; + return false; + } + + @Override + public String[] getDescription() { + return new String[]{ + CommonValues.TEC_MARK, + "Transform quantum form back to...", + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "regular one, but why?" + }; + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java new file mode 100644 index 0000000000..b38fab7286 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -0,0 +1,144 @@ +package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi; + +import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; +import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition; +import com.github.technus.tectech.thing.block.QuantumGlassBlock; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.metaTileEntity.IConstructable; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + +import static com.github.technus.tectech.Util.StructureBuilder; +import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat; +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.enums.GT_Values.E; +import static com.github.technus.tectech.Util.V; + +/** + * Created by danie_000 on 17.12.2016. + */ +public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { + private TileEntity container; + + //region Structure + //use multi A energy inputs, use less power the longer it runs + private static final String[][] shape = new String[][]{ + {" "," . "," ",}, + {"0A0",E,"0A0",}, + {"121","232","121",}, + {"\"\"\"","\"1\"","\"\"\"",}, + {"010","1!1","010",}, + }; + private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMeta = new byte[]{0,4,0,8}; + private static final String[] addingMethods = new String[]{"addClassicToMachineList", "addElementalOutputToMachineList", "addElementalMufflerToMachineList"}; + private static final short[] casingTextures = new short[]{textureOffset, textureOffset+4, textureOffset + 4}; + private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; + private static final String[] description = new String[]{ + EnumChatFormatting.AQUA+"Hint Details:", + "1 - Classic Hatches or High Power Casing", + "2 - Elemental Output Hatch", + "3 - Elemental Overflow Hatches or Elemental Casing", + "General - Some sort of Essentia Storage", + }; + //endregion + + public GT_MetaTileEntity_EM_essentiaQuantizer(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GT_MetaTileEntity_EM_essentiaQuantizer(String aName) { + super(aName); + } + + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_EM_essentiaQuantizer(this.mName); + } + + @Override + public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { + return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0); + } + + @Override + public void construct(int stackSize, boolean hintsOnly) { + IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); + int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; + int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; + int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; + if(hintsOnly){ + TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), + iGregTechTileEntity.getXCoord()+xDir, + iGregTechTileEntity.getYCoord()+yDir, + iGregTechTileEntity.getZCoord()+zDir, + TT_Container_Casings.sHintCasingsTT,12); + } else{ + if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) + iGregTechTileEntity.getWorld().setBlock( + iGregTechTileEntity.getXCoord()+xDir, + iGregTechTileEntity.getYCoord()+yDir, + iGregTechTileEntity.getZCoord()+zDir, + TT_Container_Casings.sHintCasingsTT,12,2); + } + StructureBuilder(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,hintsOnly); + } + + @Override + public String[] getStructureDescription(int stackSize) { + return description; + } + + @Override + public String[] getDescription() { + return new String[]{ + CommonValues.TEC_MARK, + "Conveniently convert regular stuff into quantum form.", + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "To make it more inconvenient." + }; + } + + @Override + public boolean checkRecipe_EM(ItemStack itemStack) { + container=essentiaContainerCompat.getContainer(this); + cElementalInstanceStack newStack=essentiaContainerCompat.getFromContainer(container); + if(newStack!=null){ + mMaxProgresstime = 20; + mEfficiencyIncrease = 10000; + eAmpereFlow=1; + outputEM = new cElementalInstanceStackMap[]{ + new cElementalInstanceStackMap(newStack) + }; + if (newStack.definition instanceof ePrimalAspectDefinition) { + mEUt = (int) -V[8]; + } else { + mEUt = (int) -V[10]; + } + return true; + } + mEfficiencyIncrease = 0; + mMaxProgresstime = 0; + return false; + } + + @Override + public void outputAfterRecipe_EM() { + if (eOutputHatches.size() < 1) { + stopMachine(); + return; + } + eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]); + outputEM=null; + } +} 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 7350beea8e..5b7d8c349b 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 @@ -3,7 +3,7 @@ package com.github.technus.tectech.elementalMatter.definitions; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.classes.*; import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; -import com.github.technus.tectech.gtppAddon.GtppAtomLoader; +import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader; import cpw.mods.fml.common.Loader; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; diff --git a/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java deleted file mode 100644 index 1cefb4c170..0000000000 --- a/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.github.technus.tectech.gtppAddon; - -import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack; -import gregtech.api.enums.OrePrefixes; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MaterialGenerator; - -import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.getBestUnstableIsotope; -import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.getFirstStableIsotope; -import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.transformation; - -public class GtppAtomLoader implements Runnable{ - @Override - public void run() { - transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), 144), ELEMENT.getInstance().NEON.getFluid(144)); - MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), 144), OrePrefixes.dust, ELEMENT.getInstance().GERMANIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), 144), OrePrefixes.dust, ELEMENT.getInstance().SELENIUM.getUnlocalizedName(),1); - transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), 144), ELEMENT.getInstance().BROMINE.getFluid(144)); - transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), 144), ELEMENT.getInstance().KRYPTON.getFluid(144)); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), 144),OrePrefixes.dust, ELEMENT.getInstance().ZIRCONIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), 144),OrePrefixes.dust, ELEMENT.getInstance().TECHNETIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), 144),OrePrefixes.dust, ELEMENT.getInstance().RUTHENIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), 144),OrePrefixes.dust, ELEMENT.getInstance().RHODIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), 144),OrePrefixes.dust, ELEMENT.getInstance().IODINE.getUnlocalizedName(),1); - transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), 144),ELEMENT.getInstance().XENON.getFluid(144)); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), 144),OrePrefixes.dust, ELEMENT.getInstance().HAFNIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), 144),OrePrefixes.dust, ELEMENT.getInstance().RHENIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), 144),OrePrefixes.dust, ELEMENT.getInstance().THALLIUM.getUnlocalizedName(),1); - - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),144),OrePrefixes.dust, ELEMENT.getInstance().POLONIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85),144),OrePrefixes.dust, ELEMENT.getInstance().ASTATINE.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),144),OrePrefixes.dust, ELEMENT.getInstance().FRANCIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),144),OrePrefixes.dust, ELEMENT.getInstance().RADIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),144),OrePrefixes.dust, ELEMENT.getInstance().ACTINIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),144),OrePrefixes.dust, ELEMENT.getInstance().PROTACTINIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),144),OrePrefixes.dust, ELEMENT.getInstance().NEPTUNIUM.getUnlocalizedName(),1); - - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96),144),OrePrefixes.dust, ELEMENT.getInstance().CURIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97),144),OrePrefixes.dust, ELEMENT.getInstance().BERKELIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98),144),OrePrefixes.dust, ELEMENT.getInstance().CALIFORNIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99),144),OrePrefixes.dust, ELEMENT.getInstance().EINSTEINIUM.getUnlocalizedName(),1); - transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100),144),OrePrefixes.dust, ELEMENT.getInstance().FERMIUM.getUnlocalizedName(),1); - } -} diff --git a/src/main/java/com/github/technus/tectech/loader/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/DreamCraftRecipeLoader.java deleted file mode 100644 index cd64c9f537..0000000000 --- a/src/main/java/com/github/technus/tectech/loader/DreamCraftRecipeLoader.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.github.technus.tectech.loader; - -/** - * Created by Tec on 06.08.2017. - */ -public class DreamCraftRecipeLoader implements Runnable { - @Override - public void run() { - - } -} diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java index 5cc1133d88..eaff4b6cf4 100644 --- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java @@ -2,8 +2,8 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive; import com.github.technus.tectech.elementalMatter.definitions.*; -import com.github.technus.tectech.magicAddon.definitions.dComplexAspectDefinition; -import com.github.technus.tectech.magicAddon.definitions.ePrimalAspectDefinition; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.dComplexAspectDefinition; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition; /** * Created by danie_000 on 16.11.2016. diff --git a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java index ebe8642d26..580f9a9f2f 100644 --- a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java @@ -1,7 +1,7 @@ package com.github.technus.tectech.loader; -import com.github.technus.tectech.magicAddon.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaDequantizer; -import com.github.technus.tectech.magicAddon.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaQuantizer; +import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaDequantizer; +import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaQuantizer; import com.github.technus.tectech.thing.metaTileEntity.hatch.*; import com.github.technus.tectech.thing.metaTileEntity.multi.*; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 9a1e1be66c..95f8a2ed53 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -1,10 +1,10 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.magicAddon.EssentiaCompat; -import com.github.technus.tectech.magicAddon.EssentiaCompatEnabled; -import com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat; -import com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompatEnabled; +import com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat; +import com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompatEnabled; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat; +import com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompatEnabled; import com.github.technus.tectech.thing.CustomItemList; import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.casing.TT_Container_Casings; @@ -25,8 +25,8 @@ import java.util.List; import static com.github.technus.tectech.TecTech.hasThaumcraft; import static com.github.technus.tectech.TecTech.mainTab; -import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat; -import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat; +import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat; +import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat; import static gregtech.api.enums.GT_Values.W; public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft to enable higher tier machinery. (above UV), or implement a check for GT tier values. diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java index 3e99920c9e..a0c72baf51 100644 --- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.loader; +import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader; import com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition; import cpw.mods.fml.common.Loader; diff --git a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompat.java deleted file mode 100644 index 2cc647ea7f..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompat.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.technus.tectech.magicAddon; - -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; -import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; -import net.minecraft.tileentity.TileEntity; - -/** - * Created by Tec on 21.05.2017. - */ -public class EssentiaCompat { - public static EssentiaCompat essentiaContainerCompat; - - public void run(){} - - public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta){ - return false; - } - - public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta){ - return null; - } - - public boolean putElementalInstanceStack(TileEntity conatainer, cElementalInstanceStack stack){ - return false; - } - - public cElementalInstanceStack getFromContainer(TileEntity container){ - return null; - } -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompatEnabled.java deleted file mode 100644 index 8e5b774a50..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/EssentiaCompatEnabled.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.github.technus.tectech.magicAddon; - -import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; -import com.github.technus.tectech.magicAddon.definitions.iElementalAspect; -import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; -import net.minecraft.tileentity.TileEntity; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.IAspectContainer; -import thaumcraft.common.tiles.TileEssentiaReservoir; -import thaumcraft.common.tiles.TileJarFillable; - -import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectToDef; - -/** - * Created by Tec on 21.05.2017. - */ -public class EssentiaCompatEnabled extends EssentiaCompat { - @Override - public void run() { - - } - - @Override - public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta) { - TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); - return tile!=null && (tile instanceof TileEssentiaReservoir) || (tile instanceof TileJarFillable); - } - - @Override - public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta) { - TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); - return tile!=null && !tile.isInvalid() && (tile instanceof TileEssentiaReservoir) || (tile instanceof TileJarFillable)?tile:null; - } - - @Override - public boolean putElementalInstanceStack(TileEntity container,cElementalInstanceStack stack){ - if(container==null || container.isInvalid())return false; - if((container instanceof IAspectContainer) && (stack.definition instanceof iElementalAspect)){ - Aspect aspect=(Aspect)(((iElementalAspect) stack.definition).materializeIntoAspect()); - if(aspect!=null){ - ((IAspectContainer) container).addToContainer(aspect,1); - return true; - } - } - return false; - } - - @Override - public cElementalInstanceStack getFromContainer(TileEntity container){ - if(container==null || container.isInvalid())return null; - if(container instanceof IAspectContainer){ - AspectList aspects=((IAspectContainer) container).getAspects(); - if(aspects!=null){ - Aspect[] aspectsArr= aspects.getAspects(); - if(aspectsArr!=null && aspectsArr[0]!=null){ - if (((IAspectContainer) container).takeFromContainer(aspectsArr[0],1)){ - cElementalDefinition def=aspectToDef.get(aspectsArr[0].getTag()); - if(def!=null){ - return new cElementalInstanceStack(def,1); - } - } - } - } - } - return null; - } -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompat.java deleted file mode 100644 index 3c5d8cc507..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompat.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.technus.tectech.magicAddon.definitions; - - -import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; -import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; - -import java.util.HashMap; - -/** - * Created by Tec on 21.05.2017. - */ -public class AspectDefinitionCompat { - public static AspectDefinitionCompat aspectDefinitionCompat; - static final HashMap defToAspect = new HashMap<>(); - public static final HashMap aspectToDef = new HashMap<>(); - - public void run(){} - - Object getAspect(cElementalDefinition definition){ - return null; - } - - String getAspectTag(cElementalDefinition definition){ - return null; - } - - iElementalDefinition getDefinition(String aspect){ - return null; - } -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompatEnabled.java deleted file mode 100644 index 8623b9a845..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/AspectDefinitionCompatEnabled.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.github.technus.tectech.magicAddon.definitions; - -import com.github.technus.tectech.elementalMatter.classes.cElementalDefinition; -import com.github.technus.tectech.elementalMatter.classes.tElementalException; -import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; -import thaumcraft.api.aspects.Aspect; - -import java.util.ArrayList; - -import static com.github.technus.tectech.magicAddon.definitions.ePrimalAspectDefinition.*; - -/** - * Created by Tec on 21.05.2017. - */ -public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat { - public void run(){ - defToAspect.put(magic_air,"aer"); - defToAspect.put(magic_earth,"terra"); - defToAspect.put(magic_fire,"ignis"); - defToAspect.put(magic_water,"aqua"); - defToAspect.put(magic_order,"ordo"); - defToAspect.put(magic_entropy,"perditio"); - - aspectToDef.put("aer",magic_air); - aspectToDef.put("terra",magic_earth); - aspectToDef.put("ignis",magic_fire); - aspectToDef.put("aqua",magic_water); - aspectToDef.put("ordo",magic_order); - aspectToDef.put("perditio",magic_entropy); - - ArrayList list=Aspect.getCompoundAspects(); - Aspect[] array=list.toArray(new Aspect[0]); - while (!list.isEmpty()) { - for (Aspect aspect : array) { - if (list.contains(aspect)) { - Aspect[] content = aspect.getComponents(); - if (content.length != 2) { - list.remove(aspect); - }else if(aspectToDef.containsKey(content[0].getTag()) && - aspectToDef.containsKey(content[1].getTag())){ - try { - dComplexAspectDefinition newAspect; - if(content[0].getTag().equals(content[1].getTag())){ - newAspect = new dComplexAspectDefinition( - aspectToDef.get(content[0].getTag()).getStackForm(2) - ); - }else{ - newAspect = new dComplexAspectDefinition( - aspectToDef.get(content[0].getTag()).getStackForm(1), - aspectToDef.get(content[1].getTag()).getStackForm(1) - ); - } - aspectToDef.put(aspect.getTag(),newAspect); - defToAspect.put(newAspect,aspect.getTag()); - }catch (tElementalException e) { - /**/ - }finally { - list.remove(aspect); - } - } - } - } - } - } - - @Override - Aspect getAspect(cElementalDefinition definition) { - return Aspect.getAspect(defToAspect.get(definition)); - } - - @Override - String getAspectTag(cElementalDefinition definition) { - return defToAspect.get(definition); - } - - @Override - iElementalDefinition getDefinition(String aspect) { - return aspectToDef.get(aspect); - } - -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java deleted file mode 100644 index 0060ae261b..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.github.technus.tectech.magicAddon.definitions; - -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.classes.*; -import com.github.technus.tectech.elementalMatter.definitions.eBosonDefinition; -import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition; -import net.minecraft.nbt.NBTTagCompound; - -import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; -import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay; -import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat; - -/** - * Created by Tec on 06.05.2017. - */ -public final class dComplexAspectDefinition extends cElementalDefinition implements iElementalAspect { - private final int hash; - public final float mass; - - private static final byte nbtType = (byte) 'c'; - - private final cElementalDefinitionStackMap aspectStacks; - - @Deprecated - public dComplexAspectDefinition(cElementalDefinition... aspects) throws tElementalException { - this(true, new cElementalDefinitionStackMap(aspects)); - } - - @Deprecated - private dComplexAspectDefinition(boolean check, cElementalDefinition... aspects) throws tElementalException { - this(check, new cElementalDefinitionStackMap(aspects)); - } - - public dComplexAspectDefinition(cElementalDefinitionStack... aspects) throws tElementalException { - this(true, new cElementalDefinitionStackMap(aspects)); - } - - private dComplexAspectDefinition(boolean check, cElementalDefinitionStack... aspects) throws tElementalException { - this(check, new cElementalDefinitionStackMap(aspects)); - } - - public dComplexAspectDefinition(cElementalDefinitionStackMap aspects) throws tElementalException { - this(true, aspects); - } - - private dComplexAspectDefinition(boolean check, cElementalDefinitionStackMap aspects) throws tElementalException { - if (check && !canTheyBeTogether(aspects)) throw new tElementalException("Hadron Definition error"); - this.aspectStacks = aspects; - float mass=0; - for(cElementalDefinitionStack stack:aspects.values()){ - mass+=stack.getMass(); - } - this.mass=mass; - hash=super.hashCode(); - } - - //public but u can just try{}catch(){} the constructor it still calls this method - private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) { - int amount = 0; - for (cElementalDefinitionStack aspects : stacks.values()) { - if (aspects.definition instanceof dComplexAspectDefinition || aspects.definition instanceof ePrimalAspectDefinition) - amount += aspects.amount; - else return false; - } - return amount==2; - } - - @Override - public String getName() { - String name= aspectDefinitionCompat.getAspectTag(this); - if(name!=null){ - name=name.substring(0,1).toUpperCase()+name.substring(1); - }else{ - name=getSymbol(); - } - return "Aspect: "+name; - } - - @Override - public String getSymbol() { - String symbol = ""; - for (cElementalDefinitionStack aspect : aspectStacks.values()) { - if (aspect.definition instanceof ePrimalAspectDefinition) { - for (int i = 0; i < aspect.amount; i++) { - symbol += aspect.definition.getSymbol(); - } - } else { - symbol+="("; - for (int i = 0; i < aspect.amount; i++) { - symbol += aspect.definition.getSymbol(); - } - symbol+=")"; - } - } - return symbol; - } - - @Override - public NBTTagCompound toNBT() { - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setByte("t", nbtType); - cElementalDefinitionStack[] quarkStacksValues = aspectStacks.values(); - nbt.setInteger("i", quarkStacksValues.length); - for (int i = 0; i < quarkStacksValues.length; i++) - nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT()); - return nbt; - } - - public static iElementalDefinition fromNBT(NBTTagCompound nbt) { - cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")]; - for (int i = 0; i < stacks.length; i++) - stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i))); - try { - return new dComplexAspectDefinition(stacks); - } catch (tElementalException e) { - if (DEBUG_MODE) e.printStackTrace(); - return null; - } - } - - @Override - public float getRawLifeTime() { - return -1; - } - - @Override - public int getCharge() { - return 0; - } - - @Override - public byte getType() { - return 0; - } - - @Override - public byte getColor() { - return -1; - } - - @Override - public cElementalDefinitionStackMap getSubParticles() { - return aspectStacks; - } - - @Override - public cElementalDecay[] getEnergeticDecayInstant() { - return new cElementalDecay[]{new cElementalDecay(0.75F, aspectStacks), eBosonDefinition.deadEnd}; - } - - @Override - public cElementalDecay[] getNaturalDecayInstant() { - return noDecay; - } - - @Override - public cElementalDecay[] getDecayArray() { - return noDecay; - } - - @Override - public float getMass() { - return mass; - } - - @Override - public aFluidDequantizationInfo someAmountIntoFluidStack() { - return null; - } - - @Override - public aItemDequantizationInfo someAmountIntoItemsStack() { - return null; - } - - @Override - public aOredictDequantizationInfo someAmountIntoOredictStack() { - return null; - } - - public Object materializeIntoAspect() { - return aspectDefinitionCompat.getAspect(this); - } - - @Override - public iElementalDefinition getAnti() { - return null; - } - - public static void run() { - try { - cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-96); - } catch (Exception e) { - if (DEBUG_MODE) e.printStackTrace(); - } - if(DEBUG_MODE) - TecTech.Logger.info("Registered Elemental Matter Class: ComplexAspect "+nbtType+" "+(-96)); - } - - @Override - public byte getClassType() { - return -96; - } - - @Override - public int hashCode() { - return hash; - } -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java deleted file mode 100644 index eafc57b756..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.github.technus.tectech.magicAddon.definitions; - -import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive; - -import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay; -import static com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompat.aspectDefinitionCompat; - -/** - * Created by Tec on 06.05.2017. - */ -public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect { - public static final ePrimalAspectDefinition - magic_air = new ePrimalAspectDefinition("Air", "a`", 0, 1e1F, 0, -1, 35), - magic_earth = new ePrimalAspectDefinition("Earth", "e`", 0, 1e9F, 0, -1, 34), - magic_fire = new ePrimalAspectDefinition("Fire", "f`", 0, 1e3F, 0, -1, 33), - magic_water = new ePrimalAspectDefinition("Water", "w`", 0, 1e7F, 0, -1, 32), - magic_order = new ePrimalAspectDefinition("Order", "o`", 0, 1e5F, 0, -1, 30), - magic_entropy = new ePrimalAspectDefinition("Entropy", "e`", 0, 1e5F, 0, -1, 31); - - private ePrimalAspectDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) { - super(name, symbol, type, mass, charge, color, ID); - } - - public static void run() { - magic_air.init(null, -1F, -1, -1, noDecay); - magic_earth.init(null, -1F, -1, -1, noDecay); - magic_fire.init(null, -1F, -1, -1, noDecay); - magic_water.init(null, -1F, -1, -1, noDecay); - magic_order.init(null, -1F, -1, -1, noDecay); - magic_entropy.init(null, -1F, -1, -1, noDecay); - } - - @Override - public String getName() { - return "Primal: " + name; - } - - public Object materializeIntoAspect() { - return aspectDefinitionCompat.getAspect(this); - } -} - diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/iElementalAspect.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/iElementalAspect.java deleted file mode 100644 index c8ec3c40b4..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/iElementalAspect.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.technus.tectech.magicAddon.definitions; - -/** - * Created by Tec on 21.05.2017. - */ -public interface iElementalAspect { - Object materializeIntoAspect(); -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java deleted file mode 100644 index 00762221e4..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.github.technus.tectech.magicAddon.thing.metaTileEntity.multi; - -import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; -import com.github.technus.tectech.magicAddon.definitions.ePrimalAspectDefinition; -import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; -import com.github.technus.tectech.thing.metaTileEntity.IConstructable; -import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; - -import static com.github.technus.tectech.Util.StructureBuilder; -import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat; -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.enums.GT_Values.E; -import static com.github.technus.tectech.Util.V; - -/** - * Created by danie_000 on 17.12.2016. - */ -public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - private TileEntity container; - - //region Structure - //use multi A energy inputs, use less power the longer it runs - private static final String[][] shape = new String[][]{ - {" "," . "," ",}, - {"0A0",E,"0A0",}, - {"121","232","121",}, - {"\"\"\"","\"2\"","\"\"\"",}, - {"202","0!0","202",}, - }; - private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; - private static final byte[] blockMeta = new byte[]{0,0,4,8}; - private static final String[] addingMethods = new String[]{"addClassicToMachineList", "addElementalInputToMachineList", "addElementalMufflerToMachineList"}; - private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4}; - private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; - private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; - private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Input Hatch", - "3 - Elemental Overflow Hatches or Elemental Casing", - "General - Some sort of Essentia Storage", - }; - //endregion - - public GT_MetaTileEntity_EM_essentiaDequantizer(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GT_MetaTileEntity_EM_essentiaDequantizer(String aName) { - super(aName); - } - - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_EM_essentiaDequantizer(this.mName); - } - - @Override - public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0); - } - - @Override - public void construct(int stackSize, boolean hintsOnly) { - IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); - int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; - int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; - int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if(hintsOnly){ - TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12); - } else{ - if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) - iGregTechTileEntity.getWorld().setBlock( - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12,2); - } - StructureBuilder(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,hintsOnly); - } - - @Override - public String[] getStructureDescription(int stackSize) { - return description; - } - - @Override - public boolean checkRecipe_EM(ItemStack itemStack) { - container=essentiaContainerCompat.getContainer(this); - if (eInputHatches.size() < 1 || container==null) { - stopMachine(); - return false; - } - cElementalInstanceStackMap inputHatchContainer=eInputHatches.get(0).getContainerHandler(); - if(inputHatchContainer.hasStacks()){ - cElementalInstanceStack stack = inputHatchContainer.getFirst(); - inputHatchContainer.removeAmount(false,new cElementalInstanceStack(stack.definition,1)); - if(!essentiaContainerCompat.putElementalInstanceStack(container,stack)) - cleanStackEM_EM(stack); - mMaxProgresstime = 20; - mEfficiencyIncrease = 10000; - eAmpereFlow=1; - if (stack.definition instanceof ePrimalAspectDefinition) { - mEUt = (int) -V[8]; - } else { - mEUt = (int) -V[10]; - } - return true; - } - mEfficiencyIncrease = 0; - mMaxProgresstime = 0; - return false; - } - - @Override - public String[] getDescription() { - return new String[]{ - CommonValues.tecMark, - "Transform quantum form back to...", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "regular one, but why?" - }; - } -} diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java deleted file mode 100644 index 9e11841dfd..0000000000 --- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.github.technus.tectech.magicAddon.thing.metaTileEntity.multi; - -import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; -import com.github.technus.tectech.magicAddon.definitions.ePrimalAspectDefinition; -import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import com.github.technus.tectech.thing.casing.TT_Container_Casings; -import com.github.technus.tectech.thing.metaTileEntity.IConstructable; -import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_MultiblockBase_EM; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; - -import static com.github.technus.tectech.Util.StructureBuilder; -import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat; -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.enums.GT_Values.E; -import static com.github.technus.tectech.Util.V; - -/** - * Created by danie_000 on 17.12.2016. - */ -public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - private TileEntity container; - - //region Structure - //use multi A energy inputs, use less power the longer it runs - private static final String[][] shape = new String[][]{ - {" "," . "," ",}, - {"0A0",E,"0A0",}, - {"121","232","121",}, - {"\"\"\"","\"1\"","\"\"\"",}, - {"010","1!1","010",}, - }; - private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; - private static final byte[] blockMeta = new byte[]{0,4,0,8}; - private static final String[] addingMethods = new String[]{"addClassicToMachineList", "addElementalOutputToMachineList", "addElementalMufflerToMachineList"}; - private static final short[] casingTextures = new short[]{textureOffset, textureOffset+4, textureOffset + 4}; - private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT}; - private static final byte[] blockMetaFallback = new byte[]{0, 4, 4}; - private static final String[] description = new String[]{ - EnumChatFormatting.AQUA+"Hint Details:", - "1 - Classic Hatches or High Power Casing", - "2 - Elemental Output Hatch", - "3 - Elemental Overflow Hatches or Elemental Casing", - "General - Some sort of Essentia Storage", - }; - //endregion - - public GT_MetaTileEntity_EM_essentiaQuantizer(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GT_MetaTileEntity_EM_essentiaQuantizer(String aName) { - super(aName); - } - - public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_EM_essentiaQuantizer(this.mName); - } - - @Override - public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0); - } - - @Override - public void construct(int stackSize, boolean hintsOnly) { - IGregTechTileEntity iGregTechTileEntity=getBaseMetaTileEntity(); - int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX; - int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY; - int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ; - if(hintsOnly){ - TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(), - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12); - } else{ - if(iGregTechTileEntity.getBlockOffset(xDir,0,zDir).getMaterial() == Material.air) - iGregTechTileEntity.getWorld().setBlock( - iGregTechTileEntity.getXCoord()+xDir, - iGregTechTileEntity.getYCoord()+yDir, - iGregTechTileEntity.getZCoord()+zDir, - TT_Container_Casings.sHintCasingsTT,12,2); - } - StructureBuilder(shape, blockType, blockMeta,1, 1, 0, iGregTechTileEntity,hintsOnly); - } - - @Override - public String[] getStructureDescription(int stackSize) { - return description; - } - - @Override - public String[] getDescription() { - return new String[]{ - CommonValues.tecMark, - "Conveniently convert regular stuff into quantum form.", - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "To make it more inconvenient." - }; - } - - @Override - public boolean checkRecipe_EM(ItemStack itemStack) { - container=essentiaContainerCompat.getContainer(this); - cElementalInstanceStack newStack=essentiaContainerCompat.getFromContainer(container); - if(newStack!=null){ - mMaxProgresstime = 20; - mEfficiencyIncrease = 10000; - eAmpereFlow=1; - outputEM = new cElementalInstanceStackMap[]{ - new cElementalInstanceStackMap(newStack) - }; - if (newStack.definition instanceof ePrimalAspectDefinition) { - mEUt = (int) -V[8]; - } else { - mEUt = (int) -V[10]; - } - return true; - } - mEfficiencyIncrease = 0; - mMaxProgresstime = 0; - return false; - } - - @Override - public void outputAfterRecipe_EM() { - if (eOutputHatches.size() < 1) { - stopMachine(); - return; - } - eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]); - outputEM=null; - } -} diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java index f3c8db2873..e3db4d6bb7 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java @@ -8,7 +8,7 @@ import net.minecraft.util.EnumChatFormatting; import java.util.List; -import static com.github.technus.tectech.CommonValues.tecMark; +import static com.github.technus.tectech.CommonValues.TEC_MARK; /** * Created by Tec on 11.04.2017. @@ -22,7 +22,7 @@ public class QuantumGlassItem extends ItemBlock { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - aList.add(tecMark); + aList.add(TEC_MARK); aList.add("Dense yet transparent"); aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Glassy & Classy"); } diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java index 9f2ede1604..0a6136c53b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java @@ -8,7 +8,7 @@ import net.minecraft.util.EnumChatFormatting; import java.util.List; -import static com.github.technus.tectech.CommonValues.tecMark; +import static com.github.technus.tectech.CommonValues.TEC_MARK; /** * Created by danie_000 on 03.10.2016. @@ -20,7 +20,7 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - aList.add(tecMark); + aList.add(TEC_MARK); switch (aStack.getItemDamage()) { case 0://"High Power Casing" aList.add("Well suited for high power applications."); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java index 94e7c23be9..1ed610534d 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java @@ -8,7 +8,7 @@ import net.minecraft.util.EnumChatFormatting; import java.util.List; -import static com.github.technus.tectech.CommonValues.tecMark; +import static com.github.technus.tectech.CommonValues.TEC_MARK; /** * Created by danie_000 on 03.10.2016. @@ -20,7 +20,7 @@ public class GT_Item_HintTT extends GT_Item_Casings_Abstract { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - aList.add(tecMark); + aList.add(TEC_MARK); aList.add("Helps while building"); switch (aStack.getItemDamage()) { case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 11: diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java index 18e7962f41..c4beb63656 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java @@ -109,7 +109,7 @@ public class ConstructableTriggerItem extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { - aList.add(CommonValues.tecMark); + aList.add(CommonValues.TEC_MARK); aList.add("Triggers Constructable Interface"); aList.add(EnumChatFormatting.BLUE + "Shows multiblock construction details,"); aList.add(EnumChatFormatting.BLUE + "just Use on a multiblock controller."); diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java index 835a606897..91eae64419 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java @@ -71,7 +71,7 @@ public class DebugContainer_EM extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { - aList.add(CommonValues.tecMark); + aList.add(CommonValues.TEC_MARK); try { NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT != null && tNBT.hasKey("info")) { diff --git a/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java index 7d666a3218..53fcb764a0 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java @@ -86,7 +86,7 @@ public class DefinitionContainer_EM extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { - aList.add(CommonValues.tecMark); + aList.add(CommonValues.TEC_MARK); try { NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT != null && tNBT.hasKey("info")) { diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java index 1aa9592a5e..af733ac296 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java @@ -90,7 +90,7 @@ public class ParametrizerMemoryCard extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { NBTTagCompound tNBT = aStack.getTagCompound(); - aList.add(CommonValues.bassMark); + aList.add(CommonValues.BASS_MARK); aList.add("Stores Parameters"); if(aStack.getItemDamage()==1) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index 1d069cb77d..3eb0253b7f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; -import static com.github.technus.tectech.CommonValues.moveAt; +import static com.github.technus.tectech.CommonValues.MOVE_AT; import static gregtech.api.enums.Dyes.MACHINE_METAL; /** @@ -79,7 +79,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector extends GT_MetaTileE @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { - if (moveAt == aTick % 20) { + if (MOVE_AT == aTick % 20) { if (q == null) { getBaseMetaTileEntity().setActive(false); } else { @@ -153,7 +153,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector extends GT_MetaTileE @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, "High speed fibre optics connector.", EnumChatFormatting.AQUA + "Must be painted to work" diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java index 14a9057c51..6eb3b42f8a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java @@ -123,7 +123,7 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription //"Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index 4bbd7b957e..c1efa781ab 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -106,11 +106,11 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { byte Tick = (byte) (aTick % 20); - if (decayAt == Tick) { + if (DECAY_AT == Tick) { purgeOverflow(); content.tickContent(postEnergize);//Hatches don't life time mult things purgeOverflow(); - } else if (overflowAt == Tick) { + } else if (OVERFLOW_AT == Tick) { if (overflowMatter <= 0) { deathDelay = 3; } else { @@ -137,7 +137,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta } deathDelay--; } - } else if (moveAt == Tick) { + } else if (MOVE_AT == Tick) { if (content.hasStacks()) moveAround(aBaseMetaTileEntity); getBaseMetaTileEntity().setActive(content.hasStacks()); } @@ -245,7 +245,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, "Max stacks amount: " + EnumChatFormatting.AQUA + getMaxStacksCount(), "Stack capacity: " + EnumChatFormatting.AQUA + getMaxStackSize(), diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 734d0ca158..9053f24445 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -124,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, "Amperes In: " + EnumChatFormatting.AQUA + maxAmperesIn() + " A" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java index 4bd0c53a36..93ec7cc899 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java @@ -115,7 +115,7 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch { @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, EnumChatFormatting.AQUA + "Advanced Holding Mechanism!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java index e7c1694bd9..9cfebb76c1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java @@ -23,7 +23,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; -import static com.github.technus.tectech.CommonValues.disperseAt; +import static com.github.technus.tectech.CommonValues.DISPERSE_AT; import static com.github.technus.tectech.loader.MainLoader.elementalPollution; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static com.github.technus.tectech.Util.V; @@ -89,7 +89,7 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, "Mass capacity: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c^2", "Disposal Speed: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c^2)/s", @@ -146,7 +146,7 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aBaseMetaTileEntity.isServerSide() && (aTick % 20) == disperseAt) { + if (aBaseMetaTileEntity.isServerSide() && (aTick % 20) == DISPERSE_AT) { if (aBaseMetaTileEntity.isActive()) { overflowMatter -= overflowDisperse; if (overflowMatter < 0) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index 93d0465dc2..0f37acdc42 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -177,7 +177,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch { @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "E=M*C^2" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java index ec703ac61e..4a4e27b872 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java @@ -24,7 +24,7 @@ import net.minecraft.util.EnumChatFormatting; import java.util.HashMap; import java.util.Map; -import static com.github.technus.tectech.CommonValues.multiCheckAt; +import static com.github.technus.tectech.CommonValues.MULTI_CHECK_AT; import static com.github.technus.tectech.Util.getUniqueIdentifier; import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE; @@ -180,7 +180,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { - if (aTick % 20 == multiCheckAt) { + if (aTick % 20 == MULTI_CHECK_AT) { if (this.heat > 0) { float heatC = 0; for (int i = 0; i < mInventory.length; i++) { @@ -221,7 +221,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch { @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, EnumChatFormatting.AQUA + "Holds Computer Components" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index 11c9ceced8..44d72cfaee 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -171,7 +171,7 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, mDescription, EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Schrödinger equation in a box" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java index 2ff9659b73..c0cf09df77 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java @@ -100,7 +100,7 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Things+Anti Things don't like each other.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Matter into power!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index fdeb73757e..61d370a672 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -179,7 +179,7 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Singularity based power generation.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Super unstable!!!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java index 1a34ec9977..2cb7d1f3d5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java @@ -195,7 +195,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Collide matter at extreme velocities.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Faster than light!!!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index 34a96c7810..0edbf3a75b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -279,7 +279,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, Util.intToString(TecTech.Rnd.nextInt(), 8), EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "You need it to process the number above" }; 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 79ece0f7be..679d69e721 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 @@ -101,7 +101,7 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "The most precise way of making stuff.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "(Trans-Planck process)" }; 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 6802518fc5..11f6793bc1 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 @@ -103,7 +103,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Is life time too long?", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Make it half-life (3) instead!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index 55e6e11c87..5ba101cd78 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -137,7 +137,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Transform quantum form back to...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "regular one, but why?" }; 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 eb6b3f06c1..f2dce92ffa 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 @@ -132,7 +132,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Power Transfer Extreme!", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Insanely fast charging!", EnumChatFormatting.BLUE + "Doesn't work while broken!", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index 010ac1bdb0..66ed00c1c0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -70,7 +70,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Reroutes Matter", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Axis aligned movement!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java index abe930c07f..adeba2bec4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java @@ -43,7 +43,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Processing quantum matter since...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "the time u started using it." }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index 303e23f5a7..feda70465b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -78,7 +78,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Conveniently convert regular stuff into quantum form.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "To make it more inconvenient." }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 032f1d03b3..1d14ab7d72 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -336,7 +336,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Philosophers didn't even...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "dream about it!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index 5fcd1d054a..e69a5fd60e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -105,7 +105,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "What is existing here?", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "I HAVE NO IDEA (yet)!" }; 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 6474a042c6..25cac16c7c 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 @@ -68,7 +68,7 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Alters time to stabilize matter", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Wibbly wobbly timey wimey, stuff." }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index 6127960f03..2e7760c36c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -160,7 +160,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "User controlled computation power routing", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Quality of service is a must" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 0ec32e52fb..be465b8cd0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -103,7 +103,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Power substation", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "All the transformation!", EnumChatFormatting.BLUE + "Only 0.78125% power loss, HAYO!", 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 023c4d6afd..71565f2592 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 @@ -101,7 +101,7 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "It is not full of worms.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "It is full of anti-worms!!!" }; 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 f6b64f3361..de40e3f5e8 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 @@ -196,7 +196,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Nothing special just override me." }; } @@ -532,9 +532,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt if (mStartUpCheck < 0) {//E if (mMachine) {//S final byte Tick = (byte) (aTick % 20); - if (multiPurge1At == Tick || multiPurge2At == Tick) + if (MULTI_PURGE_1_AT == Tick || MULTI_PURGE_2_AT == Tick) purgeAllOverflowEM_EM(); - else if (multiCheckAt == Tick) + else if (MULTI_CHECK_AT == Tick) for (GT_MetaTileEntity_Hatch_Maintenance tHatch : mMaintenanceHatches) { if (isValidMetaTileEntity(tHatch)) { if (disableMaintenance) { @@ -563,7 +563,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } } } - else if (moveAt == Tick && eSafeVoid) { + else if (MOVE_AT == Tick && eSafeVoid) { for (GT_MetaTileEntity_Hatch_MufflerElemental voider : eMufflerHatches) { if (voider.overflowMax < voider.getOverflowMatter()) continue; float remaining = voider.overflowMax - voider.getOverflowMatter(); @@ -593,7 +593,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } if (getRepairStatus() >= minRepairStatus) {//S - if (multiCheckAt == Tick) + if (MULTI_CHECK_AT == Tick) hatchesStatusUpdate_EM(); //region power pass and controller charging @@ -641,7 +641,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt if (!polluteEnvironment(getPollutionPerTick(mInventory[1]))) stopMachine(); if (!polluteEnvironment_EM(getPollutionPerTick_EM(mInventory[1]))) stopMachine(); - if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime && recipeAt == Tick) {//progress increase and done + if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime && RECIPE_AT == Tick) {//progress increase and done hatchesStatusUpdate_EM(); outputAfterRecipe_EM(); @@ -673,7 +673,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt }// else {//failed to consume power/resources - inside on running tick // stopMachine(); //} - } else if (recipeAt == Tick || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) { + } else if (RECIPE_AT == Tick || aBaseMetaTileEntity.hasWorkJustBeenEnabled()) { if (aBaseMetaTileEntity.isAllowedToWork()) { if (checkRecipe(mInventory[1])) { mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000))); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 29ad312a79..3d0e6f78ce 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -146,7 +146,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public String[] getDescription() { return new String[]{ - CommonValues.bassMark, + CommonValues.BASS_MARK, "High Frequency Oven", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "From live to done in seconds!", EnumChatFormatting.BLUE + "I said nuke the... I meant microwave supper!", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java index d495c7e9f2..1d8c8f0525 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java @@ -92,7 +92,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Advanced data transmission", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Don't stare at the beam!", EnumChatFormatting.AQUA + "Must be painted to work", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java index 3d22fc040c..4089ff0be4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java @@ -91,7 +91,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements iConnec @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, "Quantum tunneling device.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Not a portal!!!", EnumChatFormatting.AQUA + "Must be painted to work", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java index 986f3e75a4..b7589fbea0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java @@ -129,7 +129,7 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, this.mDescription, EnumChatFormatting.BLUE + "Infinite Producer/Consumer", EnumChatFormatting.BLUE + "Since i wanted one..." diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java index f300b3e432..c8d686e022 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java @@ -143,7 +143,7 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti @Override public String[] getDescription() { return new String[]{ - CommonValues.tecMark, + CommonValues.TEC_MARK, this.mDescription, EnumChatFormatting.BLUE + "Prints Multiblock NonTE structure check code", EnumChatFormatting.BLUE + "ABC axises aligned to machine front" diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index 36437fa741..3b60922248 100644 --- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -19,7 +19,7 @@ public class TurretBaseItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(CommonValues.tecMark); + list.add(CommonValues.TEC_MARK); list.add(""); list.add(EnumChatFormatting.AQUA + "--" + StatCollector.translateToLocal("tooptip.energy.label") + "--"); list.add(StatCollector.translateToLocal("tooltip.rf.max") + ": " + EnumChatFormatting.WHITE + 1000000000); diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index db2e034710..c728f30db0 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -11,7 +11,7 @@ import openmodularturrets.handler.ConfigHandler; import java.text.DecimalFormat; import java.util.List; -import static com.github.technus.tectech.CommonValues.tecMark; +import static com.github.technus.tectech.CommonValues.TEC_MARK; /** * Created by Bass on 28/07/2017. @@ -24,7 +24,7 @@ public class TurretHeadItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(tecMark); + list.add(TEC_MARK); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--"); list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5"); -- cgit From e346b566c913e2ae7fad884ba84c2372532a42d1 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 9 Sep 2017 21:04:20 +0200 Subject: Nerf microwave a bit --- src/main/java/com/github/technus/tectech/loader/MainLoader.java | 2 +- .../metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 95f8a2ed53..4259078c69 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -29,7 +29,7 @@ import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat; import static gregtech.api.enums.GT_Values.W; -public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft to enable higher tier machinery. (above UV), or implement a check for GT tier values. +public final class MainLoader { public static DamageSource microwaving, elementalPollution; public void load() { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 3d0e6f78ce..e845f9d814 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -188,9 +188,13 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock yPos+(flipped?.5:2.5), zPos+1.5+zDirShift); - int damagingFactor = powerSetting >> 9; - boolean inside=true; + int damagingFactor = + Math.min(powerSetting >> 6,8)+ + Math.min(powerSetting >> 8,24)+ + Math.min(powerSetting >> 12,48)+ + powerSetting >> 18; + boolean inside=true; do { for (Object entity : mte.getWorld().getEntitiesWithinAABBExcludingEntity(null, aabb)) { if (entity instanceof Entity) { -- cgit From 2b2af824c48d042de3e171dde1dc025fbfc04b63 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 10 Sep 2017 22:37:57 +0200 Subject: fix things --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index e845f9d814..74db6b70e3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -14,7 +14,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.InventoryPlayer; @@ -192,7 +191,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock Math.min(powerSetting >> 6,8)+ Math.min(powerSetting >> 8,24)+ Math.min(powerSetting >> 12,48)+ - powerSetting >> 18; + (powerSetting >> 18); boolean inside=true; do { @@ -213,7 +212,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock ((EntityItem) entity).setDead(); } else if (entity instanceof EntityLivingBase) { if(!GT_Utility.isWearingFullElectroHazmat((EntityLivingBase) entity)) - ((EntityLiving) entity).attackEntityFrom(microwaving, damagingFactor); + ((EntityLivingBase) entity).attackEntityFrom(microwaving, damagingFactor); } } } -- cgit From 249ca58c41426e9e7e86d60da6fdf3a944b0a670 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 10 Sep 2017 22:38:36 +0200 Subject: fix infuser --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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 f2dce92ffa..bdca45aac5 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 @@ -143,7 +143,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa private long doChargeItemStack(IElectricItem item, ItemStack stack) { try { double euDiff = item.getMaxCharge(stack) - ElectricItem.manager.getCharge(stack); - if (euDiff > 0) this.setEUVar(this.getEUVar() - this.getEUVar() >> 5); + if (euDiff > 0) this.setEUVar(this.getEUVar() - (this.getEUVar() >> 5)); long remove = (long) Math.ceil( ElectricItem.manager.charge(stack, Math.min(euDiff, this.getEUVar()) -- 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(-) (limited to 'src') 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(-) (limited to 'src') 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 From 069eee6fa0c980f8f38ebcc31474c669f323e647 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 11 Sep 2017 07:03:12 +0200 Subject: make microwave use able without parameters --- src/main/java/com/github/technus/tectech/TecTech.java | 9 ++------- .../metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 6 +++++- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index c5e47ed068..3f8f0549c0 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -44,7 +44,6 @@ public class TecTech { public static TecTechConfig ModConfig; public static XSTR Rnd = null; public static CreativeTabs mainTab = null; - private static boolean oneTimeFix = false; public static boolean hasCOFH = false, hasThaumcraft = false; @@ -92,6 +91,8 @@ public class TecTech { @EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { GTCustomLoader.postLoad(); + if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes(); + fixBlocks(); } @EventHandler @@ -100,11 +101,6 @@ public class TecTech { @EventHandler public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { - if (!oneTimeFix) { - oneTimeFix = true; - if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes(); - fixBlocks(); - } } private void FixBrokenFusionRecipes() { @@ -151,7 +147,6 @@ public class TecTech { "GalacticraftMars", "GalaxySpace", "extracells", - "ExtraUtilities", "Avaritia", "avaritiaddons", "EnderStorage", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 74db6b70e3..706b367046 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -35,7 +35,7 @@ import static gregtech.api.GregTech_API.sBlockCasings4; */ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { private int powerSetting = 1000; - private int timerSetting = 0; + private int timerSetting = 360; private int timerValue = 0; private boolean hasBeenPausedThiscycle=false; private boolean flipped=false; @@ -72,10 +72,14 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock public GT_MetaTileEntity_TM_microwave(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); + eParamsIn[0] =powerSetting; + eParamsIn[10]=timerSetting; } public GT_MetaTileEntity_TM_microwave(String aName) { super(aName); + eParamsIn[0] =powerSetting; + eParamsIn[10]=timerSetting; } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { -- cgit From 8334c42a5818cd279d0a2ac7105c6f18192ae64f Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 15 Sep 2017 17:21:47 +0200 Subject: Fix typo --- .../metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 706b367046..8360b09708 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -37,7 +37,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock private int powerSetting = 1000; private int timerSetting = 360; private int timerValue = 0; - private boolean hasBeenPausedThiscycle=false; + private boolean hasBeenPausedThisCycle =false; private boolean flipped=false; //region Structure @@ -158,7 +158,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public boolean checkRecipe_EM(ItemStack itemStack) { - hasBeenPausedThiscycle=false; + hasBeenPausedThisCycle =false; if(powerSetting<=300 || eParamsInStatus[0] == PARAM_TOO_HIGH || timerSetting<=0 || timerSetting>3000) return false; if (timerValue <= 0) { timerValue=timerSetting; @@ -172,7 +172,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public void outputAfterRecipe_EM() { - if(hasBeenPausedThiscycle) return;//skip timer and actions if paused + if(hasBeenPausedThisCycle) return;//skip timer and actions if paused timerValue--; IGregTechTileEntity mte=getBaseMetaTileEntity(); int xDirShift = ForgeDirection.getOrientation(mte.getBackFacing()).offsetX*2; @@ -264,8 +264,8 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public boolean onRunningTick(ItemStack aStack) { - if(eSafeVoid) hasBeenPausedThiscycle=true; - return hasBeenPausedThiscycle || super.onRunningTick(aStack);//consume eu and other resources if not paused + if(eSafeVoid) hasBeenPausedThisCycle =true; + return hasBeenPausedThisCycle || super.onRunningTick(aStack);//consume eu and other resources if not paused } @Override -- cgit