From 01d57bbc04bcc4ee752feae6dd4c07bba6e59dd8 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 16 Feb 2023 16:52:51 +0100 Subject: Added new fusion NEI handler support (#135) --- .../java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java | 3 +++ .../java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java | 3 +++ .../java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java | 3 +++ .../java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java | 4 ++++ .../java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java | 4 ++++ .../goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java | 7 +++++++ .../blocks/tileEntity/base/LargeFusionComputerPP.java | 7 +++++++ 7 files changed, 31 insertions(+) (limited to 'src/main/java/goodgenerator/blocks/tileEntity') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java index a97d75aacb..af016f5e20 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java @@ -21,6 +21,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import gregtech.common.power.FusionPower; public class LargeFusionComputer1 extends LargeFusionComputer { @@ -30,10 +31,12 @@ public class LargeFusionComputer1 extends LargeFusionComputer { public LargeFusionComputer1(int id, String name, String nameRegional) { super(id, name, nameRegional); + power = new FusionPower((byte) 6, 160_000_000); } public LargeFusionComputer1(String name) { super(name); + power = new FusionPower((byte) 6, 160_000_000); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java index 4f8841c68b..8229ff1f54 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java @@ -21,6 +21,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import gregtech.common.power.FusionPower; public class LargeFusionComputer2 extends LargeFusionComputer { @@ -30,10 +31,12 @@ public class LargeFusionComputer2 extends LargeFusionComputer { public LargeFusionComputer2(int id, String name, String nameRegional) { super(id, name, nameRegional); + power = new FusionPower((byte) 7, 320_000_000); } public LargeFusionComputer2(String name) { super(name); + power = new FusionPower((byte) 7, 320_000_000); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java index 0a4c99b958..d09cc7cdbb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java @@ -21,6 +21,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import gregtech.common.power.FusionPower; public class LargeFusionComputer3 extends LargeFusionComputer { @@ -30,10 +31,12 @@ public class LargeFusionComputer3 extends LargeFusionComputer { public LargeFusionComputer3(int id, String name, String nameRegional) { super(id, name, nameRegional); + power = new FusionPower((byte) 8, 640_000_000); } public LargeFusionComputer3(String name) { super(name); + power = new FusionPower((byte) 8, 640_000_000); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java index 033c71ed95..ec98d4028e 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java @@ -25,6 +25,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; +import gregtech.api.util.AdvFusionPower; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; @@ -34,10 +35,13 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { public LargeFusionComputer4(int id, String name, String nameRegional) { super(id, name, nameRegional); + // Theoretically the reactor has a higher startup value but special recipe value is limited to int + power = new AdvFusionPower((byte) 9, Integer.MAX_VALUE); } public LargeFusionComputer4(String name) { super(name); + power = new AdvFusionPower((byte) 9, Integer.MAX_VALUE); } // Some hacky shit diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java index a70fa66b78..a660c50dfd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java @@ -23,6 +23,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; +import gregtech.api.util.AdvFusionPower; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; @@ -32,10 +33,13 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { public LargeFusionComputer5(int id, String name, String nameRegional) { super(id, name, nameRegional); + // Theoretically the reactor has a higher startup value but special recipe value is limited to int + power = new AdvFusionPower((byte) 10, Integer.MAX_VALUE); } public LargeFusionComputer5(String name) { super(name); + power = new AdvFusionPower((byte) 10, Integer.MAX_VALUE); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java index dcf78cebcc..b86e8379c0 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java @@ -45,6 +45,7 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gregtech.common.power.FusionPower; public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM implements IConstructable, ISurvivalConstructable { @@ -54,6 +55,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public GT_Recipe mLastRecipe; public int para; public int mEUStore; + protected FusionPower power; private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { @Override @@ -98,6 +100,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti super(id, name, nameRegional); } + @Override + public FusionPower getPower() { + return power; + } + @Override public abstract long maxEUStore(); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java index 47491ea4f4..c2c661e0af 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java @@ -42,6 +42,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu import gregtech.api.objects.GT_ChunkManager; import gregtech.api.objects.GT_ItemStack; import gregtech.api.render.TextureFactory; +import gregtech.api.util.AdvFusionPower; import gregtech.api.util.GT_HatchElementBuilder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -54,6 +55,7 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul public GT_Recipe mLastRecipe; public int para; public long mEUStore; + protected AdvFusionPower power; private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { @Override @@ -99,6 +101,11 @@ public abstract class LargeFusionComputerPP extends GT_MetaTileEntity_TooltipMul super(id, name, nameRegional); } + @Override + public AdvFusionPower getPower() { + return power; + } + @Override public abstract long maxEUStore(); -- cgit