updated forge version of arrp

GregTech-Intergalactical · Dec 23, 2024 · 659c312 · 659c312
1 parent c97578a
commit 659c312
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${project.rei_version}")
     modCompileOnly("me.shedaniel.cloth:cloth-config-forge:6.5.133")
     modImplementation("com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:${project.crafttweaker_version}")
-    modImplementation(jarJar("dev.trinsdar:arrp-forge:0.6.7"))
+    modImplementation(jarJar("dev.trinsdar:arrp-forge:0.6.7.1"))
     modImplementation(jarJar("dev.trinsdar:terraform-utils-v1:3.1.5"))
     modImplementation(jarJar("earth.terrarium:botarium-forge-1.18.2:${project.botarium_version}"))
     modImplementation(jarJar("org.gt-reimagined:structurelib-forge:${project.structurelib_version}-${project.minecraft_version}"))

diff --git a/forge/src/main/java/muramasa/antimatter/common/event/forge/ARRPEvents.java b/forge/src/main/java/muramasa/antimatter/common/event/forge/ARRPEvents.java
@@ -0,0 +1,18 @@
+package muramasa.antimatter.common.event.forge;
+
+import muramasa.antimatter.datagen.AntimatterDynamics;
+import net.devtech.arrp.api.RRPEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+public class ARRPEvents {
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public static void onResourcePackAfterVanilla(RRPEvent.AfterVanilla event){
+        AntimatterDynamics.addResourcePacks(event::addPack);
+    }
+
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    public static void onResourcePackBeforeUser(RRPEvent.BetweenModsAndUser event){
+        AntimatterDynamics.addDataPacks(event::addPack);
+    }
+}
diff --git a/forge/src/main/java/muramasa/antimatter/common/event/forge/ModCommonEvents.java b/forge/src/main/java/muramasa/antimatter/common/event/forge/ModCommonEvents.java
@@ -21,13 +21,5 @@ public static void onRRPInit(RRPInitEvent event){
         AntimatterDynamics.runAssetProvidersDynamically();
     }
 
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public static void onResourcePackAfterVanilla(RRPEvent.AfterVanilla event){
-        AntimatterDynamics.addResourcePacks(event::addPack);
-    }
 
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public static void onResourcePackBeforeUser(RRPEvent.BeforeUser event){
-        AntimatterDynamics.addDataPacks(event::addPack);
-    }
 }
diff --git a/forge/src/main/java/muramasa/antimatter/forge/AntimatterImpl.java b/forge/src/main/java/muramasa/antimatter/forge/AntimatterImpl.java
@@ -2,6 +2,7 @@
 
 
 import muramasa.antimatter.*;
+import muramasa.antimatter.common.event.forge.ARRPEvents;
 import muramasa.antimatter.datagen.AntimatterDynamics;
 import muramasa.antimatter.event.forge.AntimatterCraftingEvent;
 import muramasa.antimatter.event.forge.AntimatterProvidersEvent;
@@ -12,6 +13,7 @@
 import muramasa.antimatter.proxy.ServerHandler;
 import muramasa.antimatter.registration.RegistrationEvent;
 import muramasa.antimatter.registration.Side;
+import net.devtech.arrp.ARRP;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -43,6 +45,7 @@ public AntimatterImpl(){
 
         eventBus.addListener(this::addCraftingLoaders);
         eventBus.addListener(this::providers);
+        ARRP.EVENT_BUS.register(ARRPEvents.class);
     }
 
     private void addCraftingLoaders(AntimatterCraftingEvent ev) {