add waraxe for previous commit, fix stone recipes not requiring cobbl…

…estone
Draylar · Mar 10, 2021 · b39dacf · b39dacf
1 parent 2c28666
commit b39dacf
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/src/main/java/draylar/gateofbabylon/item/WaraxeItem.java b/src/main/java/draylar/gateofbabylon/item/WaraxeItem.java
@@ -29,12 +29,8 @@
 
 public class WaraxeItem extends AxeItem implements EnchantmentHandler {
 
-    public WaraxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
-        super(material, attackDamage, attackSpeed, settings);
-    }
-
-    public WaraxeItem(ToolMaterial material, float effectiveDamage, float effectiveSpeed) {
-        super(material, (int) (effectiveDamage - material.getAttackDamage() - 1), -4 + effectiveSpeed, new Item.Settings().group(GateOfBabylon.GROUP).maxCount(1));
+    public WaraxeItem(ToolMaterial material, float effectiveDamage, float effectiveSpeed, Item.Settings settings) {
+        super(material, (int) (effectiveDamage - material.getAttackDamage() - 1), -4 + effectiveSpeed, settings);
     }
 
     @Override

diff --git a/src/main/resources/data/gateofbabylon/recipes/haladie/stone_haladie.json b/src/main/resources/data/gateofbabylon/recipes/haladie/stone_haladie.json
@@ -10,7 +10,7 @@
       "item": "minecraft:stick"
     },
     "X": {
-      "item": "minecraft:stone"
+      "item": "minecraft:cobblestone"
     }
   },
   "result": {

diff --git a/src/main/resources/data/gateofbabylon/recipes/katana/stone_katana.json b/src/main/resources/data/gateofbabylon/recipes/katana/stone_katana.json
@@ -10,7 +10,7 @@
       "item": "gateofbabylon:extended_stick"
     },
     "X": {
-      "item": "minecraft:stone"
+      "item": "minecraft:cobblestone"
     }
   },
   "result": {

diff --git a/src/main/resources/data/gateofbabylon/recipes/rapier/stone_rapier.json b/src/main/resources/data/gateofbabylon/recipes/rapier/stone_rapier.json
@@ -10,7 +10,7 @@
       "item": "minecraft:stick"
     },
     "X": {
-      "item": "minecraft:stone"
+      "item": "minecraft:cobblestone"
     }
   },
   "result": {

diff --git a/src/main/resources/data/gateofbabylon/recipes/shield/stone_shield.json b/src/main/resources/data/gateofbabylon/recipes/shield/stone_shield.json
@@ -7,7 +7,7 @@
   ],
   "key": {
     "W": {
-      "item": "minecraft:stone"
+      "item": "minecraft:cobblestone"
     },
     "o": {
       "item": "minecraft:iron_ingot"

diff --git a/src/main/resources/data/gateofbabylon/recipes/spear/stone_spear.json b/src/main/resources/data/gateofbabylon/recipes/spear/stone_spear.json
@@ -10,7 +10,7 @@
       "item": "gateofbabylon:extended_stick"
     },
     "X": {
-      "item": "minecraft:stone"
+      "item": "minecraft:cobblestone"
     }
   },
   "result": {