added tags, fixed recipes

mrh0 · mrh0 · commit c2db32d25ad9 · 2025-04-20T14:41:54.000+02:00
diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "createaddition:electrum_block",
+    "createaddition:biomass_pellet_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/bio.json b/src/generated/resources/data/c/tags/block/storage_blocks/bio.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:biomass_pellet_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/biomass.json b/src/generated/resources/data/c/tags/block/storage_blocks/biomass.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:biomass_pellet_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/block/storage_blocks/electrum.json b/src/generated/resources/data/c/tags/block/storage_blocks/electrum.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/foods.json b/src/generated/resources/data/c/tags/item/foods.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "createaddition:chocolate_cake",
+    "createaddition:honey_cake"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/foods/edible_when_placed.json b/src/generated/resources/data/c/tags/item/foods/edible_when_placed.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "createaddition:chocolate_cake",
+    "createaddition:honey_cake"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "createaddition:biomass_pellet_block",
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/bio.json b/src/generated/resources/data/c/tags/item/storage_blocks/bio.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:biomass_pellet_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/biomass.json b/src/generated/resources/data/c/tags/item/storage_blocks/biomass.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:biomass_pellet_block"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/item/storage_blocks/electrum.json b/src/generated/resources/data/c/tags/item/storage_blocks/electrum.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/generated/resources/data/create/tags/block/brittle.json b/src/generated/resources/data/create/tags/block/brittle.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "createaddition:chocolate_cake",
+    "createaddition:honey_cake"
+  ]
+}
diff --git a/src/generated/resources/data/createaddition/advancement/recipes/misc/crafting/electrum_ingot_from_nugget.json b/src/generated/resources/data/createaddition/advancement/recipes/misc/crafting/electrum_ingot_from_nugget.json
@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_electrum_ingot": {
+    "has_electrum_nugget": {
       "conditions": {
         "items": [
           {
-            "items": "createaddition:electrum_ingot"
+            "items": "createaddition:electrum_nugget"
           }
         ]
       },
@@ -21,7 +21,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_electrum_ingot"
+      "has_electrum_nugget"
     ]
   ],
   "rewards": {
diff --git a/src/generated/resources/data/createaddition/advancement/recipes/misc/crafting/electrum_nugget.json b/src/generated/resources/data/createaddition/advancement/recipes/misc/crafting/electrum_nugget.json
@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_electrum_nugget": {
+    "has_electrum_ingot": {
       "conditions": {
         "items": [
           {
-            "items": "createaddition:electrum_nugget"
+            "items": "createaddition:electrum_ingot"
           }
         ]
       },
@@ -21,7 +21,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_electrum_nugget"
+      "has_electrum_ingot"
     ]
   ],
   "rewards": {
diff --git a/src/generated/resources/data/createaddition/recipe/crafting/electrum_ingot_from_nugget.json b/src/generated/resources/data/createaddition/recipe/crafting/electrum_ingot_from_nugget.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "key": {
     "#": {
-      "item": "createaddition:electrum_ingot"
+      "item": "createaddition:electrum_nugget"
     }
   },
   "pattern": [
@@ -13,6 +13,6 @@
   ],
   "result": {
     "count": 1,
-    "id": "createaddition:electrum_nugget"
+    "id": "createaddition:electrum_ingot"
   }
 }
diff --git a/src/generated/resources/data/createaddition/recipe/crafting/electrum_nugget.json b/src/generated/resources/data/createaddition/recipe/crafting/electrum_nugget.json
@@ -3,11 +3,11 @@
   "category": "misc",
   "ingredients": [
     {
-      "item": "createaddition:electrum_nugget"
+      "item": "createaddition:electrum_ingot"
     }
   ],
   "result": {
     "count": 9,
-    "id": "createaddition:electrum_ingot"
+    "id": "createaddition:electrum_nugget"
   }
 }
