Reenable advancements

sweetrpg · Dec 9, 2024 · f23a5c1 · f23a5c1
1 parent a4824ea
commit f23a5c1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 32 deletions.
diff --git a/src/main/java/com/sweetrpg/crafttracker/CraftTracker.java b/src/main/java/com/sweetrpg/crafttracker/CraftTracker.java
@@ -9,6 +9,7 @@
 import com.sweetrpg.crafttracker.common.lib.Constants;
 import com.sweetrpg.crafttracker.common.registry.ModRecipeSerializers;
 import com.sweetrpg.crafttracker.common.registry.ModRegistries;
+import com.sweetrpg.crafttracker.data.CTAdvancementProvider;
 import com.sweetrpg.crafttracker.data.CTLangProvider;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
@@ -101,7 +102,7 @@ protected void interModProcess(final InterModProcessEvent event) {
         LOGGER.debug("event {}", event);
 
         //        BackwardsComp.init();
-        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+//        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
 
         AddonManager.init();
     }
@@ -111,11 +112,12 @@ private void gatherData(final GatherDataEvent event) {
 
         DataGenerator gen = event.getGenerator();
         PackOutput packOutput = gen.getPackOutput();
+        var lookup = event.getLookupProvider();
 
         gen.addProvider(event.includeServer(), new CTLangProvider(packOutput, Constants.LOCALE_EN_US));
         gen.addProvider(event.includeServer(), new CTLangProvider(packOutput, Constants.LOCALE_EN_GB));
         gen.addProvider(event.includeServer(), new CTLangProvider(packOutput, Constants.LOCALE_DE_DE));
 
-//            gen.addProvider(event.includeServer(), new CTAdvancementProvider(gen));
+        gen.addProvider(event.includeServer(), new CTAdvancementProvider(packOutput, lookup, event.getExistingFileHelper()));
     }
 }
diff --git a/src/main/java/com/sweetrpg/crafttracker/client/overlay/CraftQueueOverlay.java b/src/main/java/com/sweetrpg/crafttracker/client/overlay/CraftQueueOverlay.java
@@ -34,6 +34,12 @@ public class CraftQueueOverlay {
     static int TEXT_HEIGHT = 12;
     static int MAX_STRING_LENGTH = 40;
 
+    public static void init() {
+        MinecraftForge.EVENT_BUS.register(new CraftQueueOverlay());
+//        OverlayRegistry.registerOverlayAbove(HOTBAR_ELEMENT, "craft_queue", CraftQueueOverlay.CRAFT_QUEUE);
+//        OverlayRegistry.registerOverlayAbove(HOTBAR_ELEMENT, "shopping_list", ShoppingListOverlay.SHOPPING_LIST);
+    }
+
     @SubscribeEvent
     public void onRenderGuiOverlay(RenderGuiOverlayEvent event) {
         CraftTracker.LOGGER.trace("CraftQueueOverlay#onRenderGuiOverlay");
@@ -307,10 +313,4 @@ public void onRenderGuiOverlay(RenderGuiOverlayEvent event) {
         }
     }
 
-    public static void init() {
-        MinecraftForge.EVENT_BUS.register(new CraftQueueOverlay());
-//        OverlayRegistry.registerOverlayAbove(HOTBAR_ELEMENT, "craft_queue", CraftQueueOverlay.CRAFT_QUEUE);
-//        OverlayRegistry.registerOverlayAbove(HOTBAR_ELEMENT, "shopping_list", ShoppingListOverlay.SHOPPING_LIST);
-    }
-
 }
diff --git a/src/main/java/com/sweetrpg/crafttracker/client/overlay/ShoppingListOverlay.java b/src/main/java/com/sweetrpg/crafttracker/client/overlay/ShoppingListOverlay.java
@@ -14,7 +14,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.client.event.RenderGuiOverlayEvent;
 import net.minecraftforge.client.gui.overlay.ForgeGui;
