Refactor and rename for NeoForge integration

Shadowbee27 · Shadowbee27 · commit 06b1cfef28ef · 2025-11-04T22:48:22.000+01:00
- Replace old Forge mod initializer with new NeoForge entrypoint - Add
NeoForge DeferredRegister for criteria triggers - Implement unified
ModInvolvementTrigger registration for Fabric and NeoForge - Rename
shader and model resource paths to match new mod ID - Clean up client
mixin imports and injection points - Update gradle properties to alpha
version
diff --git a/common/src/main/java/org/modsauce/otyacraftenginerenewed/OtyacraftEngine.java b/common/src/main/java/org/modsauce/otyacraftenginerenewed/OtyacraftEngine.java
@@ -16,25 +16,33 @@
 import org.modsauce.otyacraftenginerenewed.util.OEDataGenUtils;
 
 public class OtyacraftEngine {
-  public static final Logger LOGGER = LogManager.getLogger(OtyacraftEngine.class);
-  public static final String MODID = "otyacraftenginerenewed";
-  private static final OEConfig CONFIG = AutoConfig.register(OEConfig.class, PartitioningSerializer.wrap(Toml4jConfigSerializer::new)).getConfig();
 
-  public static void init() {
-    CommonHandler.init();
-    OEPackets.init();
-    OECriteriaTriggers.init();
-    PlayerItemLocations.init();
+    public static final Logger LOGGER = LogManager.getLogger(
+        OtyacraftEngine.class
+    );
+    public static final String MODID = "otyacraftenginerenewed";
+    private static final OEConfig CONFIG = AutoConfig.register(
+        OEConfig.class,
+        PartitioningSerializer.wrap(Toml4jConfigSerializer::new)
+    ).getConfig();
 
-    if (!OEDataGenUtils.isDataGenerating())
-      EnvExecutor.runInEnv(Env.CLIENT, () -> OtyacraftEngineClient::preInit);
-  }
+    public static void init() {
+        CommonHandler.init();
+        OEPackets.init();
+        //OECriteriaTriggers.init();
+        PlayerItemLocations.init();
 
-  public static String getModName() {
-    return Platform.getMod(MODID).getName();
-  }
+        if (!OEDataGenUtils.isDataGenerating()) EnvExecutor.runInEnv(
+            Env.CLIENT,
+            () -> OtyacraftEngineClient::preInit
+        );
+    }
 
-  public static OEConfig getConfig() {
-    return CONFIG;
-  }
+    public static String getModName() {
+        return Platform.getMod(MODID).getName();
+    }
+
+    public static OEConfig getConfig() {
+        return CONFIG;
+    }
 }
diff --git a/common/src/main/java/org/modsauce/otyacraftenginerenewed/advancement/OECriteriaTriggers.java b/common/src/main/java/org/modsauce/otyacraftenginerenewed/advancement/OECriteriaTriggers.java
@@ -1,13 +1,20 @@
 package org.modsauce.otyacraftenginerenewed.advancement;
 
-import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.advancements.CriterionTrigger;
+import org.modsauce.otyacraftenginerenewed.OtyacraftEngine;
 
 public class OECriteriaTriggers {
 
-  public static final ModInvolvementTrigger MOD_INVOLVEMENT_TRIGGER =
-    new ModInvolvementTrigger();
+    public static ModInvolvementTrigger MOD_INVOLVEMENT_TRIGGER;
 
-  public static void init() {
-    CriteriaTriggers.register("mod_involvement", MOD_INVOLVEMENT_TRIGGER);
-  }
+    public static void init() {
+        // Platform-specific code will handle registration
+        // This just logs that we're initializing
+        OtyacraftEngine.LOGGER.info("Initializing criteria triggers");
+    }
+
+    // Called by platform-specific code to set the trigger instance
+    public static void setModInvolvementTrigger(ModInvolvementTrigger trigger) {
+        MOD_INVOLVEMENT_TRIGGER = trigger;
+    }
 }
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_cutout.fsh b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_cutout.fsh
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_cutout.json b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_cutout.json
@@ -4,8 +4,8 @@
     "srcrgb": "srcalpha",
     "dstrgb": "1-srcalpha"
   },
