Move Fabric only mixins to the Fabric project

gigabit101 · Nov 20, 2023 · a9baa48 · a9baa48
1 parent cf202b8
commit a9baa48
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 14 deletions.
diff --git a/common/src/main/resources/shrink.mixins.json b/common/src/main/resources/shrink.mixins.json
@@ -4,14 +4,12 @@
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.7.11",
   "mixins": [
-    "EntityMixin",
     "LivingEntityMixin"
   ],
   "injectors": {
     "defaultRequire": 1
   },
   "client": [
-    "EntityRenderDispatcherMixin",
-    "LivingEntityRendererMixin"
+    "EntityRenderDispatcherMixin"
   ]
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -2,10 +2,6 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.0.0"
 }
 
-loom {
-//    accessWidenerPath = file("src/main/resources/shrink.accessWidener")
-}
-
 architectury {
     platformSetupLoomIde()
     fabric()

diff --git a/...gigabit101/shrink/mixins/EntityMixin.java → ...101/shrink/fabric/mixins/EntityMixin.java b/...gigabit101/shrink/mixins/EntityMixin.java → ...101/shrink/fabric/mixins/EntityMixin.java
@@ -1,4 +1,4 @@
-package net.gigabit101.shrink.mixins;
+package net.gigabit101.shrink.fabric.mixins;
 
 import net.gigabit101.shrink.polylib.EntitySizeEvents;
 import net.minecraft.world.entity.Entity;

diff --git a/...ink/mixins/LivingEntityRendererMixin.java → ...ric/mixins/LivingEntityRendererMixin.java b/...ink/mixins/LivingEntityRendererMixin.java → ...ric/mixins/LivingEntityRendererMixin.java
@@ -1,4 +1,4 @@
-package net.gigabit101.shrink.mixins;
+package net.gigabit101.shrink.fabric.mixins;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.gigabit101.shrink.polylib.LivingEntityRenderEvents;

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -20,7 +20,9 @@
     ]
   },
   "mixins": [
-    "shrink.mixins.json"
+    "shrink.mixins.json",
+    "shrink_fabric.mixins.json"
+
   ],
   "depends": {
     "fabric": "*",

diff --git a/fabric/src/main/resources/shrink_fabric.mixins.json b/fabric/src/main/resources/shrink_fabric.mixins.json
@@ -0,0 +1,15 @@
+{
+  "required": true,
+  "package": "net.gigabit101.shrink.fabric.mixins",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.7.11",
+  "mixins": [
+    "EntityMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "client": [
+    "LivingEntityRendererMixin"
+  ]
+}
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     mappings loom.officialMojangMappings()
 
     forge "net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.forge_version}"
-//    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
+    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive false }

diff --git a/forge/src/main/java/net/gigabit101/shrink/forge/ShrinkModForge.java b/forge/src/main/java/net/gigabit101/shrink/forge/ShrinkModForge.java
@@ -1,6 +1,6 @@
 package net.gigabit101.shrink.forge;
 
-//import dev.architectury.platform.forge.EventBuses;
+import dev.architectury.platform.forge.EventBuses;
 import net.gigabit101.shrink.Shrink;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -10,7 +10,7 @@ public class ShrinkModForge
 {
     public ShrinkModForge()
     {
-//        EventBuses.registerModEventBus(Shrink.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
-//        Shrink.init();
+        EventBuses.registerModEventBus(Shrink.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
+        Shrink.init();
     }
 }