Fix battery upgrade (Closes #1)

Mrbysco · Mrbysco · commit cc1369767285 · 2024-12-10T19:33:27.000+01:00
diff --git a/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/copper_stick_with_template_battery.json b/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/copper_stick_with_template_battery.json
@@ -8,7 +8,7 @@
   },
   "result": {
     "components": {
-      "constructionstick:battery": 0
+      "constructionstick:battery_enabled": true
     },
     "count": 1,
     "id": "constructionstick:copper_stick"
diff --git a/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/diamond_stick_with_template_battery.json b/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/diamond_stick_with_template_battery.json
@@ -8,7 +8,7 @@
   },
   "result": {
     "components": {
-      "constructionstick:battery": 0
+      "constructionstick:battery_enabled": true
     },
     "count": 1,
     "id": "constructionstick:diamond_stick"
diff --git a/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/iron_stick_with_template_battery.json b/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/iron_stick_with_template_battery.json
@@ -8,7 +8,7 @@
   },
   "result": {
     "components": {
-      "constructionstick:battery": 0
+      "constructionstick:battery_enabled": true
     },
     "count": 1,
     "id": "constructionstick:iron_stick"
diff --git a/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/netherite_stick_with_template_battery.json b/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/netherite_stick_with_template_battery.json
@@ -8,7 +8,7 @@
   },
   "result": {
     "components": {
-      "constructionstick:battery": 0
+      "constructionstick:battery_enabled": true
     },
     "count": 1,
     "id": "constructionstick:netherite_stick"
diff --git a/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/wooden_stick_with_template_battery.json b/src/generated/resources/data/constructionstick/recipe/smithing_upgrade/wooden_stick_with_template_battery.json
@@ -8,7 +8,7 @@
   },
   "result": {
     "components": {
-      "constructionstick:battery": 0
+      "constructionstick:battery_enabled": true
     },
     "count": 1,
     "id": "constructionstick:wooden_stick"
diff --git a/src/main/java/mrbysco/constructionstick/data/server/RecipeGenerator.java b/src/main/java/mrbysco/constructionstick/data/server/RecipeGenerator.java
@@ -1,5 +1,6 @@
 package mrbysco.constructionstick.data.server;
 
+import mrbysco.constructionstick.data.server.recipe.IngredientPredicate;
 import mrbysco.constructionstick.data.server.recipe.SmithingApplyUpgradeRecipeBuilder;
 import mrbysco.constructionstick.items.stick.ItemStick;
 import mrbysco.constructionstick.items.template.ItemUpgradeTemplate;
@@ -30,22 +31,22 @@ public RecipeGenerator(PackOutput packOutput, CompletableFuture<HolderLookup.Pro
 
 	@Override
 	protected void buildRecipes(RecipeOutput output, HolderLookup.Provider provider) {
-		stickRecipe(output, ModItems.STICK_WOODEN.get(), Inp.fromTag(Tags.Items.RODS_WOODEN));
-		stickRecipe(output, ModItems.STICK_COPPER.get(), Inp.fromTag(ItemTags.STONE_TOOL_MATERIALS));
-		stickRecipe(output, ModItems.STICK_IRON.get(), Inp.fromTag(Tags.Items.INGOTS_IRON));
-		stickRecipe(output, ModItems.STICK_DIAMOND.get(), Inp.fromTag(Tags.Items.GEMS_DIAMOND));
-		stickRecipe(output, ModItems.STICK_NETHERITE.get(), Inp.fromTag(Tags.Items.INGOTS_NETHERITE));
+		stickRecipe(output, ModItems.STICK_WOODEN.get(), IngredientPredicate.fromTag(Tags.Items.RODS_WOODEN));
+		stickRecipe(output, ModItems.STICK_COPPER.get(), IngredientPredicate.fromTag(ItemTags.STONE_TOOL_MATERIALS));
+		stickRecipe(output, ModItems.STICK_IRON.get(), IngredientPredicate.fromTag(Tags.Items.INGOTS_IRON));
+		stickRecipe(output, ModItems.STICK_DIAMOND.get(), IngredientPredicate.fromTag(Tags.Items.GEMS_DIAMOND));
+		stickRecipe(output, ModItems.STICK_NETHERITE.get(), IngredientPredicate.fromTag(Tags.Items.INGOTS_NETHERITE));
 
-		templateRecipe(output, ModItems.TEMPLATE_ANGEL.get(), Inp.fromTag(Tags.Items.FEATHERS), Inp.fromTag(Tags.Items.INGOTS_GOLD));
-		templateRecipe(output, ModItems.TEMPLATE_DESTRUCTION.get(), Inp.fromItem(Items.TNT), Inp.fromItem(Items.DIAMOND_PICKAXE));
+		templateRecipe(output, ModItems.TEMPLATE_ANGEL.get(), IngredientPredicate.fromTag(Tags.Items.FEATHERS), IngredientPredicate.fromTag(Tags.Items.INGOTS_GOLD));
+		templateRecipe(output, ModItems.TEMPLATE_DESTRUCTION.get(), IngredientPredicate.fromItem(Items.TNT), IngredientPredicate.fromItem(Items.DIAMOND_PICKAXE));
 
-		templateUpgradeRecipe(output, ModItems.TEMPLATE_ANGEL, Inp.fromTag(Tags.Items.FEATHERS), ModDataComponents.ANGEL, true);
-		templateUpgradeRecipe(output, ModItems.TEMPLATE_DESTRUCTION, Inp.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), ModDataComponents.DESTRUCTION, true);
-		templateUpgradeRecipe(output, ModItems.TEMPLATE_UNBREAKABLE, Inp.fromTag(Tags.Items.OBSIDIANS_CRYING), ModDataComponents.UNBREAKABLE, true);
-		templateUpgradeRecipe(output, ModItems.TEMPLATE_BATTERY, Inp.fromTag(Tags.Items.STORAGE_BLOCKS_COPPER), ModDataComponents.BATTERY, 0);
+		templateUpgradeRecipe(output, ModItems.TEMPLATE_ANGEL, IngredientPredicate.fromTag(Tags.Items.FEATHERS), ModDataComponents.ANGEL, true);
+		templateUpgradeRecipe(output, ModItems.TEMPLATE_DESTRUCTION, IngredientPredicate.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), ModDataComponents.DESTRUCTION, true);
+		templateUpgradeRecipe(output, ModItems.TEMPLATE_UNBREAKABLE, IngredientPredicate.fromTag(Tags.Items.OBSIDIANS_CRYING), ModDataComponents.UNBREAKABLE, true);
+		templateUpgradeRecipe(output, ModItems.TEMPLATE_BATTERY, IngredientPredicate.fromTag(Tags.Items.STORAGE_BLOCKS_COPPER), ModDataComponents.BATTERY_ENABLED, true);
 	}
 
