From 5e775c848433f901744d842827d3d0e3c1b70072 Mon Sep 17 00:00:00 2001 From: serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Thu, 14 Dec 2023 20:33:13 -0600 Subject: [PATCH 1/2] Fix using MV muffler in EBF JEI preview --- .../common/metatileentities/MetaTileEntities.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index d35d77f79d8..a6a1bff49b0 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -1137,12 +1137,13 @@ public static void init() { CLEANING_MAINTENANCE_HATCH = registerMetaTileEntity(1401, new MetaTileEntityCleaningMaintenanceHatch(gregtechId("maintenance_hatch_cleanroom_auto"))); - // Muffler Hatches, IDs 1657- - for (int i = 0; i < MUFFLER_HATCH.length; i++) { - String voltageName = GTValues.VN[i + 1].toLowerCase(); - MUFFLER_HATCH[i] = new MetaTileEntityMufflerHatch(gregtechId("muffler_hatch." + voltageName), i + 1); + // Muffler Hatches, IDs 1657-1664 + for (int i = 0; i < MUFFLER_HATCH.length - 1; i++) { + int tier = i + 1; + String voltageName = GTValues.VN[tier].toLowerCase(); + MUFFLER_HATCH[tier] = new MetaTileEntityMufflerHatch(gregtechId("muffler_hatch." + voltageName), tier); - registerMetaTileEntity(1657 + i, MUFFLER_HATCH[i]); + registerMetaTileEntity(1657 + i, MUFFLER_HATCH[tier]); } CLIPBOARD_TILE = registerMetaTileEntity(1666, new MetaTileEntityClipboard(gregtechId("clipboard"))); From f8cd8e2a6d9f112bba5cc5bf46d72528a77e3425 Mon Sep 17 00:00:00 2001 From: serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Thu, 14 Dec 2023 20:36:15 -0600 Subject: [PATCH 2/2] fix --- .../java/gregtech/common/metatileentities/MetaTileEntities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java index a6a1bff49b0..c346ac65e23 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntities.java @@ -267,7 +267,7 @@ public class MetaTileEntities { // UHV public static final MetaTileEntityRotorHolder[] ROTOR_HOLDER = new MetaTileEntityRotorHolder[6]; // HV, EV, IV, LuV, // ZPM, UV - public static final MetaTileEntityMufflerHatch[] MUFFLER_HATCH = new MetaTileEntityMufflerHatch[GTValues.UV]; // LV-UV + public static final MetaTileEntityMufflerHatch[] MUFFLER_HATCH = new MetaTileEntityMufflerHatch[GTValues.UV + 1]; // LV-UV public static final MetaTileEntityFusionReactor[] FUSION_REACTOR = new MetaTileEntityFusionReactor[3]; public static final MetaTileEntityQuantumChest[] QUANTUM_CHEST = new MetaTileEntityQuantumChest[10]; public static final MetaTileEntityQuantumTank[] QUANTUM_TANK = new MetaTileEntityQuantumTank[10];