-  "vertex": "otyacraftengine_rendertype_simple_sprite_cutout",
-  "fragment": "otyacraftengine_rendertype_simple_sprite_cutout",
+  "vertex": "otyacraftenginerenewed_rendertype_simple_sprite_cutout",
+  "fragment": "otyacraftenginerenewed_rendertype_simple_sprite_cutout",
   "attributes": [
     "Position",
     "Color",
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_cutout.vsh b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_cutout.vsh
@@ -22,7 +22,7 @@ out vec4 normal;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
 
-    vertexDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    vertexDistance = fog_distance(Position, FogShape);
     texCoord0 = UV0;
     normal = ProjMat * ModelViewMat * vec4(Normal, 0.0);
 }
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_solid.fsh b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_solid.fsh
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_solid.json b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_solid.json
@@ -4,8 +4,8 @@
     "srcrgb": "srcalpha",
     "dstrgb": "1-srcalpha"
   },
-  "vertex": "otyacraftengine_rendertype_simple_sprite_solid",
-  "fragment": "otyacraftengine_rendertype_simple_sprite_solid",
+  "vertex": "otyacraftenginerenewed_rendertype_simple_sprite_solid",
+  "fragment": "otyacraftenginerenewed_rendertype_simple_sprite_solid",
   "attributes": [
     "Position",
     "Color",
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_solid.vsh b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_simple_sprite_solid.vsh
@@ -29,7 +29,7 @@ out vec4 normal;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
 
-    vertexDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    vertexDistance = fog_distance(Position, FogShape);
     vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color);
     texCoord0 = UV0;
     normal = ProjMat * ModelViewMat * vec4(Normal, 0.0);
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_wave.fsh b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_wave.fsh
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_wave.json b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_wave.json
@@ -4,8 +4,8 @@
     "srcrgb": "srcalpha",
     "dstrgb": "1-srcalpha"
   },
