Skip to content

Commit 4fef8fb

Browse files
TechLord22TechLord22
authored
MTE ID Reallocation (#2793)
1 parent f0d827d commit 4fef8fb

16 files changed

+1765
-1184
lines changed

‎src/main/java/gregtech/common/metatileentities/MetaTileEntities.java‎

Lines changed: 37 additions & 887 deletions
Large diffs are not rendered by default.

‎src/main/java/gregtech/common/metatileentities/MetaTileEntityRegistration.java‎

Lines changed: 1073 additions & 0 deletions
Large diffs are not rendered by default.

‎src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityTransformer.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
import gregtech.client.renderer.texture.Textures;
99
import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
1010
import gregtech.client.utils.PipelineUtil;
11-
import gregtech.common.metatileentities.MetaTileEntities;
1211

1312
import net.minecraft.client.resources.I18n;
14-
import net.minecraft.creativetab.CreativeTabs;
1513
import net.minecraft.entity.player.EntityPlayer;
1614
import net.minecraft.item.ItemStack;
1715
import net.minecraft.nbt.NBTTagCompound;
1816
import net.minecraft.network.PacketBuffer;
1917
import net.minecraft.util.EnumFacing;
2018
import net.minecraft.util.EnumHand;
21-
import net.minecraft.util.NonNullList;
2219
import net.minecraft.util.ResourceLocation;
2320
import net.minecraft.util.text.TextComponentTranslation;
2421
import net.minecraft.world.World;
@@ -284,20 +281,4 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List<String> t
284281
tooltip.add(I18n.format("gregtech.tool_action.soft_mallet.toggle_mode"));
285282
super.addToolUsages(stack, world, tooltip, advanced);
286283
}
287-
288-
@Override
289-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
290-
// fix JEI ordering
291-
if (this == MetaTileEntities.TRANSFORMER[0]) {
292-
for (var transformer : MetaTileEntities.TRANSFORMER) {
293-
if (transformer != null) subItems.add(transformer.getStackForm());
294-
}
295-
for (var transformer : MetaTileEntities.HI_AMP_TRANSFORMER) {
296-
if (transformer != null) subItems.add(transformer.getStackForm());
297-
}
298-
for (var transformer : MetaTileEntities.POWER_TRANSFORMER) {
299-
if (transformer != null) subItems.add(transformer.getStackForm());
300-
}
301-
}
302-
}
303284
}

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityAutoMaintenanceHatch.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77
import gregtech.api.metatileentity.multiblock.IMultiblockAbilityPart;
88
import gregtech.api.metatileentity.multiblock.MultiblockAbility;
99
import gregtech.client.renderer.texture.Textures;
10-
import gregtech.common.ConfigHolder;
11-
import gregtech.common.metatileentities.MetaTileEntities;
1210

1311
import net.minecraft.client.resources.I18n;
14-
import net.minecraft.creativetab.CreativeTabs;
1512
import net.minecraft.item.ItemStack;
16-
import net.minecraft.util.NonNullList;
1713
import net.minecraft.util.ResourceLocation;
1814
import net.minecraft.util.Tuple;
1915
import net.minecraft.world.World;
@@ -114,13 +110,4 @@ public void registerAbilities(@NotNull AbilityInstances abilityInstances) {
114110
public boolean canPartShare() {
115111
return false;
116112
}
117-
118-
@Override
119-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
120-
if (ConfigHolder.machines.enableMaintenance) {
121-
super.getSubItems(creativeTab, subItems);
122-
// keeps things in order despite IDs being out of order, due to the Cleaning Hatch being added later
123-
subItems.add(MetaTileEntities.CLEANING_MAINTENANCE_HATCH.getStackForm());
124-
}
125-
}
126113
}

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCleaningMaintenanceHatch.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
import gregtech.client.renderer.texture.Textures;
1010

1111
import net.minecraft.client.resources.I18n;
12-
import net.minecraft.creativetab.CreativeTabs;
1312
import net.minecraft.item.ItemStack;
14-
import net.minecraft.util.NonNullList;
1513
import net.minecraft.util.ResourceLocation;
1614
import net.minecraft.util.text.TextFormatting;
1715
import net.minecraft.world.World;
@@ -85,11 +83,6 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation,
8583
Textures.MAINTENANCE_OVERLAY_CLEANING.renderSided(getFrontFacing(), renderState, translation, pipeline);
8684
}
8785