-	private void stickRecipe(RecipeOutput output, ItemLike stick, Inp material) {
+	private void stickRecipe(RecipeOutput output, ItemLike stick, IngredientPredicate material) {
 		ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, stick)
 				.define('X', material.ingredient())
 				.define('#', Tags.Items.RODS_WOODEN)
@@ -57,7 +58,7 @@ private void stickRecipe(RecipeOutput output, ItemLike stick, Inp material) {
 	}
 
 	private <T> void templateUpgradeRecipe(RecipeOutput output, DeferredItem<? extends ItemUpgradeTemplate> template,
-	                                       Inp item1, Supplier<DataComponentType<T>> component, T defaultValue) {
+	                                       IngredientPredicate item1, Supplier<DataComponentType<T>> component, T defaultValue) {
 		for (DeferredItem<? extends ItemStick> stickHolder : ModItems.STICKS) {
 			ItemStack stack = stickHolder.toStack();
 			stack.set(component, defaultValue);
@@ -71,7 +72,7 @@ private <T> void templateUpgradeRecipe(RecipeOutput output, DeferredItem<? exten
 
 	}
 
-	private void templateRecipe(RecipeOutput output, ItemLike template, Inp item1, Inp item2) {
+	private void templateRecipe(RecipeOutput output, ItemLike template, IngredientPredicate item1, IngredientPredicate item2) {
 		ShapedRecipeBuilder.shaped(RecipeCategory.MISC, template)
 				.define('O', item1.ingredient())
 				.define('X', item2.ingredient())
diff --git a/src/main/java/mrbysco/constructionstick/data/server/recipe/IngredientPredicate.java b/src/main/java/mrbysco/constructionstick/data/server/recipe/IngredientPredicate.java
@@ -0,0 +1,18 @@
+package mrbysco.constructionstick.data.server.recipe;
+
+import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.level.ItemLike;
+
+public record IngredientPredicate(Ingredient ingredient, ItemPredicate predicate) {
+
+	public static IngredientPredicate fromItem(ItemLike in) {
+		return new IngredientPredicate(Ingredient.of(in), ItemPredicate.Builder.item().of(in).build());
+	}
+
+	public static IngredientPredicate fromTag(TagKey<Item> in) {
+		return new IngredientPredicate(Ingredient.of(in), ItemPredicate.Builder.item().of(in).build());
+	}
+}
diff --git a/src/main/java/mrbysco/constructionstick/data/server/recipe/Inp.java b/src/main/java/mrbysco/constructionstick/data/server/recipe/Inp.java
diff --git a/src/main/java/mrbysco/constructionstick/items/template/ItemBatteryTemplate.java b/src/main/java/mrbysco/constructionstick/items/template/ItemBatteryTemplate.java
@@ -5,6 +5,7 @@
 import mrbysco.constructionstick.api.IStickUpgrade;
 import mrbysco.constructionstick.registry.ModDataComponents;
 import mrbysco.constructionstick.stick.action.ActionAngel;
+import mrbysco.constructionstick.stick.action.ActionConstruction;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,12 +18,12 @@ public ItemBatteryTemplate(Properties properties) {
 
 	@Override
 	public IStickAction getStickAction() {
-		return new ActionAngel();
+		return new ActionConstruction();
 	}
 
 	@Override
-	public DataComponentType<Integer> getStickComponent() {
-		return ModDataComponents.BATTERY.get();
+	public DataComponentType<Boolean> getStickComponent() {
+		return ModDataComponents.BATTERY_ENABLED.get();
 	}
 
 	@Override
diff --git a/src/main/java/mrbysco/constructionstick/items/template/ItemUnbreakableTemplate.java b/src/main/java/mrbysco/constructionstick/items/template/ItemUnbreakableTemplate.java
@@ -5,6 +5,7 @@
 import mrbysco.constructionstick.api.IStickUpgrade;
 import mrbysco.constructionstick.registry.ModDataComponents;
 import mrbysco.constructionstick.stick.action.ActionAngel;
+import mrbysco.constructionstick.stick.action.ActionConstruction;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.resources.ResourceLocation;
 
@@ -17,7 +18,7 @@ public ItemUnbreakableTemplate(Properties properties) {
 
 	@Override
 	public IStickAction getStickAction() {
-		return new ActionAngel();
+		return new ActionConstruction();
 	}
 
 	@Override
diff --git a/src/main/java/mrbysco/constructionstick/registry/ModDataComponents.java b/src/main/java/mrbysco/constructionstick/registry/ModDataComponents.java
@@ -63,6 +63,12 @@ public class ModDataComponents {
 					.networkSynchronized(ByteBufCodecs.BOOL)
 					.build());
 
+	public static final DeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> BATTERY_ENABLED = DATA_COMPONENT_TYPES.register("battery_enabled", () ->
+			DataComponentType.<Boolean>builder()
+					.persistent(Codec.BOOL)
+					.networkSynchronized(ByteBufCodecs.BOOL)
+					.build());
+
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> BATTERY = DATA_COMPONENT_TYPES.register("battery", () ->
 			DataComponentType.<Integer>builder()
 					.persistent(Codec.INT)
diff --git a/src/main/java/mrbysco/constructionstick/registry/ModItems.java b/src/main/java/mrbysco/constructionstick/registry/ModItems.java
@@ -86,7 +86,18 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) {
 		for (DeferredHolder<Item, ? extends Item> holder : STICKS) {
 			event.registerItem(Capabilities.EnergyStorage.ITEM, (stack, context) -> {
 						StickProperties properties = ConstructionConfig.getStickProperties(holder.get());
-						return new ComponentEnergyStorage(stack, ModDataComponents.BATTERY.get(), properties.getBatteryStorage(), properties.getBatteryUsage());
+						return new ComponentEnergyStorage(stack, ModDataComponents.BATTERY.get(),
+								properties.getBatteryStorage(), 200, properties.getBatteryUsage()) {
+							@Override
+							public boolean canExtract() {
+								return stack.has(ModDataComponents.BATTERY_ENABLED) && super.canExtract();
+							}
+
+							@Override
+							public boolean canReceive() {
+								return stack.has(ModDataComponents.BATTERY_ENABLED) && super.canReceive();
+							}
+						};
 					},
 					holder.get()
 			);
