fixing mixins

PssbleTrngle · Mar 26, 2021 · 08eb48d · 08eb48d
1 parent 2d1a147
commit 08eb48d
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 12 deletions.
diff --git a/forge/src/main/resources/brazier.mixins.json → ...main/resources/brazier-common.mixins.json b/forge/src/main/resources/brazier.mixins.json → ...main/resources/brazier-common.mixins.json
@@ -1,12 +1,11 @@
-
 {
   "required": true,
   "package": "com.possible_triangle.brazier.mixin",
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "mixins": [
-    "WoodlandMansionPiecesMixin",
-    "WorldMixin"
+    "WorldMixin",
+    "WoodlandMansionPiecesMixin"
   ],
   "injectors": {
     "defaultRequire": 1

diff --git a/...ible_triangle/brazier/mixin/MobMixin.java → ...iangle/brazier/fabric/mixin/MobMixin.java b/...ible_triangle/brazier/mixin/MobMixin.java → ...iangle/brazier/fabric/mixin/MobMixin.java
@@ -1,4 +1,4 @@
-package com.possible_triangle.brazier.mixin;
+package com.possible_triangle.brazier.fabric.mixin;
 
 import com.possible_triangle.brazier.block.BrazierBlock;
 import net.minecraft.world.entity.Entity;

diff --git a/...gle/brazier/mixin/PathfinderMobMixin.java → ...zier/fabric/mixin/PathfinderMobMixin.java b/...gle/brazier/mixin/PathfinderMobMixin.java → ...zier/fabric/mixin/PathfinderMobMixin.java
@@ -1,4 +1,4 @@
-package com.possible_triangle.brazier.mixin;
+package com.possible_triangle.brazier.fabric.mixin;
 
 import com.possible_triangle.brazier.block.BrazierBlock;
 import net.minecraft.world.entity.Entity;

diff --git a/...ic/src/main/resources/brazier.mixins.json → ...main/resources/brazier-fabric.mixins.json b/...ic/src/main/resources/brazier.mixins.json → ...main/resources/brazier-fabric.mixins.json
@@ -1,12 +1,10 @@
 
 {
   "required": true,
-  "package": "com.possible_triangle.brazier.mixin",
+  "package": "com.possible_triangle.brazier.fabric.mixin",
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "mixins": [
-    "WoodlandMansionPiecesMixin",
-    "WorldMixin",
     "MobMixin",
     "PathfinderMobMixin"
   ],

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -22,7 +22,8 @@
     ]
   },
   "mixins": [
-    "brazier.mixins.json"
+    "brazier-common.mixins.json",
+    "brazier-fabric.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.7.4",

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -23,7 +23,7 @@ architectury {
 }
 
 loom {
-    mixinConfig "brazier.mixins.json"
+    mixinConfigs = ["brazier-forge.mixins.json", "brazier-common.mixins.json"]
 }
 
 minecraft {

diff --git a/...riangle/brazier/compat/jei/JeiPlugin.java → ...e/brazier/forge/compat/jei/JeiPlugin.java b/...riangle/brazier/compat/jei/JeiPlugin.java → ...e/brazier/forge/compat/jei/JeiPlugin.java
@@ -1,4 +1,4 @@
-package com.possible_triangle.brazier.compat.jei;
+package com.possible_triangle.brazier.forge.compat.jei;
 
 import com.possible_triangle.brazier.Brazier;
 import com.possible_triangle.brazier.Conditional;

diff --git a/...le/brazier/compat/jei/LightOnBrazier.java → ...zier/forge/compat/jei/LightOnBrazier.java b/...le/brazier/compat/jei/LightOnBrazier.java → ...zier/forge/compat/jei/LightOnBrazier.java
@@ -1,4 +1,4 @@
-package com.possible_triangle.brazier.compat.jei;
+package com.possible_triangle.brazier.forge.compat.jei;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;

diff --git a/forge/src/main/java/com/possible_triangle/brazier/forge/mixin/.gitkeep b/forge/src/main/java/com/possible_triangle/brazier/forge/mixin/.gitkeep
diff --git a/forge/src/main/resources/brazier-forge.mixins.json b/forge/src/main/resources/brazier-forge.mixins.json
@@ -0,0 +1,10 @@
+{
+  "required": true,
+  "package": "com.possible_triangle.brazier.forge.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "minVersion": "0.7.11",
+  "mixins": [],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}