From e10265c901dd7725be1d2dfbda1627c5839e17ff Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 13 Feb 2025 20:25:55 +0900 Subject: [PATCH 1/6] bla --- .../common/metatileentities/electric/MetaTileEntityDiode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java index c19b1797f96..7766fd3ece2 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java @@ -122,7 +122,7 @@ protected int getMaxAmperage() { protected void reinitializeEnergyContainer() { long tierVoltage = GTValues.V[getTier()]; - this.energyContainer = new EnergyContainerHandler(this, tierVoltage * 16, tierVoltage, amps, tierVoltage, amps); + this.energyContainer = new EnergyContainerHandler(this, tierVoltage * getMaxAmperage(), tierVoltage, amps, tierVoltage, amps); ((EnergyContainerHandler) this.energyContainer).setSideInputCondition(s -> s != getFrontFacing()); ((EnergyContainerHandler) this.energyContainer).setSideOutputCondition(s -> s == getFrontFacing()); } From 9fb5734af9a2cc138d4a99a5930e9403e366064a Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 13 Feb 2025 20:33:21 +0900 Subject: [PATCH 2/6] bla 2 --- .../electric/MetaTileEntityDiode.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java index 7766fd3ece2..fec2816b639 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java @@ -50,12 +50,22 @@ public class MetaTileEntityDiode extends MetaTileEntityMultiblockPart private static final String AMP_NBT_KEY = "amp_mode"; private int amps; private boolean isWorkingEnabled; + private final int maxAmps; public MetaTileEntityDiode(ResourceLocation metaTileEntityId, int tier) { super(metaTileEntityId, tier); amps = 1; reinitializeEnergyContainer(); isWorkingEnabled = true; + maxAmps = 16; + } + + public MetaTileEntityDiode(ResourceLocation metaTileEntityId, int tier, int maxAmps) { + super(metaTileEntityId, tier); + amps = 1; + reinitializeEnergyContainer(); + isWorkingEnabled = true; + this.maxAmps = maxAmps; } @Override @@ -117,7 +127,7 @@ private void setAmpMode() { /** Change this value (or override) to make the Diode able to handle more amps. Must be a power of 2 */ protected int getMaxAmperage() { - return 16; + return maxAmps; } protected void reinitializeEnergyContainer() { From 61555f430989a421f6787b5bee874367e5c59e3c Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 13 Feb 2025 20:37:12 +0900 Subject: [PATCH 3/6] blaless --- .../common/metatileentities/electric/MetaTileEntityDiode.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java index fec2816b639..774f213eb7b 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java @@ -132,7 +132,8 @@ protected int getMaxAmperage() { protected void reinitializeEnergyContainer() { long tierVoltage = GTValues.V[getTier()]; - this.energyContainer = new EnergyContainerHandler(this, tierVoltage * getMaxAmperage(), tierVoltage, amps, tierVoltage, amps); + this.energyContainer = new EnergyContainerHandler(this, tierVoltage * getMaxAmperage(), tierVoltage, amps, + tierVoltage, amps); ((EnergyContainerHandler) this.energyContainer).setSideInputCondition(s -> s != getFrontFacing()); ((EnergyContainerHandler) this.energyContainer).setSideOutputCondition(s -> s == getFrontFacing()); } From 69533d97337720f232c2527a1166547e45dd7413 Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 13 Feb 2025 20:38:42 +0900 Subject: [PATCH 4/6] bla comment --- .../common/metatileentities/electric/MetaTileEntityDiode.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java index 774f213eb7b..a57b5dd8c4b 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java @@ -125,7 +125,6 @@ private void setAmpMode() { } } - /** Change this value (or override) to make the Diode able to handle more amps. Must be a power of 2 */ protected int getMaxAmperage() { return maxAmps; } From 1f268411d2a7d3209dbcf31eb3bf80e0ab02a2f9 Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 13 Feb 2025 20:45:21 +0900 Subject: [PATCH 5/6] comment --- .../common/metatileentities/electric/MetaTileEntityDiode.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java index a57b5dd8c4b..48a50238595 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java @@ -60,6 +60,9 @@ public MetaTileEntityDiode(ResourceLocation metaTileEntityId, int tier) { maxAmps = 16; } + /** + * @param maxAmps Must be power of 2 + */ public MetaTileEntityDiode(ResourceLocation metaTileEntityId, int tier, int maxAmps) { super(metaTileEntityId, tier); amps = 1; From 0a705cc24373f43ce86b62ebaebb3dc52f76ae6d Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 13 Feb 2025 20:50:36 +0900 Subject: [PATCH 6/6] better --- .../common/metatileentities/MetaTileEntities.java | 2 +- .../metatileentities/electric/MetaTileEntityDiode.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index 5e213673e81..1e13f91f1fe 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -867,7 +867,7 @@ public static void init() { endPos = GregTechAPI.isHighTier() ? DIODES.length - 1 : Math.min(DIODES.length - 1, GTValues.UV + 2); for (int i = 0; i < endPos; i++) { String diodeId = "diode." + GTValues.VN[i].toLowerCase(); - MetaTileEntityDiode diode = new MetaTileEntityDiode(gregtechId(diodeId), i); + MetaTileEntityDiode diode = new MetaTileEntityDiode(gregtechId(diodeId), i, 16); DIODES[i] = registerMetaTileEntity(1300 + i, diode); } diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java index 48a50238595..8512fbb181f 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityDiode.java @@ -52,14 +52,6 @@ public class MetaTileEntityDiode extends MetaTileEntityMultiblockPart private boolean isWorkingEnabled; private final int maxAmps; - public MetaTileEntityDiode(ResourceLocation metaTileEntityId, int tier) { - super(metaTileEntityId, tier); - amps = 1; - reinitializeEnergyContainer(); - isWorkingEnabled = true; - maxAmps = 16; - } - /** * @param maxAmps Must be power of 2 */ @@ -73,7 +65,7 @@ public MetaTileEntityDiode(ResourceLocation metaTileEntityId, int tier, int maxA @Override public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { - return new MetaTileEntityDiode(metaTileEntityId, getTier()); + return new MetaTileEntityDiode(metaTileEntityId, getTier(), getMaxAmperage()); } @Override