Merge pull request #438 from Anvil-Dev/forge_fix

修复forge无法启动的问题
Anvil-Dev · Apr 28, 2024 · d7e88eb · d7e88eb
2 parents 25a7ce9 + 7fd672c
commit d7e88eb
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 62 deletions.
diff --git a/.../mixin/fabric/EnchantmentHelperMixin.java → ...ilcraft/mixin/EnchantmentHelperMixin.java b/.../mixin/fabric/EnchantmentHelperMixin.java → ...ilcraft/mixin/EnchantmentHelperMixin.java
@@ -1,4 +1,4 @@
-package dev.dubhe.anvilcraft.mixin.fabric;
+package dev.dubhe.anvilcraft.mixin;
 
 import dev.dubhe.anvilcraft.item.HasDefaultEnchantment;
 import net.minecraft.world.item.ItemStack;

diff --git a/common/src/main/resources/anvilcraft-common.mixins.json b/common/src/main/resources/anvilcraft-common.mixins.json
@@ -1,35 +1,36 @@
 {
-  "required": true,
-  "minVersion": "0.8",
-  "package": "dev.dubhe.anvilcraft.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "mixins": [
-    "AbstractCauldronBlockMixin",
-    "AnvilBlockMixin",
-    "BeaconMenuMixin",
-    "BucketItemMixin",
-    "ClientboundUpdateRecipesPacketMixin",
-    "DiggerItemMixin",
-    "DispenseItemEmptyBottleBehaviorMixin",
-    "DispenseItemEmptyBucketBehaviorMixin",
-    "DispenseItemWaterBottleBehaviorMixin",
-    "FlyingHitEntityMixin",
-    "HoeItemMixin",
-    "ItemEntityMixin",
-    "LivingEntityMixin",
-    "PlayerHitEntityMixin",
-    "SolidBucketItemMixin",
-    "accessor.BaseSpawnerAccessor",
-    "accessor.FallingBlockEntityAccessor",
-    "accessor.LootContextParamSetsAccessor"
-  ],
-  "client": [
-    "LevelRendererMixin",
-    "PowerGridInformationRenderMixin",
-    "accessor.ItemInHandRendererAccessor",
-    "accessor.MinecraftAccessor"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
+    "required": true,
+    "minVersion": "0.8",
+    "package": "dev.dubhe.anvilcraft.mixin",
+    "compatibilityLevel": "JAVA_17",
+    "mixins": [
+        "AbstractCauldronBlockMixin",
+        "AnvilBlockMixin",
+        "BeaconMenuMixin",
+        "BucketItemMixin",
+        "ClientboundUpdateRecipesPacketMixin",
+        "DiggerItemMixin",
+        "DispenseItemEmptyBottleBehaviorMixin",
+        "DispenseItemEmptyBucketBehaviorMixin",
+        "DispenseItemWaterBottleBehaviorMixin",
+        "EnchantmentHelperMixin",
+        "FlyingHitEntityMixin",
+        "HoeItemMixin",
+        "ItemEntityMixin",
+        "LivingEntityMixin",
+        "PlayerHitEntityMixin",
+        "SolidBucketItemMixin",
+        "accessor.BaseSpawnerAccessor",
+        "accessor.FallingBlockEntityAccessor",
+        "accessor.LootContextParamSetsAccessor"
+    ],
+    "client": [
+        "LevelRendererMixin",
+        "PowerGridInformationRenderMixin",
+        "accessor.ItemInHandRendererAccessor",
+        "accessor.MinecraftAccessor"
+    ],
+    "injectors": {
+        "defaultRequire": 1
+    }
 }
diff --git a/fabric/src/main/resources/anvilcraft.mixins.json b/fabric/src/main/resources/anvilcraft.mixins.json
@@ -4,7 +4,6 @@
   "package": "dev.dubhe.anvilcraft.mixin.fabric",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "EnchantmentHelperMixin",
     "FallingBlockEntityMixin",
     "LightningBoltMixin",
     "PistonMovingBlockEntityMixin",

diff --git a/forge/src/main/java/dev/dubhe/anvilcraft/mixin/forge/ForgeItemStackMixin.java b/forge/src/main/java/dev/dubhe/anvilcraft/mixin/forge/ForgeItemStackMixin.java
diff --git a/forge/src/main/resources/anvilcraft.mixins.json b/forge/src/main/resources/anvilcraft.mixins.json
@@ -6,7 +6,6 @@
   "mixins": [
     "CraftingHelperMixin",
     "FallingBlockEntityMixin",
-    "ForgeItemStackMixin",
     "LevelChunkMixin",
     "LightningBoltMixin",
     "MinecraftServerMixin",