Add Missing Double Plate Flags

Nomi-CEu · Jan 8, 2024 · b4dabc4 · b4dabc4
1 parent 02d2f36
commit b4dabc4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/src/main/java/com/nomiceu/nomilabs/event/CommonProxy.java b/src/main/java/com/nomiceu/nomilabs/event/CommonProxy.java
@@ -22,6 +22,7 @@
 import com.nomiceu.nomilabs.util.LabsModeHelper;
 import com.nomiceu.nomilabs.util.LabsNames;
 import gregtech.api.unification.material.event.MaterialEvent;
+import gregtech.api.unification.material.event.PostMaterialEvent;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.crafting.IRecipe;
@@ -86,10 +87,14 @@ public static void registerMaterials(MaterialEvent event) {
             LabsOrePrefix.init();
             LabsMaterialFlags.init();
         }
-        if (LabsConfig.content.gtCustomContent.enableMaterials) {
+        if (LabsConfig.content.gtCustomContent.enableMaterials)
             LabsMaterials.init();
+    }
+
+    @SubscribeEvent
+    public static void materialChanges(PostMaterialEvent event) {
+        if (LabsConfig.content.gtCustomContent.enableMaterials)
             LabsMaterials.materialChanges();
-        }
     }
 
     @SubscribeEvent

diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/LabsProperties.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/LabsProperties.java
@@ -7,6 +7,7 @@
 
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
+import static gregicality.multiblocks.api.unification.GCYMMaterials.*;
 
 public class LabsProperties {
     public static void propertyChanges() {
@@ -29,6 +30,16 @@ public static void propertyChanges() {
     }
 
     public static void flagChanges() {
+        /* GT 2.8 made Double Plates a separate flag, so some materials lost it. Add it back to needed materials. */
+
+        // GT Materials
+        Trinium.addFlags(GENERATE_DOUBLE_PLATE);
+
+        // GCYM Materials
+        WatertightSteel.addFlags(GENERATE_DOUBLE_PLATE);
+        IncoloyMA956.addFlags(GENERATE_DOUBLE_PLATE);
+
+        /* Other Flag Additions */
         Topaz.addFlags(GENERATE_LENS);
         BlueTopaz.addFlags(GENERATE_LENS);
         EnderPearl.addFlags(GENERATE_LENS);

diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsEIO.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsEIO.java
@@ -34,7 +34,7 @@ public static void initEIO() {
                 .ingot()
                 .liquid()
                 .color(0xffb545).iconSet(SHINY)
-                .flags(GENERATE_PLATE, GENERATE_GEAR)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_GEAR)
                 .blast(builder -> builder
                         .temp(1250, GasTier.LOW)
                         .blastStats(VA[MV], 400))
@@ -46,7 +46,7 @@ public static void initEIO() {
                 .ingot()
                 .liquid()
                 .color(0xa4ff70).iconSet(SHINY)
-                .flags(GENERATE_PLATE, GENERATE_GEAR, GENERATE_ROD, GENERATE_BOLT_SCREW)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_GEAR, GENERATE_ROD, GENERATE_BOLT_SCREW)
                 .blast(builder -> builder
                         .temp(1350, GasTier.LOW)
                         .blastStats(VA[HV], 400))

diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsElements.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsElements.java
@@ -24,14 +24,14 @@ public static void init() {
                 .color(0xbe49ed).iconSet(METALLIC)
                 .blast(6800, GasTier.HIGHER)
                 .cableProperties(V[UV], 1, 0, true)
-                .flags(GENERATE_PLATE, GENERATE_ROD, GENERATE_GEAR, GENERATE_DENSE)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_ROD, GENERATE_GEAR, GENERATE_DENSE)
                 .build();
 
         AwakenedDraconium = new Material.Builder(32002, makeLabsName("awakened_draconium"))
                 .ingot().liquid()
                 .element(ADc)
                 .color(0xf58742).iconSet(METALLIC)
-                .flags(NO_SMELTING, GENERATE_PLATE, GENERATE_ROD, GENERATE_GEAR)
+                .flags(NO_SMELTING, GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_ROD, GENERATE_GEAR)
                 .build();
 
         Omnium = new Material.Builder(32004, makeLabsName("omnium"))

diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsEndgame.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsEndgame.java
@@ -14,7 +14,7 @@ public static void initEndgame() {
         CrystalMatrix = new Material.Builder(32023, makeLabsName("crystal_matrix"))
                 .ingot().liquid()
                 .color(0x70ecff).iconSet(SHINY)
-                .flags(GENERATE_PLATE)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE)
                 .build();
 
         DraconicSuperconductor = new Material.Builder(32028, makeLabsName("draconic_superconductor"))

diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsThermal.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsThermal.java
@@ -40,7 +40,7 @@ public static void initThermal() {
                         .temp(4000, GasTier.MID)
                         .blastStats(VA[IV], 1400)
                         .vacuumStats(VA[HV], 500))
-                .flags(GENERATE_PLATE, GENERATE_DENSE, GENERATE_ROD, GENERATE_GEAR)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_DENSE, GENERATE_ROD, GENERATE_GEAR)
                 .components(AnnealedCopper, 4, Ardite, 2, RedAlloy, 2)
                 .cableProperties(V[LuV], 1, 0, true)
                 .build();
@@ -49,7 +49,7 @@ public static void initThermal() {
                 .ingot()
                 .liquid()
                 .color(0xf6ff99).iconSet(BRIGHT)
-                .flags(GENERATE_PLATE, GENERATE_GEAR, GENERATE_FINE_WIRE)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_GEAR, GENERATE_FINE_WIRE)
                 .blast(builder -> builder
                         .temp(4500, GasTier.MID)
                         .blastStats(VA[IV], 1600)
@@ -62,7 +62,7 @@ public static void initThermal() {
                 .ingot()
                 .liquid()
                 .color(0x1f6b62).iconSet(SHINY)
-                .flags(GENERATE_PLATE, GENERATE_GEAR, GENERATE_FINE_WIRE)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_GEAR, GENERATE_FINE_WIRE)
                 .blast(builder -> builder
                         .temp(6400, GasTier.HIGHEST)
                         .blastStats(VA[LuV], 1200)
@@ -75,7 +75,7 @@ public static void initThermal() {
                 .ingot()
                 .liquid()
                 .color(0xf7be20).iconSet(BRIGHT)
-                .flags(GENERATE_PLATE, GENERATE_GEAR)
+                .flags(GENERATE_PLATE, GENERATE_DOUBLE_PLATE, GENERATE_GEAR)
                 .blast(1100)
                 .components(Electrum, 6, Lumium, 1, Signalum, 1)
                 .build();