did some work on advancements

GregTech-Intergalactical · Sep 29, 2024 · 3553ee3 · 3553ee3
1 parent 7c254bb
commit 3553ee3
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java b/common/src/main/java/muramasa/gregtech/datagen/GregTechLocalizations.java
@@ -123,6 +123,7 @@ protected void addTranslations() {
             add("tooltip.gti.spray_can.1", "Remaining uses: %s");
             add("tooltip.macerator.0", "Crushes Raw ores down to crushed ore and byproducts. Macerator gives no byproducts, Pulverizer gives byproducts");
             structureTranslations();
+            advancements();
         }
 
         private void structureTranslations(){
@@ -323,6 +324,32 @@ private void structureTranslations(){
 
         }
 
+        private void advancements(){
+            addAdvancement("gti", "GTI", "Advancements of GTI");
+            addAdvancement("rock", "Pickup a rock of some kind");
+            addAdvancement("flint_pickaxe", "No wood tools allowed!", "Craft a flint pickaxe");
+            addAdvancement("raw_copper", "Find some copper ore and mine it");
+            addAdvancement("raw_tin", "Find some tin ore and mine it");
+            addAdvancement("mortar", "Craft a mortar");
+            addAdvancement("bronze_dust", "Make some bronze dust using a mortar");
+            addAdvancement("hammer", "Craft a hammer");
+            addAdvancement("bronze_solid_fuel_boiler", "Craft a Solid Fuel Boiler");
+            addAdvancement("bronze_steam_forge_hammer", "Craft a Steam Forge Hammer");
+            addAdvancement("bronze_steam_compressor", "Craft a Steam Compressor");
+            addAdvancement("fire_brick", "Craft a Fire Brick");
+            addAdvancement("coke_oven", "Craft a Coke Oven");
+        }
+
+        private void addAdvancement(String key, String translatedTitle, String translatedDesc){
+            add("gti.advancements." + key + ".title", translatedTitle);
+            add("gti.advancements." + key + ".desc", translatedDesc);
+        }
+
+        private void addAdvancement(String key, String translatedDesc){
+            add("gti.advancements." + key + ".title", Utils.lowerUnderscoreToUpperSpaced(key));
+            add("gti.advancements." + key + ".desc", translatedDesc);
+        }
+
         @Override
         protected void english(String domain, String locale) {
             super.english(domain, locale);

diff --git a/common/src/main/java/muramasa/gregtech/datagen/ProgressionAdvancements.java b/common/src/main/java/muramasa/gregtech/datagen/ProgressionAdvancements.java
@@ -1,6 +1,7 @@
 package muramasa.gregtech.datagen;
 
 import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
+import muramasa.antimatter.Data;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.machine.Tier;
 import muramasa.antimatter.machine.types.Machine;
@@ -26,6 +27,7 @@
 import static muramasa.antimatter.machine.Tier.*;
 import static muramasa.antimatter.util.TagUtils.getForgelikeItemTag;
 import static muramasa.antimatter.util.Utils.hasItem;
+import static muramasa.antimatter.util.Utils.hasItems;
 import static muramasa.gregtech.data.Machines.*;
 import static muramasa.gregtech.data.Materials.*;
 
@@ -35,11 +37,13 @@ public class ProgressionAdvancements implements Consumer<Consumer<Advancement>>
 
     @Override
     public void accept(Consumer<Advancement> consumer) {
-        progressionRoot = buildRootAdvancement(AntimatterMaterialTypes.ROCK.get(Stone), new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
-                GTIRef.ID + ".advancements.rock.title", GTIRef.ID + ".advancements.rock.desc", FrameType.TASK, true, true, false)
+        progressionRoot = buildRootAdvancement(Data.DEBUG_SCANNER, new ResourceLocation(GTIRef.ID, "textures/block/machine/base/lv.png"),
+                GTIRef.ID + ".advancements.gti.title", GTIRef.ID + ".advancements.gti.desc", FrameType.TASK, false, false, false)
                 .addCriterion("has_rocks", hasItem(getForgelikeItemTag("rocks"))).save(consumer, getLoc(GTIRef.ID, "progression/root"));
+        Advancement rock = buildBasicAdvancement(progressionRoot, AntimatterMaterialTypes.ROCK.get(Stone), "rock", FrameType.TASK)
+                .addCriterion("has_rocks", hasItems(getForgelikeItemTag("rocks"), getForgelikeItemTag("bearing_rocks"))).save(consumer, getLoc(GTIRef.ID, "progression/rock"));
         Item pickaxe = PICKAXE.getToolItem(Flint);
-        Advancement flintPick = buildBasicAdvancement(progressionRoot, pickaxe, "flint_pickaxe", FrameType.TASK)
+        Advancement flintPick = buildBasicAdvancement(rock, pickaxe, "flint_pickaxe", FrameType.TASK)
                 .addCriterion("has_flint_pick", hasItem(pickaxe)).save(consumer, getLoc(GTIRef.ID, "progression/flint_pickaxe"));
         Advancement rawCopper = buildBasicAdvancement(flintPick, RAW_ORE.get(Copper), "raw_copper", FrameType.TASK)
                 .addCriterion("has_raw_copper", hasItem(RAW_ORE.getMaterialTag(Copper))).save(consumer, getLoc(GTIRef.ID, "progression/raw_copper"));