constant + oops

vrejhead · vrejhead · commit f0798f1ae681 · 2024-12-26T18:58:16.000-08:00
diff --git a/src/main/java/gregtech/api/capability/IMultiblockController.java b/src/main/java/gregtech/api/capability/IMultiblockController.java
@@ -1,11 +1,13 @@
 package gregtech.api.capability;
 
+import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
+
 public interface IMultiblockController {
 
     boolean isStructureFormed(String name);
 
     default boolean isStructureFormed() {
-        return isStructureFormed("main");
+        return isStructureFormed(MultiblockControllerBase.DEFAULT_STRUCTURE);
     }
 
     default boolean isStructureObstructed() {
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/IMultiblockPart.java b/src/main/java/gregtech/api/metatileentity/multiblock/IMultiblockPart.java
@@ -8,7 +8,7 @@ public interface IMultiblockPart {
     boolean isAttachedToMultiBlock();
 
     default void addToMultiBlock(@NotNull MultiblockControllerBase controllerBase) {
-        addToMultiBlock(controllerBase, "main");
+        addToMultiBlock(controllerBase, MultiblockControllerBase.DEFAULT_STRUCTURE);
     }
 
     void addToMultiBlock(@NotNull MultiblockControllerBase controllerBase, @NotNull String substructureName);
@@ -29,7 +29,7 @@ default void addToMultiBlock(@NotNull MultiblockControllerBase controllerBase) {
     boolean canPartShare(MultiblockControllerBase target, String substructureName);
 
     default boolean canPartShare(MultiblockControllerBase target) {
-        return canPartShare(target, "main");
+        return canPartShare(target, MultiblockControllerBase.DEFAULT_STRUCTURE);
     }
 
     default boolean canPartShare() {
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java
@@ -90,6 +90,7 @@
 import static gregtech.api.capability.GregtechDataCodes.*;
 
 public abstract class MultiblockControllerBase extends MetaTileEntity implements IMultiblockController {
+    public static final String DEFAULT_STRUCTURE = "main";
 
     protected final Comparator<IMultiblockPart> partComparator = Comparator.comparingLong(part -> {
         MetaTileEntity mte = (MetaTileEntity) part;
@@ -144,7 +145,7 @@ public void update() {
     protected abstract IBlockPattern createStructurePattern();
 
     protected void createStructurePatterns() {
-        structures.put("main", createStructurePattern());
+        structures.put(DEFAULT_STRUCTURE, createStructurePattern());
     }
 
     public EnumFacing getUpwardsFacing() {
@@ -444,7 +445,7 @@ public void checkStructurePatterns() {
     }
 
     public void checkStructurePattern() {
-        checkStructurePattern("main");
+        checkStructurePattern(DEFAULT_STRUCTURE);
     }
 
     public void checkStructurePattern(String name) {
@@ -587,11 +588,11 @@ protected void formStructure(String name) {
     }
 
     protected void formStructure() {
-        formStructure("main");
+        formStructure(DEFAULT_STRUCTURE);
     }
 
     public void invalidateStructure() {
-        invalidateStructure("main");
+        invalidateStructure(DEFAULT_STRUCTURE);
     }
 
     public void invalidateStructure(String name) {
@@ -628,12 +629,12 @@ public IBlockPattern getSubstructure(String name) {
     }
 
     public IBlockPattern getSubstructure() {
-        return getSubstructure("main");
+        return getSubstructure(DEFAULT_STRUCTURE);
     }
 
     public String trySubstructure(String name) {
         if (structures.get(name) != null) return name;
-        return "main";
+        return DEFAULT_STRUCTURE;
     }
 
     public Set<String> trySubstructure(Map<String, String> map) {
@@ -642,15 +643,15 @@ public Set<String> trySubstructure(Map<String, String> map) {
         for (String key : map.keySet()) {
             if (key.startsWith("substructure")) set.add(trySubstructure(map.get(key)));
         }
-        if (set.isEmpty()) set.add("main");
+        if (set.isEmpty()) set.add(DEFAULT_STRUCTURE);
         return set;
     }
 
     @Override
     public void onRemoval() {
         super.onRemoval();
         if (!getWorld().isRemote) {
-            invalidateStructure("main");
+            invalidateStructure(DEFAULT_STRUCTURE);
         }
     }
 
diff --git a/src/main/java/gregtech/client/renderer/handler/MultiblockPreviewRenderer.java b/src/main/java/gregtech/client/renderer/handler/MultiblockPreviewRenderer.java
@@ -126,7 +126,7 @@ public static void renderControllerInList(MultiblockControllerBase src, Map<Stri
         world.setBlockState(SOURCE, src.getBlock().getDefaultState());
         world.setTileEntity(SOURCE, holder);
 
-        ((MultiblockControllerBase) holder.getMetaTileEntity()).autoBuild(new GregFakePlayer(world), keyMap, "main");
+        ((MultiblockControllerBase) holder.getMetaTileEntity()).autoBuild(new GregFakePlayer(world), keyMap, MultiblockControllerBase.DEFAULT_STRUCTURE);
         ((MultiblockControllerBase) holder.getMetaTileEntity()).checkStructurePattern();
 
         int finalMaxY = (int) (layer % (world.getMaxPos().y - world.getMinPos().y + 2));
diff --git a/src/main/java/gregtech/common/EventHandlers.java b/src/main/java/gregtech/common/EventHandlers.java
@@ -125,7 +125,7 @@ public static void onPlayerInteractionLeftClickBlock(PlayerInteractEvent.LeftCli
             if (holder instanceof IGregTechTileEntity &&
                     ((IGregTechTileEntity) holder).getMetaTileEntity() instanceof MetaTileEntityCentralMonitor) {
                 ((MetaTileEntityCentralMonitor) ((IGregTechTileEntity) holder).getMetaTileEntity())
-                        .invalidateStructure("main");
+                        .invalidateStructure();
             }
         }
     }
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityActiveTransformer.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityActiveTransformer.java
@@ -97,7 +97,7 @@ protected void formStructure(String name) {
 
         // Invalidate the structure if there is not at least one output and one input
         if (powerInput.isEmpty() || powerOutput.isEmpty()) {
-            this.invalidateStructure("main");
+            this.invalidateStructure();
         }
 
         this.powerInput = new EnergyContainerList(powerInput);
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java
@@ -164,7 +164,7 @@ public void addInformation(ItemStack stack, @Nullable World player, List<String>
     public void addDisplayText(List<ITextComponent> textList) {
         super.addDisplayText(textList);
         textList.add(new TextComponentString("Multi aisle repeats: " +
-                ((BasicAisleStrategy) ((BlockPattern) structures.get("main")).getAisleStrategy())
+                ((BasicAisleStrategy) ((BlockPattern) structures.get(DEFAULT_STRUCTURE)).getAisleStrategy())
                         .getMultiAisleRepeats(1)));
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityPowerSubstation.java
@@ -115,7 +115,7 @@ protected void formStructure(String name) {
 
         if (parts.isEmpty()) {
             // only empty batteries found in the structure
-            invalidateStructure("main");
+            invalidateStructure();
             return;
         }
         if (this.energyBank == null) {
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityResearchStation.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityResearchStation.java
@@ -76,7 +76,7 @@ protected void formStructure(String name) {
 
         // should never happen, but would rather do this than have an obscure NPE
         if (computationProvider == null || objectHolder == null) {
-            invalidateStructure("main");
+            invalidateStructure();
         }
     }
 
@@ -85,7 +85,7 @@ protected void formStructure(String name) {
     public void checkStructurePattern() {
         super.checkStructurePattern();
         if (isStructureFormed() && objectHolder.getFrontFacing() != getFrontFacing().getOpposite()) {
-            invalidateStructure("main");
+            invalidateStructure();
         }
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/centralmonitor/MetaTileEntityCentralMonitor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/centralmonitor/MetaTileEntityCentralMonitor.java
@@ -522,7 +522,7 @@ public void renderMetaTileEntity(double x, double y, double z, float partialTick
                         TileEntity tileEntity = getWorld().getTileEntity(pos);
                         if (tileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tileEntity)
                                 .getMetaTileEntity() instanceof MetaTileEntityMonitorScreen screen) {
-                            screen.addToMultiBlock(this, "main");
+                            screen.addToMultiBlock(this);
                             int sx = screen.getX(), sy = screen.getY();
                             if (sx < 0 || sx >= width || sy < 0 || sy >= height) {
                                 parts.clear();
diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockPart.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMultiblockPart.java
@@ -282,7 +282,7 @@ public void onRemoval() {
 
         List<MultiblockControllerBase> controllers = getControllers();
         for (int i = 0; i < controllers.size(); i++) {
-            controllers.get(controllers.size() - 1).invalidateStructure("main");
+            controllers.get(i).invalidateStructure();
         }
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/primitive/MetaTileEntityCharcoalPileIgniter.java b/src/main/java/gregtech/common/metatileentities/primitive/MetaTileEntityCharcoalPileIgniter.java
@@ -134,7 +134,7 @@ public void invalidateStructure(String name) {
     protected void formStructure(String name) {
         super.formStructure(name);
         // this doesn't iterate over any(), so doesn't count the borders
-        forEachFormed("main", (info, pos) -> {
+        forEachFormed(DEFAULT_STRUCTURE, (info, pos) -> {
             BlockPos immutable = pos.immutable();
 
             if (info.getBlockState().getBlock().isWood(getWorld(), immutable)) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public interface IMultiblockPart {`
`8`	`8`	`boolean isAttachedToMultiBlock();`
`9`	`9`
`10`	`10`	`default void addToMultiBlock(@NotNull MultiblockControllerBase controllerBase) {`
`11`		`- addToMultiBlock(controllerBase, "main");`
	`11`	`+ addToMultiBlock(controllerBase, MultiblockControllerBase.DEFAULT_STRUCTURE);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`void addToMultiBlock(@NotNull MultiblockControllerBase controllerBase, @NotNull String substructureName);`
`@@ -29,7 +29,7 @@ default void addToMultiBlock(@NotNull MultiblockControllerBase controllerBase) {`
`29`	`29`	`boolean canPartShare(MultiblockControllerBase target, String substructureName);`
`30`	`30`
`31`	`31`	`default boolean canPartShare(MultiblockControllerBase target) {`
`32`		`- return canPartShare(target, "main");`
	`32`	`+ return canPartShare(target, MultiblockControllerBase.DEFAULT_STRUCTURE);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`default boolean canPartShare() {`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@`
`90`	`90`	`import static gregtech.api.capability.GregtechDataCodes.*;`
`91`	`91`
`92`	`92`	`public abstract class MultiblockControllerBase extends MetaTileEntity implements IMultiblockController {`
	`93`	`+ public static final String DEFAULT_STRUCTURE = "main";`
`93`	`94`
`94`	`95`	`protected final Comparator<IMultiblockPart> partComparator = Comparator.comparingLong(part -> {`
`95`	`96`	`MetaTileEntity mte = (MetaTileEntity) part;`
`@@ -144,7 +145,7 @@ public void update() {`
`144`	`145`	`protected abstract IBlockPattern createStructurePattern();`
`145`	`146`
`146`	`147`	`protected void createStructurePatterns() {`
`147`		`- structures.put("main", createStructurePattern());`
	`148`	`+ structures.put(DEFAULT_STRUCTURE, createStructurePattern());`
`148`	`149`	`}`
`149`	`150`
`150`	`151`	`public EnumFacing getUpwardsFacing() {`
`@@ -444,7 +445,7 @@ public void checkStructurePatterns() {`
`444`	`445`	`}`
`445`	`446`
`446`	`447`	`public void checkStructurePattern() {`
`447`		`- checkStructurePattern("main");`
	`448`	`+ checkStructurePattern(DEFAULT_STRUCTURE);`
`448`	`449`	`}`
`449`	`450`
`450`	`451`	`public void checkStructurePattern(String name) {`
`@@ -587,11 +588,11 @@ protected void formStructure(String name) {`
`587`	`588`	`}`
`588`	`589`
`589`	`590`	`protected void formStructure() {`
`590`		`- formStructure("main");`
	`591`	`+ formStructure(DEFAULT_STRUCTURE);`
`591`	`592`	`}`
`592`	`593`
`593`	`594`	`public void invalidateStructure() {`
`594`		`- invalidateStructure("main");`
	`595`	`+ invalidateStructure(DEFAULT_STRUCTURE);`
`595`	`596`	`}`
`596`	`597`
`597`	`598`	`public void invalidateStructure(String name) {`
`@@ -628,12 +629,12 @@ public IBlockPattern getSubstructure(String name) {`
`628`	`629`	`}`
`629`	`630`
`630`	`631`	`public IBlockPattern getSubstructure() {`
`631`		`- return getSubstructure("main");`
	`632`	`+ return getSubstructure(DEFAULT_STRUCTURE);`
`632`	`633`	`}`
`633`	`634`
`634`	`635`	`public String trySubstructure(String name) {`
`635`	`636`	`if (structures.get(name) != null) return name;`
`636`		`- return "main";`
	`637`	`+ return DEFAULT_STRUCTURE;`
`637`	`638`	`}`
`638`	`639`
`639`	`640`	`public Set<String> trySubstructure(Map<String, String> map) {`
`@@ -642,15 +643,15 @@ public Set<String> trySubstructure(Map<String, String> map) {`
`642`	`643`	`for (String key : map.keySet()) {`
`643`	`644`	`if (key.startsWith("substructure")) set.add(trySubstructure(map.get(key)));`
`644`	`645`	`}`
`645`		`- if (set.isEmpty()) set.add("main");`
	`646`	`+ if (set.isEmpty()) set.add(DEFAULT_STRUCTURE);`
`646`	`647`	`return set;`
`647`	`648`	`}`
`648`	`649`
`649`	`650`	`@Override`
`650`	`651`	`public void onRemoval() {`
`651`	`652`	`super.onRemoval();`
`652`	`653`	`if (!getWorld().isRemote) {`
`653`		`- invalidateStructure("main");`
	`654`	`+ invalidateStructure(DEFAULT_STRUCTURE);`
`654`	`655`	`}`
`655`	`656`	`}`
`656`	`657`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static void onPlayerInteractionLeftClickBlock(PlayerInteractEvent.LeftCli`
`125`	`125`	`if (holder instanceof IGregTechTileEntity &&`
`126`	`126`	`((IGregTechTileEntity) holder).getMetaTileEntity() instanceof MetaTileEntityCentralMonitor) {`
`127`	`127`	`((MetaTileEntityCentralMonitor) ((IGregTechTileEntity) holder).getMetaTileEntity())`
`128`		`- .invalidateStructure("main");`
	`128`	`+ .invalidateStructure();`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ protected void formStructure(String name) {`
`97`	`97`
`98`	`98`	`// Invalidate the structure if there is not at least one output and one input`
`99`	`99`	`if (powerInput.isEmpty() \|\| powerOutput.isEmpty()) {`
`100`		`- this.invalidateStructure("main");`
	`100`	`+ this.invalidateStructure();`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`this.powerInput = new EnergyContainerList(powerInput);`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void addInformation(ItemStack stack, @Nullable World player, List<String>`
`164`	`164`	`public void addDisplayText(List<ITextComponent> textList) {`
`165`	`165`	`super.addDisplayText(textList);`
`166`	`166`	`textList.add(new TextComponentString("Multi aisle repeats: " +`
`167`		`- ((BasicAisleStrategy) ((BlockPattern) structures.get("main")).getAisleStrategy())`
	`167`	`+ ((BasicAisleStrategy) ((BlockPattern) structures.get(DEFAULT_STRUCTURE)).getAisleStrategy())`
`168`	`168`	`.getMultiAisleRepeats(1)));`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ protected void formStructure(String name) {`
`115`	`115`
`116`	`116`	`if (parts.isEmpty()) {`
`117`	`117`	`// only empty batteries found in the structure`
`118`		`- invalidateStructure("main");`
	`118`	`+ invalidateStructure();`
`119`	`119`	`return;`
`120`	`120`	`}`
`121`	`121`	`if (this.energyBank == null) {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected void formStructure(String name) {`
`76`	`76`
`77`	`77`	`// should never happen, but would rather do this than have an obscure NPE`
`78`	`78`	`if (computationProvider == null \|\| objectHolder == null) {`
`79`		`- invalidateStructure("main");`
	`79`	`+ invalidateStructure();`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`@@ -85,7 +85,7 @@ protected void formStructure(String name) {`
`85`	`85`	`public void checkStructurePattern() {`
`86`	`86`	`super.checkStructurePattern();`
`87`	`87`	`if (isStructureFormed() && objectHolder.getFrontFacing() != getFrontFacing().getOpposite()) {`
`88`		`- invalidateStructure("main");`
	`88`	`+ invalidateStructure();`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`