diff --git a/src/generated/resources/data/farmersdelight/tags/block/mineable/knife.json b/src/generated/resources/data/farmersdelight/tags/block/mineable/knife.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "createaddition:chocolate_cake",
+    "createaddition:honey_cake"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json b/src/generated/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:biomass_pellet_block"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "createaddition:electrum_block"
+  ]
+}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/alternator/AlternatorBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/alternator/AlternatorBlockEntity.java
@@ -64,7 +64,7 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) {
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.alternator.info").withStyle(ChatFormatting.WHITE)).forGoggles(tooltip);
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.energy.production").withStyle(ChatFormatting.GRAY)).forGoggles(tooltip);
-		CALang.builder().add(Component.literal(" " + Util.format(getEnergyProductionRate((int) (isSpeedRequirementFulfilled() ? getSpeed() : 0))) + "fe/t ")
+		CALang.builder().add(Component.literal(" " + Util.format(getEnergyProductionRate((int) (isSpeedRequirementFulfilled() ? getSpeed() : 0))) + "⚡/t ")
 				.withStyle(ChatFormatting.AQUA).append(CreateLang.translateDirect("gui.goggles.at_current_speed").withStyle(ChatFormatting.DARK_GRAY))).forGoggles(tooltip);
 		return true;
 	}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/connector/base/AbstractConnectorBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/connector/base/AbstractConnectorBlockEntity.java
@@ -9,11 +9,10 @@
 import com.mrh0.createaddition.debug.IDebugDrawer;
 import com.mrh0.createaddition.energy.*;
 import com.mrh0.createaddition.energy.network.EnergyNetwork;
-import com.mrh0.createaddition.index.CABlockEntities;
 import com.mrh0.createaddition.index.CALang;
 import com.mrh0.createaddition.util.Util;
 import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
-import com.mrh0.createaddition.network.IObserveTileEntity;
+import com.mrh0.createaddition.network.IObserveBlockEntity;
 import com.mrh0.createaddition.network.ObservePacketPayload;
 
 import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
@@ -34,11 +33,10 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
 import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.energy.IEnergyStorage;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class AbstractConnectorBlockEntity extends SmartBlockEntity implements IWireNode, IObserveTileEntity, IHaveGoggleInformation, IDebugDrawer, IEnergyProvider {
+public abstract class AbstractConnectorBlockEntity extends SmartBlockEntity implements IWireNode, IObserveBlockEntity, IHaveGoggleInformation, IDebugDrawer, IEnergyProvider {
 
 	private final Set<LocalNode> wireCache = new HashSet<>();
 	private final LocalNode[] localNodes;
@@ -357,7 +355,7 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
 				.append(getBlockState().getValue(AbstractConnectorBlock.MODE).getTooltip().withStyle(ChatFormatting.AQUA))).forGoggles(tooltip);
 
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.energy.usage").withStyle(ChatFormatting.GRAY)).forGoggles(tooltip);
-		CALang.builder().add(Component.literal(" ").append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("fe/t").withStyle(ChatFormatting.AQUA)).forGoggles(tooltip);
+		CALang.builder().add(Component.literal(" ").append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("⚡/t").withStyle(ChatFormatting.AQUA)).forGoggles(tooltip);
 
 		return IHaveGoggleInformation.super.addToGoggleTooltip(tooltip, isPlayerSneaking);
 	}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/electric_motor/ElectricMotorBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/electric_motor/ElectricMotorBlockEntity.java
@@ -104,7 +104,7 @@ public float calculateAddedStressCapacity() {
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
 		super.addToGoggleTooltip(tooltip, isPlayerSneaking);
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.energy.consumption").withStyle(ChatFormatting.GRAY)).forGoggles(tooltip);
-		CALang.builder().add(Component.literal(" " + Util.format(getEnergyConsumptionRate(generatedSpeed.getValue())) + "fe/t ")
+		CALang.builder().add(Component.literal(" " + Util.format(getEnergyConsumptionRate(generatedSpeed.getValue())) + "⚡/t ")
 				.withStyle(ChatFormatting.AQUA).append(CreateLang.translateDirect("gui.goggles.at_current_speed").withStyle(ChatFormatting.DARK_GRAY))).forGoggles(tooltip);
 		return true;
 	}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java
@@ -5,7 +5,7 @@
 
 import com.mrh0.createaddition.index.CABlockEntities;
 import com.mrh0.createaddition.index.CARecipes;
-import com.mrh0.createaddition.network.IObserveTileEntity;
+import com.mrh0.createaddition.network.IObserveBlockEntity;
 import com.mrh0.createaddition.network.ObservePacketPayload;
 import com.mrh0.createaddition.recipe.FluidRecipeWrapper;
 import com.mrh0.createaddition.recipe.liquid_burning.LiquidBurningRecipe;
@@ -53,7 +53,7 @@
 
 import static com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HEAT_LEVEL;
 
-public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IObserveTileEntity {
+public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IObserveBlockEntity {
 	public static final int MAX_HEAT_CAPACITY = 10000;
 
 	protected FuelType activeFuel;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/ModularAccumulatorBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/ModularAccumulatorBlockEntity.java
@@ -8,7 +8,7 @@
 import com.mrh0.createaddition.index.CABlockEntities;
 import com.mrh0.createaddition.index.CALang;
 import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
-import com.mrh0.createaddition.network.IObserveTileEntity;
+import com.mrh0.createaddition.network.IObserveBlockEntity;
 import com.mrh0.createaddition.network.ObservePacketPayload;
 import com.mrh0.createaddition.sound.CASoundScapes;
 import com.mrh0.createaddition.util.Util;
@@ -46,7 +46,7 @@
 import java.util.EnumSet;
 import java.util.List;
 
-public class ModularAccumulatorBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IMultiTileEnergyContainer, IObserveTileEntity, IDebugDrawer, ThresholdSwitchObservable {
+public class ModularAccumulatorBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IMultiTileEnergyContainer, IObserveBlockEntity, IDebugDrawer, ThresholdSwitchObservable {
 	protected InternalEnergyStorage energyCapability;
 	protected BlockPos controller;
 	protected BlockPos lastKnownPos;
@@ -478,11 +478,11 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.accumulator.info").withStyle(ChatFormatting.WHITE)).forGoggles(tooltip);
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.energy.stored").withStyle(ChatFormatting.GRAY)).forGoggles(tooltip);
 		CALang.builder().add(Component.literal(" ")
-				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("fe").withStyle(ChatFormatting.AQUA)).forGoggles(tooltip);
+				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("⚡").withStyle(ChatFormatting.AQUA)).forGoggles(tooltip);
 
 		CALang.builder().add(Component.translatable(CreateAddition.MODID + ".tooltip.energy.capacity").withStyle(ChatFormatting.GRAY)).forGoggles(tooltip);
 		CALang.builder().add(Component.literal(" ")
-				.append(Util.format((int)controllerTE.energyCapability.getMaxEnergyStored())).append("fe").withStyle(ChatFormatting.AQUA)).forGoggles(tooltip);
+				.append(Util.format((int)controllerTE.energyCapability.getMaxEnergyStored())).append("⚡").withStyle(ChatFormatting.AQUA)).forGoggles(tooltip);
 		return true;
 	}
 
diff --git a/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/RedstoneRelayBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/RedstoneRelayBlockEntity.java
@@ -6,8 +6,6 @@
 
 import com.mrh0.createaddition.CreateAddition;
 import com.mrh0.createaddition.blocks.connector.ConnectorType;
-import com.mrh0.createaddition.compat.computercraft.Peripherals;
-import com.mrh0.createaddition.compat.computercraft.RedstoneRelayPeripheral;
 import com.mrh0.createaddition.config.CommonConfig;
 import com.mrh0.createaddition.energy.IWireNode;
 import com.mrh0.createaddition.energy.LocalNode;
@@ -18,7 +16,7 @@
 import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
 import com.mrh0.createaddition.network.ObservePacketPayload;
 import com.mrh0.createaddition.util.Util;
-import com.mrh0.createaddition.network.IObserveTileEntity;
+import com.mrh0.createaddition.network.IObserveBlockEntity;
 import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@@ -39,7 +37,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 
-public class RedstoneRelayBlockEntity extends SmartBlockEntity implements IWireNode, IHaveGoggleInformation, IObserveTileEntity {
+public class RedstoneRelayBlockEntity extends SmartBlockEntity implements IWireNode, IHaveGoggleInformation, IObserveBlockEntity {
 
 	//private final InternalEnergyStorage energyBufferIn;
 	//private final InternalEnergyStorage energyBufferOut;
@@ -397,7 +395,7 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
 		tooltip.add(Component.literal(spacing)
 				.append(Component.translatable(CreateAddition.MODID + ".tooltip.energy.usage").withStyle(ChatFormatting.GRAY)));
 		tooltip.add(Component.literal(spacing).append(" ")
-				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("fe/t").withStyle(ChatFormatting.AQUA));
+				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("⚡/t").withStyle(ChatFormatting.AQUA));
 
 		return true;
 	}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/tesla_coil/TeslaCoilBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/tesla_coil/TeslaCoilBlockEntity.java
diff --git a/src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CACraftingRecipeProvider.java b/src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CACraftingRecipeProvider.java
diff --git a/src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CAPressingRecipeGen.java b/src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CAPressingRecipeGen.java
diff --git a/src/main/java/com/mrh0/createaddition/datagen/TagProvider/CABlockTagProvider.java b/src/main/java/com/mrh0/createaddition/datagen/TagProvider/CABlockTagProvider.java
diff --git a/src/main/java/com/mrh0/createaddition/datagen/TagProvider/CAItemTagProvider.java b/src/main/java/com/mrh0/createaddition/datagen/TagProvider/CAItemTagProvider.java
diff --git a/src/main/java/com/mrh0/createaddition/datagen/TagProvider/CATagRegister.java b/src/main/java/com/mrh0/createaddition/datagen/TagProvider/CATagRegister.java
diff --git a/src/main/java/com/mrh0/createaddition/network/IObserveBlockEntity.java b/src/main/java/com/mrh0/createaddition/network/IObserveBlockEntity.java
diff --git a/src/main/java/com/mrh0/createaddition/network/ServerPayloadHandler.java b/src/main/java/com/mrh0/createaddition/network/ServerPayloadHandler.java

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "values": [
 +    "createaddition:biomass_pellet_block"
 +  ]
 +}