Finished porting fabric

Killarexe · Jun 10, 2024 · 540fe01 · 540fe01
1 parent b4e7286
commit 540fe01
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 43 deletions.
diff --git a/common/src/main/java/github/killarexe/copper_extension/item/RustableItem.java b/common/src/main/java/github/killarexe/copper_extension/item/RustableItem.java
@@ -34,11 +34,12 @@ public static <T extends Item> void rustEntityStack(
           ItemEntity entity, GameRules.Key<GameRules.IntegerValue> oxidationGameRule, RandomSource random)
   {
     int count = stack.getCount();
-    if(level.random.nextFloat() < level.getGameRules().getInt(oxidationGameRule) * BASE_CHANCE / count) {
+    if(random.nextFloat() < level.getGameRules().getInt(oxidationGameRule) * BASE_CHANCE / count) {
       Vec3 pos = entity.position();
       ItemEntity newItemEntity = new ItemEntity(level, pos.x, pos.y, pos.z, new ItemStack(nextItem, count));
       newItemEntity.copyPosition(entity);
       level.addFreshEntity(newItemEntity);
+      entity.kill();
     }
   }
 

diff --git a/common/src/main/resources/data/copper_extension/recipes/exposed_copper.json b/common/src/main/resources/data/copper_extension/recipes/exposed_copper.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:exposed_copper"
-  },
-  "show_notification": true
+    "id": "minecraft:exposed_copper"
+  }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/oxidized_copper.json b/common/src/main/resources/data/copper_extension/recipes/oxidized_copper.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:oxidized_copper"
-  },
-  "show_notification": true
+    "id": "minecraft:oxidized_copper"
+  }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_copper_block.json b/common/src/main/resources/data/copper_extension/recipes/waxed_copper_block.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:waxed_copper_block"
-  },
-  "show_notification": true
+    "id": "minecraft:waxed_copper_block"
+  }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_copper_ingot.json b/common/src/main/resources/data/copper_extension/recipes/waxed_copper_ingot.json
@@ -10,6 +10,6 @@
     }
   ],
   "result": {
-    "item": "copper_extension:waxed_copper_ingot"
+    "id": "copper_extension:waxed_copper_ingot"
   }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_exposed_copper.json b/common/src/main/resources/data/copper_extension/recipes/waxed_exposed_copper.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:waxed_exposed_copper"
-  },
-  "show_notification": true
+    "id": "minecraft:waxed_exposed_copper"
+  }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_exposed_copper_ingot.json b/common/src/main/resources/data/copper_extension/recipes/waxed_exposed_copper_ingot.json
@@ -10,6 +10,6 @@
     }
   ],
   "result": {
-    "item": "copper_extension:waxed_exposed_copper_ingot"
+    "id": "copper_extension:waxed_exposed_copper_ingot"
   }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_oxidized_copper.json b/common/src/main/resources/data/copper_extension/recipes/waxed_oxidized_copper.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:waxed_oxidized_copper"
-  },
-  "show_notification": true
+    "id": "minecraft:waxed_oxidized_copper"
+  }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_oxidized_copper_ingot.json b/common/src/main/resources/data/copper_extension/recipes/waxed_oxidized_copper_ingot.json
@@ -10,6 +10,6 @@
     }
   ],
   "result": {
-    "item": "copper_extension:waxed_oxidized_copper_ingot"
+    "id": "copper_extension:waxed_oxidized_copper_ingot"
   }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_weathered_copper.json b/common/src/main/resources/data/copper_extension/recipes/waxed_weathered_copper.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:waxed_weathered_copper"
-  },
-  "show_notification": true
+    "id": "minecraft:waxed_weathered_copper"
+  }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/waxed_weathered_copper_ingot.json b/common/src/main/resources/data/copper_extension/recipes/waxed_weathered_copper_ingot.json
@@ -10,6 +10,6 @@
     }
   ],
   "result": {
-    "item": "copper_extension:waxed_weathered_copper_ingot"
+    "id": "copper_extension:waxed_weathered_copper_ingot"
   }
 }
diff --git a/common/src/main/resources/data/copper_extension/recipes/weathered_copper.json b/common/src/main/resources/data/copper_extension/recipes/weathered_copper.json
@@ -12,7 +12,6 @@
     "###"
   ],
   "result": {
-    "item": "minecraft:weathered_copper"
-  },
-  "show_notification": true
+    "id": "minecraft:weathered_copper"
+  }
 }
diff --git a/fabric/src/main/resources/copper_extension.mixins.json b/fabric/src/main/resources/copper_extension.mixins.json
@@ -0,0 +1,15 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "github.killarexe.copper_extension.fabric.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [],
+  "client": [
+    "ItemEntityMixin",
+    "ItemMixin"
+  ],
+  "server": [],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -22,5 +22,8 @@
   "depends": {
     "fabric": "*",
     "minecraft": ">=${minecraft_version}"
-  }
+  },
+  "mixins": [
+    "copper_extension.mixins.json"
+  ]
 }
diff --git a/neoforge/update.json b/neoforge/update.json
@@ -1,22 +1,10 @@
 {
 	"homepage": "https://github.com/Killarexe/Copper-Extension",
-	"1.20.1": {
-		"1.0.0": "Added rusted coppers, crafts and beehive feature..."
-	},
-	"1.20.2": {
-		"1.1.0": "Add scrapping for copper ingots, Patch bugs.",
-		"1.2.0": "The Axe can now break from scrapping action"
-	},
-	"1.20.4": {
-		"1.2.1": "Update to 1.20.4, Patch oxidation in inventory, Add copperOxidationChance GameRule",
-		"1.3.0": "Switched the project to architectury and added a new item"
+	"1.20.6": {
+		"1.3.0": "Added rusted coppers, crafts and beehive feature..."
 	},
 	"promos": {
-		"1.20.1-lastest": "1.0.0",
-		"1.20.1-recommended": "1.0.0",
-		"1.20.2-lastest": "1.2.0",
-		"1.20.2-recommended": "1.2.0",
-		"1.20.4-lastest": "1.3.0",
-		"1.20.4-recommended": "1.3.0"
+		"1.20.6-lastest": "1.3.0",
+		"1.20.6-recommended": "1.3.0"
 	}
 }