88-
@Override
89-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
90-
// does nothing here so the Auto Maintenance Hatch can put this right after it
91-
}
92-
9386
@Override
9487
public void addInformation(ItemStack stack, @Nullable World player, List<String> tooltip, boolean advanced) {
9588
super.addInformation(stack, player, tooltip, advanced);

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityEnergyHatch.java‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@
1616
import gregtech.client.renderer.texture.Textures;
1717
import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
1818
import gregtech.client.utils.PipelineUtil;
19-
import gregtech.common.metatileentities.MetaTileEntities;
2019

2120
import net.minecraft.client.resources.I18n;
22-
import net.minecraft.creativetab.CreativeTabs;
2321
import net.minecraft.entity.EntityLivingBase;
2422
import net.minecraft.item.ItemStack;
2523
import net.minecraft.nbt.NBTTagCompound;
2624
import net.minecraft.network.PacketBuffer;
27-
import net.minecraft.util.NonNullList;
2825
import net.minecraft.util.ResourceLocation;
2926
import net.minecraft.util.math.BlockPos;
3027
import net.minecraft.world.World;
@@ -175,42 +172,6 @@ public boolean canRenderFrontFaceX() {
175172
return isExportHatch;
176173
}
177174

178-
@Override
179-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
180-
// override here is gross, but keeps things in order despite
181-
// IDs being out of order, due to EV 4A and UEV+ 4A+ hatches being added later
182-
if (this == MetaTileEntities.ENERGY_INPUT_HATCH[0]) {
183-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.ENERGY_INPUT_HATCH) {
184-
if (hatch != null) subItems.add(hatch.getStackForm());
185-
}
186-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.ENERGY_OUTPUT_HATCH) {
187-
if (hatch != null) subItems.add(hatch.getStackForm());
188-
}
189-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.ENERGY_INPUT_HATCH_4A) {
190-
if (hatch != null) subItems.add(hatch.getStackForm());
191-
}
192-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.ENERGY_INPUT_HATCH_16A) {
193-
if (hatch != null) subItems.add(hatch.getStackForm());
194-
}
195-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.ENERGY_OUTPUT_HATCH_4A) {
196-
if (hatch != null) subItems.add(hatch.getStackForm());
197-
}
198-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.ENERGY_OUTPUT_HATCH_16A) {
199-
if (hatch != null) subItems.add(hatch.getStackForm());
200-
}
201-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.SUBSTATION_ENERGY_INPUT_HATCH) {
202-
if (hatch != null) subItems.add(hatch.getStackForm());
203-
}
204-
for (MetaTileEntityEnergyHatch hatch : MetaTileEntities.SUBSTATION_ENERGY_OUTPUT_HATCH) {
205-
if (hatch != null) subItems.add(hatch.getStackForm());
206-
}
207-
} else if (this.getClass() != MetaTileEntityEnergyHatch.class &&
208-
this.getClass() != MetaTileEntitySubstationEnergyHatch.class) {
209-
// let subclasses fall through this override
210-
super.getSubItems(creativeTab, subItems);
211-
}
212-
}
213-
214175
@Override
215176
public void doExplosion(float explosionPower) {
216177
if (getController() != null)

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,14 @@
2222
import gregtech.api.mui.widget.GhostCircuitSlotWidget;
2323
import gregtech.client.renderer.texture.Textures;
2424
import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
25-
import gregtech.common.metatileentities.MetaTileEntities;
2625
import gregtech.common.metatileentities.storage.MetaTileEntityQuantumTank;
2726
import gregtech.common.mui.widget.GTFluidSlot;
2827

2928
import net.minecraft.client.resources.I18n;
30-
import net.minecraft.creativetab.CreativeTabs;
3129
import net.minecraft.item.ItemStack;
3230
import net.minecraft.nbt.NBTTagCompound;
3331
import net.minecraft.network.PacketBuffer;
3432
import net.minecraft.util.EnumFacing;
35-
import net.minecraft.util.NonNullList;
3633
import net.minecraft.util.ResourceLocation;
3734
import net.minecraft.world.World;
3835
import net.minecraftforge.common.capabilities.Capability;
@@ -410,21 +407,6 @@ private void setLocked(boolean locked) {
410407
fluidTank.onContentsChanged();
411408
}
412409

413-
@Override
414-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
415-
if (this == MetaTileEntities.FLUID_IMPORT_HATCH[0]) {
416-
for (var hatch : MetaTileEntities.FLUID_IMPORT_HATCH) {
417-
if (hatch != null) subItems.add(hatch.getStackForm());
418-
}
419-
for (var hatch : MetaTileEntities.FLUID_EXPORT_HATCH) {
420-
if (hatch != null) subItems.add(hatch.getStackForm());
421-
}
422-
} else if (this.getClass() != MetaTileEntityFluidHatch.class) {
423-
// let subclasses fall through this override
424-
super.getSubItems(creativeTab, subItems);
425-
}
426-
}
427-
428410
protected class HatchFluidTank extends NotifiableFluidTank implements IFilteredFluidContainer, IFilter<FluidStack> {
429411

430412
public HatchFluidTank(int capacity, MetaTileEntity entityToNotify, boolean isExport) {

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityItemBus.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,14 @@
1818
import gregtech.api.util.GTHashMaps;
1919
import gregtech.client.renderer.texture.Textures;
2020
import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
21-
import gregtech.common.metatileentities.MetaTileEntities;
2221

2322
import net.minecraft.client.resources.I18n;
24-
import net.minecraft.creativetab.CreativeTabs;
2523
import net.minecraft.entity.player.EntityPlayer;
2624
import net.minecraft.item.ItemStack;
2725
import net.minecraft.nbt.NBTTagCompound;
2826
import net.minecraft.network.PacketBuffer;
2927
import net.minecraft.util.EnumFacing;
3028
import net.minecraft.util.EnumHand;
31-
import net.minecraft.util.NonNullList;
3229
import net.minecraft.util.ResourceLocation;
3330
import net.minecraft.util.text.TextComponentTranslation;
3431
import net.minecraft.world.World;
@@ -458,21 +455,4 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List<String> t
458455
tooltip.add(I18n.format("gregtech.tool_action.wrench.set_facing"));
459456
super.addToolUsages(stack, world, tooltip, advanced);
460457
}
461-
462-
@Override
463-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
464-
// override here is gross, but keeps things in order despite
465-
// IDs being out of order, due to UEV+ being added later
466-
if (this == MetaTileEntities.ITEM_IMPORT_BUS[0]) {
467-
for (var hatch : MetaTileEntities.ITEM_IMPORT_BUS) {
468-
if (hatch != null) subItems.add(hatch.getStackForm());
469-
}
470-
for (var hatch : MetaTileEntities.ITEM_EXPORT_BUS) {
471-
if (hatch != null) subItems.add(hatch.getStackForm());
472-
}
473-
} else if (this.getClass() != MetaTileEntityItemBus.class) {
474-
// let subclasses fall through this override
475-
super.getSubItems(creativeTab, subItems);
476-
}
477-
}
478458
}