-import net.minecraftforge.client.gui.overlay.IGuiOverlay;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -32,6 +31,9 @@ public class ShoppingListOverlay {
     static int TEXT_HEIGHT = 12;
     static int MAX_STRING_LENGTH = 40;
 
+    public static void init() {
+        MinecraftForge.EVENT_BUS.register(new ShoppingListOverlay());
+    }
 
     @SubscribeEvent
     public void onRenderGuiOverlay(RenderGuiOverlayEvent event) {
@@ -84,7 +86,7 @@ public void onRenderGuiOverlay(RenderGuiOverlayEvent event) {
 
         // if products list is empty, display "empty" message
         if(items.isEmpty()) {
-            graphics.drawCenteredString( gui.getFont(),
+            graphics.drawCenteredString(gui.getFont(),
                     Component.translatable(Constants.TRANSLATION_KEY_GUI_SHOPPING_LIST_EMPTY),
                     (x + olWidth - 8) / 2, (y + olHeight - 6) / 2, MESSAGE_COLOR);
             return;
@@ -93,7 +95,7 @@ public void onRenderGuiOverlay(RenderGuiOverlayEvent event) {
         var helpText = String.format("%s [%s]",
                 I18n.get(Constants.TRANSLATION_KEY_GUI_SHOPPING_LIST_HELP),
                 ModKeyBindings.CLEAR_SHOPPING_LIST_MAPPING.getTranslatedKeyMessage().getString());
-        graphics.drawCenteredString( gui.getFont(), helpText,
+        graphics.drawCenteredString(gui.getFont(), helpText,
                 (x + olWidth - 8) / 2, olHeight - TEXT_HEIGHT, HELP_COLOR);
 
         int yPos = y + SECTION_TITLE_Y_OFFSET;
@@ -139,19 +141,15 @@ public void onRenderGuiOverlay(RenderGuiOverlayEvent event) {
                         item.getDescription().getString(MAX_STRING_LENGTH - countText.length() - 3),
                         countText);
                 CraftTracker.LOGGER.trace("text: {}", text);
-                graphics.drawString( gui.getFont(), text, x + ITEM_NAME_X_OFFSET, lambdaYpos + 4, TEXT_COLOR);
+                graphics.drawString(gui.getFont(), text, x + ITEM_NAME_X_OFFSET, lambdaYpos + 4, TEXT_COLOR);
             }
             else {
                 var text = item.getDescription().getString(MAX_STRING_LENGTH);
-                graphics.drawString( gui.getFont(), text, x + ITEM_NAME_X_OFFSET, yPos + 4, TEXT_COLOR);
+                graphics.drawString(gui.getFont(), text, x + ITEM_NAME_X_OFFSET, yPos + 4, TEXT_COLOR);
             }
 
             yPos += LINE_HEIGHT + 2;
             CraftTracker.LOGGER.trace("yPos (materials item {}): {}", i, yPos);
         }
     }
-
-    public static void init() {
-        MinecraftForge.EVENT_BUS.register(new ShoppingListOverlay());
-    }
 }
diff --git a/src/main/java/com/sweetrpg/crafttracker/common/util/AdvancementUtil.java b/src/main/java/com/sweetrpg/crafttracker/common/util/AdvancementUtil.java
@@ -10,12 +10,11 @@
 public class AdvancementUtil {
 
     public static void trigger(ModAdvancements.Key advancement, ServerPlayer player) {
-//        var ct = ModAdvancements.ENTRIES.get(advancement)
-//                .getCriteria().get(MAIN_CRITERION)
-//                .getTrigger();
-//        if(ModTriggers.ENTRIES.get(ct.getCriterion().getPath()) instanceof SimpleTrigger trigger) {
-//            trigger.trigger(player);
-//        }
-
+        var ct = ModAdvancements.ENTRIES.get(advancement)
+                .getCriteria().get(MAIN_CRITERION)
+                .getTrigger();
+        if(ModTriggers.ENTRIES.get(ct.getCriterion().getPath()) instanceof SimpleTrigger trigger) {
+            trigger.trigger(player);
+        }
     }
 }
diff --git a/src/main/java/com/sweetrpg/crafttracker/data/CTAdvancementProvider.java b/src/main/java/com/sweetrpg/crafttracker/data/CTAdvancementProvider.java
@@ -12,6 +12,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
@@ -22,17 +23,14 @@ public class CTAdvancementProvider extends ForgeAdvancementProvider {
     private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
 
     public CTAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries, ExistingFileHelper existingFileHelper) {
-        super(output, registries, existingFileHelper,
-                List.of(new DoggyAdvancementsSubProvider())
-        );
+        super(output, registries, existingFileHelper, List.of(new AdvancementsSubProvider()));
     }
 
+    private static Path getPath(Path pathIn, Advancement advancementIn) {
+        return pathIn.resolve("data/" + advancementIn.getId().getNamespace() + "/advancements/" + advancementIn.getId().getPath() + ".json");
+    }
 
-    // private static Path getPath(Path pathIn, Advancement advancementIn) {
-    //     return pathIn.resolve("data/" + advancementIn.getId().getNamespace() + "/advancements/" + advancementIn.getId().getPath() + ".json");
-    // }
-
-    public static class DoggyAdvancementsSubProvider implements ForgeAdvancementProvider.AdvancementGenerator {
+    public static class AdvancementsSubProvider implements ForgeAdvancementProvider.AdvancementGenerator {
 
         @Override
         public void generate(HolderLookup.Provider registries, Consumer<Advancement> consumer, ExistingFileHelper existingFileHelper) {