Move all model properties to a central class (#3499)

Author: screret

src/generated/resources/assets/gtceu/models/block/machine/configurable_maintenance_hatch.json

@@ -8,7 +8,7 @@
     "side"
   ],
   "variants": {
-    "maintenance_taped=false": {
+    "taped=false": {
       "model": {
         "parent": "gtceu:block/machine/part/configurable_maintenance_hatch",
         "textures": {
@@ -18,7 +18,7 @@
         }
       }
     },
-    "maintenance_taped=true": {
+    "taped=true": {
       "model": {
         "parent": "gtceu:block/machine/part/configurable_maintenance_hatch",
         "textures": {

src/generated/resources/assets/gtceu/models/block/machine/maintenance_hatch.json

@@ -8,7 +8,7 @@
     "side"
   ],
   "variants": {
-    "maintenance_taped=false": {
+    "taped=false": {
       "model": {
         "parent": "gtceu:block/machine/part/maintenance_hatch",
         "textures": {
@@ -18,7 +18,7 @@
         }
       }
     },
-    "maintenance_taped=true": {
+    "taped=true": {
       "model": {
         "parent": "gtceu:block/machine/part/maintenance_hatch",
         "textures": {

src/main/java/com/gregtechceu/gtceu/api/blockentity/IPaintable.java

@@ -1,10 +1,12 @@
 package com.gregtechceu.gtceu.api.blockentity;
 
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
+
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public interface IPaintable {
 
-    BooleanProperty IS_PAINTED_PROPERTY = BooleanProperty.create("is_painted");
+    BooleanProperty IS_PAINTED_PROPERTY = GTMachineModelProperties.IS_PAINTED;
     int UNPAINTED_COLOR = 0xffffffff;
 
     /**

src/main/java/com/gregtechceu/gtceu/api/capability/IControllable.java

@@ -1,10 +1,12 @@
 package com.gregtechceu.gtceu.api.capability;
 
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
+
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public interface IControllable {
 
-    BooleanProperty WORKING_ENABLED_PROPERTY = BooleanProperty.create("working_enabled");
+    BooleanProperty WORKING_ENABLED_PROPERTY = GTMachineModelProperties.IS_WORKING_ENABLED;
 
     /**
      * @return true if the controllable is allowed to work

src/main/java/com/gregtechceu/gtceu/api/capability/IHPCAComponentHatch.java

@@ -1,12 +1,14 @@
 package com.gregtechceu.gtceu.api.capability;
 
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
+
 import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
 
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 public interface IHPCAComponentHatch {
 
-    BooleanProperty HPCA_PART_DAMAGED_PROPERTY = BooleanProperty.create("hpca_part_damaged");
+    BooleanProperty HPCA_PART_DAMAGED_PROPERTY = GTMachineModelProperties.IS_HPCA_PART_DAMAGED;
 
     /**
      * How much EU/t this component needs for the multi to just be idle.

src/main/java/com/gregtechceu/gtceu/api/capability/IWorkable.java

@@ -1,13 +1,15 @@
 package com.gregtechceu.gtceu.api.capability;
 
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
+
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 
 /**
  * For machines which have progress and can work
  */
 public interface IWorkable extends IControllable {
 
-    BooleanProperty ACTIVE_PROPERTY = BooleanProperty.create("active");
+    BooleanProperty ACTIVE_PROPERTY = GTMachineModelProperties.IS_ACTIVE;
 
     /**
      * @return current progress of machine

src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java

@@ -19,6 +19,7 @@
 import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight;
 import com.gregtechceu.gtceu.api.machine.feature.*;
 import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart;
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.machine.trait.MachineTrait;
 import com.gregtechceu.gtceu.api.misc.IOFilteredInvWrapper;
 import com.gregtechceu.gtceu.api.misc.IOFluidHandlerList;
@@ -192,8 +193,8 @@ public void setPaintingColor(int color) {
         this.onPaintingColorChanged(color);
 
         MachineRenderState renderState = getRenderState();
-        if (renderState.hasProperty(IS_PAINTED_PROPERTY)) {
-            setRenderState(renderState.setValue(IS_PAINTED_PROPERTY, this.isPainted()));
+        if (renderState.hasProperty(GTMachineModelProperties.IS_PAINTED)) {
+            setRenderState(renderState.setValue(GTMachineModelProperties.IS_PAINTED, this.isPainted()));
         }
     }
 
@@ -225,11 +226,10 @@ public void onLoad() {
         coverContainer.onLoad();
 
         // update the painted model property if the machine is painted
-        if (this.isPainted()) {
-            MachineRenderState renderState = getRenderState();
-            if (renderState.hasProperty(IS_PAINTED_PROPERTY) && !renderState.getValue(IS_PAINTED_PROPERTY)) {
-                setRenderState(renderState.setValue(IS_PAINTED_PROPERTY, true));
-            }
+        MachineRenderState renderState = getRenderState();
+        if (renderState.hasProperty(GTMachineModelProperties.IS_PAINTED) &&
+                this.isPainted() != renderState.getValue(GTMachineModelProperties.IS_PAINTED)) {
+            setRenderState(renderState.setValue(GTMachineModelProperties.IS_PAINTED, this.isPainted()));
         }
     }
 

src/main/java/com/gregtechceu/gtceu/api/machine/feature/IExhaustVentMachine.java

@@ -1,6 +1,7 @@
 package com.gregtechceu.gtceu.api.machine.feature;
 
 import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection;
 import com.gregtechceu.gtceu.common.data.GTDamageTypes;
 import com.gregtechceu.gtceu.config.ConfigHolder;
@@ -29,8 +30,7 @@
  */
 public interface IExhaustVentMachine extends IMachineFeature {
 
-    EnumProperty<RelativeDirection> VENT_DIRECTION_PROPERTY = EnumProperty.create("steam_vent",
-            RelativeDirection.class);
+    EnumProperty<RelativeDirection> VENT_DIRECTION_PROPERTY = GTMachineModelProperties.VENT_DIRECTION;
 
     /**
      * @return the direction the vent faces

src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMaintenanceMachine.java

@@ -4,6 +4,7 @@
 import com.gregtechceu.gtceu.api.gui.GuiTextures;
 import com.gregtechceu.gtceu.api.gui.fancy.IFancyTooltip;
 import com.gregtechceu.gtceu.api.gui.fancy.TooltipsPanel;
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 
@@ -16,7 +17,7 @@
 
 public interface IMaintenanceMachine extends IMultiPart {
 
-    BooleanProperty MAINTENANCE_TAPED_PROPERTY = BooleanProperty.create("maintenance_taped");
+    BooleanProperty MAINTENANCE_TAPED_PROPERTY = GTMachineModelProperties.IS_TAPED;
     int MINIMUM_MAINTENANCE_TIME = 3456000; // 48 real-life hours = 3456000 ticks
     byte ALL_PROBLEMS = 0;
     byte NO_PROBLEMS = 0b111111;

src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiController.java

@@ -4,6 +4,7 @@
 import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IMachineFeature;
 import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
+import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
 import com.gregtechceu.gtceu.api.pattern.BlockPattern;
 import com.gregtechceu.gtceu.api.pattern.MultiblockState;
 import com.gregtechceu.gtceu.client.renderer.MultiblockInWorldPreviewRenderer;
@@ -29,7 +30,7 @@
 
 public interface IMultiController extends IMachineFeature, IInteractedMachine {
 
-    BooleanProperty IS_FORMED_PROPERTY = BooleanProperty.create("is_formed");
+    BooleanProperty IS_FORMED_PROPERTY = GTMachineModelProperties.IS_FORMED;
 
     @Override
     default MultiblockControllerMachine self() {