‎src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiFluidHatch.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@
1313
import gregtech.api.mui.GTGuis;
1414
import gregtech.client.renderer.texture.Textures;
1515
import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
16-
import gregtech.common.metatileentities.MetaTileEntities;
1716
import gregtech.common.mui.widget.GTFluidSlot;
1817

1918
import net.minecraft.client.resources.I18n;
20-
import net.minecraft.creativetab.CreativeTabs;
2119
import net.minecraft.item.ItemStack;
2220
import net.minecraft.nbt.NBTTagCompound;
2321
import net.minecraft.network.PacketBuffer;
2422
import net.minecraft.util.EnumFacing;
25-
import net.minecraft.util.NonNullList;
2623
import net.minecraft.util.ResourceLocation;
2724
import net.minecraft.world.World;
2825
import net.minecraftforge.common.capabilities.Capability;
@@ -231,27 +228,4 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
231228
.coverChildren())
232229
.bindPlayerInventory();
233230
}
234-
235-
@Override
236-
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> subItems) {
237-
// override here is gross, but keeps things in order despite
238-
// IDs being out of order, due to IV+ hatches being added later
239-
if (this == MetaTileEntities.QUADRUPLE_IMPORT_HATCH[0]) {
240-
for (var hatch : MetaTileEntities.QUADRUPLE_IMPORT_HATCH) {
241-
if (hatch != null) subItems.add(hatch.getStackForm());
242-
}
243-
for (var hatch : MetaTileEntities.QUADRUPLE_EXPORT_HATCH) {
244-
if (hatch != null) subItems.add(hatch.getStackForm());
245-
}
246-
for (var hatch : MetaTileEntities.NONUPLE_IMPORT_HATCH) {
247-
if (hatch != null) subItems.add(hatch.getStackForm());
248-
}
249-
for (var hatch : MetaTileEntities.NONUPLE_EXPORT_HATCH) {
250-
if (hatch != null) subItems.add(hatch.getStackForm());
251-
}
252-
} else if (this.getClass() != MetaTileEntityMultiFluidHatch.class) {
253-
// let subclasses fall through this override
254-
super.getSubItems(creativeTab, subItems);
255-
}
256-
}
257231
}

‎src/main/java/gregtech/datafix/GTDataFixers.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import gregtech.api.GTValues;
44
import gregtech.api.GregTechAPI;
5+
import gregtech.datafix.impl.V2PostMTEReallocFixer;
56
import gregtech.datafix.migration.impl.MigrateMTEBlockTE;
67
import gregtech.datafix.migration.impl.MigrateMTEItems;
8+
import gregtech.datafix.migration.lib.MTEDataMigrator;
79
import gregtech.datafix.migration.lib.MTERegistriesMigrator;
810
import gregtech.datafix.walker.WalkItemStackLike;
911

@@ -19,6 +21,9 @@
1921

2022
import java.util.stream.IntStream;
2123

24+
import static gregtech.api.GTValues.*;
25+
import static gregtech.common.metatileentities.MetaTileEntities.*;
26+
2227
public final class GTDataFixers {
2328

2429
public static final Logger LOGGER = LogManager.getLogger("GregTech DataFixers");
@@ -58,6 +63,10 @@ private static void registerFixes(@NotNull GTDataVersion version, @NotNull ModFi
5863
fixer.registerFix(GTFixType.ITEM_STACK_LIKE, new MigrateMTEItems(migrator));
5964
fixer.registerFix(FixTypes.CHUNK, new MigrateMTEBlockTE(migrator));
6065
}
66+
case V2_POST_ID_REALLOC -> {
67+
MTEDataMigrator dataMigrator = new MTEDataMigrator(fixer, version.ordinal());
68+
V2PostMTEReallocFixer.apply(dataMigrator);
69+
}
6170
default -> {}
6271
}
6372
}

0 commit comments

Comments
 (0)