Fix Force Rod not being charge-able

Fix 2nd force rod recipe
Mrbysco · Nov 16, 2023 · e7df64e · e7df64e
1 parent 461aee2
commit e7df64e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/main/java/com/mrbysco/forcecraft/items/tools/ForceRodItem.java b/src/main/java/com/mrbysco/forcecraft/items/tools/ForceRodItem.java
@@ -289,6 +289,20 @@ public ActionResultType interactLivingEntity(ItemStack stack, PlayerEntity playe
 		return super.interactLivingEntity(stack, playerIn, target, handIn);
 	}
 
+	@Override
+	public void inventoryTick(ItemStack stack, World level, Entity entityIn, int itemSlot, boolean isSelected) {
+		super.inventoryTick(stack, level, entityIn, itemSlot, isSelected);
+		if (stack.getTag() != null && !stack.getTag().contains("ForceInfused")) {
+			initializeTag(stack);
+		}
+	}
+
+	private void initializeTag(ItemStack stack) {
+		CompoundNBT tag = stack.getOrCreateTag();
+		tag.putBoolean("ForceInfused", false);
+		stack.setTag(tag);
+	}
+
 	@Nullable
 	@Override
 	public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT nbt) {

diff --git a/src/main/resources/data/forcecraft/recipes/force_rod.json b/src/main/resources/data/forcecraft/recipes/force_rod.json
@@ -3,7 +3,8 @@
   "pattern": [
     "  F",
     " S ",
-    "N  "  ],
+    "N  "
+  ],
   "key": {
     "F": [
       {
@@ -21,8 +22,9 @@
       }
     ]
   },
-
   "result": {
-    "item": "forcecraft:force_rod"
+    "type": "forge:nbt",
+    "item": "forcecraft:force_rod",
+    "nbt": "{ForceInfused:1b}"
   }
 }
diff --git a/src/main/resources/data/forcecraft/recipes/force_rod2.json b/src/main/resources/data/forcecraft/recipes/force_rod2.json
@@ -3,7 +3,8 @@
   "pattern": [
     "  F",
     " S ",
-    "N  "  ],
+    "N  "
+  ],
   "key": {
     "F": [
       {
@@ -17,12 +18,13 @@
     ],
     "S": [
       {
-        "tag": "forge:rods/force"
+        "item": "minecraft:stick"
       }
     ]
   },
-
   "result": {
-    "item": "forcecraft:force_rod"
+    "type": "forge:nbt",
+    "item": "forcecraft:force_rod",
+    "nbt": "{Damage:73,ForceInfused:1b}"
   }
 }