updated antimatter part 1

GT-Reimagined · Nov 13, 2023 · 5610b94 · 5610b94
1 parent 7739acc
commit 5610b94
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 113 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java
@@ -3,6 +3,7 @@
 import earth.terrarium.botarium.common.registry.fluid.FluidProperties;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.AntimatterConfig;
+import muramasa.antimatter.Ref;
 import muramasa.antimatter.cover.CoverFactory;
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.fluid.AntimatterFluid;
@@ -130,13 +131,13 @@ private static Block.Properties prepareProperties() {
     public static ItemBasic<?> CompressedFireClay = new ItemBasic<>(GT4RRef.ID, "compressed_fire_clay").tip("Brick Shaped");
     public static ItemBasic<?> FireBrick = new ItemBasic<>(GT4RRef.ID, "fire_brick").tip("Heat Resistant");
     public static ItemBasic<?> ItemSuperconductor = new ItemBasic<>(GT4RRef.ID, "superconductor").tip("Conducts Energy Losslessly");
-    public static ItemBasic<?> FrequencyTransmitter = new ItemBasic<>(GT4RRef.ID, "frequency_transmitter", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).stacksTo(1));
+    public static ItemBasic<?> FrequencyTransmitter = new ItemBasic<>(GT4RRef.ID, "frequency_transmitter", new Item.Properties().tab(Ref.TAB_ITEMS).stacksTo(1));
 
-    public static ItemBasic<?> LavaFilter = new ItemBasic<>(GT4RRef.ID, "lava_filter", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).defaultDurability(100));
+    public static ItemBasic<?> LavaFilter = new ItemBasic<>(GT4RRef.ID, "lava_filter", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(100));
     public static ItemBasic<?> LighterEmpty = new ItemBasic<>(GT4RRef.ID, "lighter_empty");
-    public static ItemBasic<ItemMatch> Match = new ItemMatch(GT4RRef.ID, "match", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS));
-    public static ItemBasic<ItemMatch> MatchBook = new ItemMatch(GT4RRef.ID, "match_book", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).defaultDurability(64));
-    public static ItemBasic<ItemMatch> Lighter = new ItemMatch(GT4RRef.ID, "lighter", new Item.Properties().tab(muramasa.antimatter.Ref.TAB_ITEMS).defaultDurability(100));
+    public static ItemBasic<ItemMatch> Match = new ItemMatch(GT4RRef.ID, "match", new Item.Properties().tab(Ref.TAB_ITEMS));
+    public static ItemBasic<ItemMatch> MatchBook = new ItemMatch(GT4RRef.ID, "match_book", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(64));
+    public static ItemBasic<ItemMatch> Lighter = new ItemMatch(GT4RRef.ID, "lighter", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(100));
 
     public static ItemBasic<?> MixedMetal = new ItemMixedMetal();
     public static ItemBasic<?> AdvancedAlloy = new ItemBasic<>(GT4RRef.ID,"advanced_alloy");

diff --git a/common/src/main/java/trinsdar/gt4r/datagen/GT4RLocalizations.java b/common/src/main/java/trinsdar/gt4r/datagen/GT4RLocalizations.java
@@ -75,16 +75,14 @@ protected void english(String domain, String locale) {
             AntimatterAPI.all(ItemMatch.class, domain).forEach(i -> {
                 String value = lowerUnderscoreToUpperSpaced(i.getId());
                 if (i == GT4RData.Lighter) value = value.concat(" (Full)");
-                add(i, value);
+                override(i.getDescriptionId(), value);
             });
             AntimatterAPI.all(ItemPowerUnit.class, domain).forEach(i -> {
                 String value = lowerUnderscoreToUpperSpaced(i.getId());
                 if (i.getId().startsWith("power_unit")) value = lowerUnderscoreToUpperSpacedRotated(i.getId());
-                add(i, value);
+                override(i.getDescriptionId(), value);
             });
-            AntimatterAPI.all(ItemIntCircuit.class, domain).forEach(i -> add(i, "Integrated Circuit (" + i.circuitId + ")"));
-            add(GT4RData.MixedMetal, lowerUnderscoreToUpperSpaced(GT4RData.MixedMetal.getId()));
-            add(GT4RData.CraftingModule, lowerUnderscoreToUpperSpaced(GT4RData.CraftingModule.getId()));
+            AntimatterAPI.all(ItemIntCircuit.class, domain).forEach(i -> override(i.getDescriptionId(), "Integrated Circuit (" + i.circuitId + ")"));
             override(ROCK_CUTTER.getToolStack(NULL, NULL).getItem().getDescriptionId(), "Rock Cutter");
             override(GT4RData.LighterEmpty.getDescriptionId(), "Lighter (Empty)");
             override(GT4RData.StorageDataOrb.getDescriptionId(), "Data Orb");

diff --git a/common/src/main/java/trinsdar/gt4r/integration/jei/GT4RJeiPlugin.java b/common/src/main/java/trinsdar/gt4r/integration/jei/GT4RJeiPlugin.java
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -50,6 +50,7 @@ dependencies{
         exclude(group: "net.fabricmc.fabric-api")
     }*/
     modImplementation("com.github.Trinsdar:ARRP:0.6.7-hotfix")
+    modImplementation "maven.modrinth:carbon-config:2ngFmmhP"
     implementation("io.github.gregtechintergalactical:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev-shadow"){
         transitive = false
     }
+201 −0		common/src/main/java/muramasa/antimatter/datagen/builder/SequencedAssemblyBuilder.java
+6 −6		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterLanguageProvider.java
+4 −91		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java
+18 −4		common/src/main/java/muramasa/antimatter/item/ItemBasic.java
+3 −8		common/src/main/java/muramasa/antimatter/recipe/ingredient/FluidIngredient.java