Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix using MV muffler in EBF JEI preview #2298

Merged
merged 2 commits into from
Dec 15, 2023
Merged

Fix using MV muffler in EBF JEI preview #2298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e775c8
Fix using MV muffler in EBF JEI preview
serenibyss Dec 15, 2023
f8cd8e2
fix
serenibyss Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/gregtech/common/metatileentities/MetaTileEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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")));
Expand Down