-  "vertex": "otyacraftengine_rendertype_wave",
-  "fragment": "otyacraftengine_rendertype_wave",
+  "vertex": "otyacraftenginerenewed_rendertype_wave",
+  "fragment": "otyacraftenginerenewed_rendertype_wave",
   "attributes": [
     "Position",
     "Color",
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_wave.vsh b/common/src/main/resources/assets/minecraft/shaders/core/otyacraftenginerenewed_rendertype_wave.vsh
@@ -24,7 +24,7 @@ out float time;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
 
-    vertexDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    vertexDistance = fog_distance(Position, FogShape);
     texCoord0 = UV0;
     normal = ProjMat * ModelViewMat * vec4(Normal, 0.0);
     time = GameTime;
diff --git a/common/src/main/resources/assets/otyacraftenginerenewed/models/debug/origin.json b/common/src/main/resources/assets/otyacraftenginerenewed/models/debug/origin.json
@@ -1,5 +1,5 @@
 {
   "parent": "builtin/entity",
-  "loader": "forge:obj",
-  "model": "otyacraftengine:models/debug/origin.obj"
+  "loader": "neoforge:obj",
+  "model": "otyacraftenginerenewed:models/debug/origin.obj"
 }
diff --git a/common/src/main/resources/assets/otyacraftenginerenewed/models/debug/xyz_axis.json b/common/src/main/resources/assets/otyacraftenginerenewed/models/debug/xyz_axis.json
@@ -1,5 +1,5 @@
 {
   "parent": "builtin/entity",
-  "loader": "forge:obj",
-  "model": "otyacraftengine:models/debug/xyz_axis.obj"
+  "loader": "neoforge:obj",
+  "model": "otyacraftenginerenewed:models/debug/xyz_axis.obj"
 }
diff --git a/fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/OtyacraftEngineFabric.java b/fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/OtyacraftEngineFabric.java
@@ -1,11 +1,35 @@
 package org.modsauce.otyacraftenginerenewed.fabric;
 
+import dev.architectury.registry.registries.DeferredRegister;
+import dev.architectury.registry.registries.RegistrySupplier;
+import net.minecraft.advancements.CriterionTrigger;
+import net.minecraft.core.registries.Registries;
 import org.modsauce.otyacraftenginerenewed.OtyacraftEngine;
+import org.modsauce.otyacraftenginerenewed.advancement.ModInvolvementTrigger;
+import org.modsauce.otyacraftenginerenewed.advancement.OECriteriaTriggers;
 import net.fabricmc.api.ModInitializer;
 
 public class OtyacraftEngineFabric implements ModInitializer {
+    // Create a DeferredRegister for criteria triggers
+    public static final DeferredRegister<CriterionTrigger<?>> CRITERIA_TRIGGERS =
+            DeferredRegister.create(OtyacraftEngine.MODID, Registries.TRIGGER_TYPE);
+
+    // Register the trigger
+    public static final RegistrySupplier<ModInvolvementTrigger> MOD_INVOLVEMENT_TRIGGER =
+            CRITERIA_TRIGGERS.register("mod_involvement", ModInvolvementTrigger::new);
+
     @Override
     public void onInitialize() {
+        // Register criteria triggers FIRST
+        CRITERIA_TRIGGERS.register();
+
+        // Set the trigger instance so common code can access it
+        OECriteriaTriggers.setModInvolvementTrigger(MOD_INVOLVEMENT_TRIGGER.get());
+
+        // Initialize common criteria triggers
+        OECriteriaTriggers.init();
+
+        // Initialize the rest of the mod
         OtyacraftEngine.init();
     }
 }
diff --git a/fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/mixin/EntityMixin.java b/fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/mixin/EntityMixin.java
@@ -18,7 +18,7 @@ public class EntityMixin {
     @Final
     protected SynchedEntityData entityData;
 
-    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;defineSynchedData()V"))
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;defineSynchedData(Lnet/minecraft/network/syncher/SynchedEntityData$Builder;)V"))
     private void init(EntityType<?> entityType, Level level, CallbackInfo ci) {
         OECommonEventHooks.onEntityDefineSynchedData((Entity) (Object) this, entityData);
     }
diff --git a/fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/mixin/client/MinecraftMixin.java b/fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/mixin/client/MinecraftMixin.java
@@ -1,50 +1,83 @@
 package org.modsauce.otyacraftenginerenewed.fabric.mixin.client;
 
-import org.modsauce.otyacraftenginerenewed.client.event.OEClientEventHooks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.InteractionHand;
 import org.jetbrains.annotations.Nullable;
+import org.modsauce.otyacraftenginerenewed.client.event.OEClientEventHooks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
-    @Shadow
-    public ClientLevel level;
-
-    @Shadow
-    @Nullable
-    public LocalPlayer player;
-
-    @Inject(method = "setLevel", at = @At("HEAD"))
-    private void setLevel(ClientLevel clientLevel, CallbackInfo ci) {
-        if (level != null)
-            OEClientEventHooks.onLevelUnload(level);
-    }
-
-    @Inject(method = "clearLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;updateScreenAndTick(Lnet/minecraft/client/gui/screens/Screen;)V", ordinal = 0, shift = At.Shift.AFTER))
-    private void clearLevel(Screen screen, CallbackInfo ci) {
-        if (this.level != null)
-            OEClientEventHooks.onLevelUnload(level);
-    }
-
-    @Inject(method = "continueAttack", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/BlockHitResult;getDirection()Lnet/minecraft/core/Direction;", shift = At.Shift.BEFORE), cancellable = true)
-    private void continueAttack(boolean bl, CallbackInfo ci) {
-        if (player != null && !OEClientEventHooks.onHandAttack(player.getItemInHand(InteractionHand.MAIN_HAND)))
-            ci.cancel();
-    }
-
-    @Inject(method = "startAttack", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/HitResult;getType()Lnet/minecraft/world/phys/HitResult$Type;", shift = At.Shift.BEFORE), cancellable = true)
-    private void startAttack(CallbackInfoReturnable<Boolean> cir) {
-        if (player != null && !OEClientEventHooks.onHandAttack(player.getItemInHand(InteractionHand.MAIN_HAND)))
-            cir.cancel();
-    }
+
+  @Shadow
+  public ClientLevel level;
+
+  @Shadow
+  @Nullable
+  public LocalPlayer player;
+
+  @Inject(method = "setLevel", at = @At("HEAD"))
+  private void setLevel(
+    ClientLevel clientLevel,
+    net.minecraft.client.gui.screens.ReceivingLevelScreen.Reason reason,
+    CallbackInfo ci
+  ) {
+    if (level != null) OEClientEventHooks.onLevelUnload(level);
+  }
+
+  @Inject(
+    method = "clearLevel",
+    at = @At(
+      value = "INVOKE",
+      target = "Lnet/minecraft/client/Minecraft;updateScreenAndTick(Lnet/minecraft/client/gui/screens/Screen;)V",
+      ordinal = 0,
+      shift = At.Shift.AFTER
+    )
+  )
+  private void clearLevel(Screen screen, CallbackInfo ci) {
+    if (this.level != null) OEClientEventHooks.onLevelUnload(level);
+  }
+
+  @Inject(
+    method = "continueAttack",
+    at = @At(
+      value = "INVOKE",
+      target = "Lnet/minecraft/world/phys/BlockHitResult;getDirection()Lnet/minecraft/core/Direction;",
+      shift = At.Shift.BEFORE
+    ),
+    cancellable = true
+  )
+  private void continueAttack(boolean bl, CallbackInfo ci) {
+    if (
+      player != null &&
+      !OEClientEventHooks.onHandAttack(
+        player.getItemInHand(InteractionHand.MAIN_HAND)
+      )
+    ) ci.cancel();
+  }
+
+  @Inject(
+    method = "startAttack",
+    at = @At(
+      value = "INVOKE",
+      target = "Lnet/minecraft/world/phys/HitResult;getType()Lnet/minecraft/world/phys/HitResult$Type;",
+      shift = At.Shift.BEFORE
+    ),
+    cancellable = true
+  )
+  private void startAttack(CallbackInfoReturnable<Boolean> cir) {
+    if (
+      player != null &&
+      !OEClientEventHooks.onHandAttack(
+        player.getItemInHand(InteractionHand.MAIN_HAND)
+      )
+    ) cir.cancel();
+  }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ enabled_platforms=fabric,neoforge
 # Mod
 archives_base_name=otyacraftenginerenewed
 mod_display_name=OtyacraftEngineRenewed
-mod_version=3.7.1-1.21.1
+mod_version=3.7.1-1.21.1-alpha0
 # Dependencies
 architectury_version=13.0.8
 fabric_loader_version=0.17.2
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/OtyacraftEngineForge.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/OtyacraftEngineForge.java
diff --git a/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/OtyacraftEngineNeoForge.java b/neoforge/src/main/java/org/modsauce/otyacraftenginerenewed/neoforge/OtyacraftEngineNeoForge.java
diff --git a/neoforge/src/main/resources/otyacraftengine.mixins.json b/neoforge/src/main/resources/otyacraftengine.mixins.json

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ out vec4 normal;`
`22`	`22`	`void main() {`
`23`	`23`	`gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);`
`24`	`24`
`25`		`- vertexDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);`
	`25`	`+ vertexDistance = fog_distance(Position, FogShape);`
`26`	`26`	`texCoord0 = UV0;`
`27`	`27`	`normal = ProjMat * ModelViewMat * vec4(Normal, 0.0);`
`28`	`28`	`}`