diff options
Diffstat (limited to 'src/main/java/com/elisis/gtnhlanth/common/tileentity')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java | 82 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java | 106 |
2 files changed, 116 insertions, 72 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index fd837c8c4a..479569c7f6 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -52,22 +52,26 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> private HeatingCoilLevel heatLevel; - private final IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder().addShape( + private final IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder() + .addShape( mName, transpose( - new String[][] { { " ", " ttttt ", " t---t ", " t---t ", " t---t ", " ttttt ", " " }, - { " ttt ", " t---t ", "t-----t", "t-----t", "t-----t", " t---t ", " ttt " }, - { " tccct ", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", " tccct " }, - { " tt~tt ", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", " ttttt " }, })) - - .addElement( - 't', - buildHatchAdder(Digester.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy, Muffler) - .casingIndex(47).dot(1).buildAndChain(GregTech_API.sBlockCasings4, 0)) - .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) - .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)).build(); + new String[][] { { " ", " ttttt ", " t---t ", " t---t ", " t---t ", " ttttt ", " " }, + { " ttt ", " t---t ", "t-----t", "t-----t", "t-----t", " t---t ", " ttt " }, + { " tccct ", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", " tccct " }, + { " tt~tt ", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", " ttttt " }, })) + + .addElement( + 't', + buildHatchAdder(Digester.class) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy, Muffler) + .casingIndex(47) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings4, 0)) + .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) + .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)) + .build(); // private int mHeat; // private int mNeededHeat; @@ -115,8 +119,8 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> @Override protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { - return recipe.mSpecialValue <= Digester.this.getCoilLevel().getHeat() - ? CheckRecipeResultRegistry.SUCCESSFUL + return recipe.mSpecialValue <= Digester.this.getCoilLevel() + .getHeat() ? CheckRecipeResultRegistry.SUCCESSFUL : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); } @@ -175,18 +179,29 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> } public ITexture[] getTexture(IGregTechTileEntity te, ForgeDirection side, ForgeDirection facing, int colorIndex, - boolean active, boolean redstone) { + boolean active, boolean redstone) { // Oil Cracker textures cuz I'm lazy if (side == facing) { - if (active) return new ITexture[] { casingTexturePages[0][47], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { casingTexturePages[0][47], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build() }; + if (active) return new ITexture[] { casingTexturePages[0][47], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][47], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][47] }; } @@ -194,12 +209,19 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Digester").addInfo("Controller block for the Digester") - .addInfo("Input ores and fluid, output water.").addInfo(BLUEPRINT_INFO).addSeparator() - .addController("Front bottom").addInputHatch("Hint block with dot 1") - .addInputBus("Hint block with dot 1").addOutputHatch("Hint block with dot 1") - .addOutputBus("Hint block with dot 1").addMaintenanceHatch("Hint block with dot 1") - .addMufflerHatch("Hint block with dot 1").toolTipFinisher("GTNH: Lanthanides"); + tt.addMachineType("Digester") + .addInfo("Controller block for the Digester") + .addInfo("Input ores and fluid, output water.") + .addInfo(BLUEPRINT_INFO) + .addSeparator() + .addController("Front bottom") + .addInputHatch("Hint block with dot 1") + .addInputBus("Hint block with dot 1") + .addOutputHatch("Hint block with dot 1") + .addOutputBus("Hint block with dot 1") + .addMaintenanceHatch("Hint block with dot 1") + .addMufflerHatch("Hint block with dot 1") + .toolTipFinisher("GTNH: Lanthanides"); return tt; } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index e764ee4617..f515024365 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -53,24 +53,25 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank> - implements ISurvivalConstructable, ISecondaryDescribable { + implements ISurvivalConstructable, ISecondaryDescribable { private final IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder() - .addShape( - mName, - transpose( - new String[][] { { " sss ", "sssss", "sssss", "sssss", " sss " }, - { "sgggs", "g---g", "g---g", "g---g", "sgggs" }, - { "sgggs", "g---g", "g---g", "g---g", "sgggs" }, - { "ss~ss", "shhhs", "shhhs", "shhhs", "sssss" }, - { "s s", " ", " ", " ", "s s" } })) - .addElement( - 's', - buildHatchAdder(DissolutionTank.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy).casingIndex(49) - .dot(1).buildAndChain(GregTech_API.sBlockCasings4, 1)) - .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) - .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1)).build(); + .addShape( + mName, + transpose( + new String[][] { { " sss ", "sssss", "sssss", "sssss", " sss " }, + { "sgggs", "g---g", "g---g", "g---g", "sgggs" }, { "sgggs", "g---g", "g---g", "g---g", "sgggs" }, + { "ss~ss", "shhhs", "shhhs", "shhhs", "sssss" }, { "s s", " ", " ", " ", "s s" } })) + .addElement( + 's', + buildHatchAdder(DissolutionTank.class) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy) + .casingIndex(49) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings4, 1)) + .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) + .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1)) + .build(); public DissolutionTank(String name) { super(name); @@ -158,8 +159,10 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di // ? fluidInputOne // : fluidInputTwo); // GT_Log.out.print(majorInput.getLocalizedName()); - if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) { - if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) { + if (fluidInputOne.getUnlocalizedName() + .equals(majorGenericFluid.getUnlocalizedName())) { + if (fluidInputTwo.getUnlocalizedName() + .equals(minorGenericFluid.getUnlocalizedName())) { // majorInput = fluidInputOne; majorAmount = fluidInputOne.amount; // minorInput = fluidInputTwo; @@ -167,16 +170,18 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di // GT_Log.out.print("in first IF"); } else return false; // No valid other input - } else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) { - if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) { - // majorInput = fluidInputTwo; - majorAmount = fluidInputTwo.amount; - // minorInput = fluidInputOne; - minorAmount = fluidInputOne.amount; - // GT_Log.out.print("in second if"); - } else return false; + } else if (fluidInputTwo.getUnlocalizedName() + .equals(majorGenericFluid.getUnlocalizedName())) { + if (fluidInputOne.getUnlocalizedName() + .equals(minorGenericFluid.getUnlocalizedName())) { + // majorInput = fluidInputTwo; + majorAmount = fluidInputTwo.amount; + // minorInput = fluidInputOne; + minorAmount = fluidInputOne.amount; + // GT_Log.out.print("in second if"); + } else return false; - } else return false; + } else return false; // GT_Log.out.print("out of switch weirdness"); @@ -215,16 +220,27 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di @Override public ITexture[] getTexture(IGregTechTileEntity te, ForgeDirection side, ForgeDirection facing, int colorIndex, - boolean active, boolean redstone) { + boolean active, boolean redstone) { if (side == facing) { - if (active) return new ITexture[] { casingTexturePages[0][49], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { casingTexturePages[0][49], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build() }; + if (active) return new ITexture[] { casingTexturePages[0][49], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][49], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][49] }; } @@ -232,13 +248,19 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Dissolution Tank").addInfo("Controller block for the Dissolution Tank") - .addInfo("Input Water and Fluid, output Fluid") - .addInfo("You must input the Fluids at the correct Ratio").addInfo(BLUEPRINT_INFO).addSeparator() - .addController("Front bottom").addInputHatch("Hint block with dot 1") - .addInputBus("Hint block with dot 1").addOutputHatch("Hint block with dot 1") - .addOutputBus("Hint block with dot 1").addMaintenanceHatch("Hint block with dot 1") - .toolTipFinisher("GTNH: Lanthanides"); + tt.addMachineType("Dissolution Tank") + .addInfo("Controller block for the Dissolution Tank") + .addInfo("Input Water and Fluid, output Fluid") + .addInfo("You must input the Fluids at the correct Ratio") + .addInfo(BLUEPRINT_INFO) + .addSeparator() + .addController("Front bottom") + .addInputHatch("Hint block with dot 1") + .addInputBus("Hint block with dot 1") + .addOutputHatch("Hint block with dot 1") + .addOutputBus("Hint block with dot 1") + .addMaintenanceHatch("Hint block with dot 1") + .toolTipFinisher("GTNH: Lanthanides"); return tt; } |