Merge pull request #920 from L-Lawlite/1.21.1

mrh0 · web-flow · commit 19bb92c6c726 · 2025-04-11T12:20:37.000+02:00
1.21.1
diff --git a/src/main/java/com/mrh0/createaddition/blocks/alternator/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/alternator/package-info.java
@@ -0,0 +1,6 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.alternator;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/barbed_wire/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/barbed_wire/package-info.java
@@ -0,0 +1,6 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.barbed_wire;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/cake/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/cake/package-info.java
@@ -0,0 +1,6 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.cake;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;
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
@@ -10,9 +10,9 @@
 import com.mrh0.createaddition.energy.*;
 import com.mrh0.createaddition.energy.network.EnergyNetwork;
 import com.mrh0.createaddition.util.Util;
-import com.mrh0.createaddition.network.EnergyNetworkPacket;
+import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
 import com.mrh0.createaddition.network.IObserveTileEntity;
-import com.mrh0.createaddition.network.ObservePacketLegacy;
+import com.mrh0.createaddition.network.ObservePacketPayload;
 
 import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
@@ -336,14 +336,14 @@ public ConnectorMode getMode() {
 	}
 
 	@Override
-	public void onObserved(ServerPlayer player, ObservePacketLegacy pack) {
+	public void onObserved(ServerPlayer player, ObservePacketPayload pack) {
 		if(isNetworkValid(0))
-			EnergyNetworkPacket.send(worldPosition, getNetwork(0).getPulled(), getNetwork(0).getPushed(), player);
+			EnergyNetworkPacketPayload.send(worldPosition, getNetwork(0).getPulled(), getNetwork(0).getPushed(), player);
 	}
 
 	@Override
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
-		ObservePacketLegacy.send(worldPosition, 0);
+		ObservePacketPayload.send(worldPosition, 0);
 
 		String spacing = " ";
 		tooltip.add(Component.literal(spacing)
@@ -357,7 +357,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)EnergyNetworkPacket.clientBuff)).append("fe/t").withStyle(ChatFormatting.AQUA));
+				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("fe/t").withStyle(ChatFormatting.AQUA));
 
 		return IHaveGoggleInformation.super.addToGoggleTooltip(tooltip, isPlayerSneaking);
 	}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/connector/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/connector/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.connector;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/creative_energy/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/creative_energy/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.creative_energy;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/crops/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/crops/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.crops;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/electric_motor/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/electric_motor/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.electric_motor;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
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.CARecipes;
 import com.mrh0.createaddition.network.IObserveTileEntity;
-import com.mrh0.createaddition.network.ObservePacketLegacy;
+import com.mrh0.createaddition.network.ObservePacketPayload;
 import com.mrh0.createaddition.recipe.FluidRecipeWrapper;
 import com.mrh0.createaddition.recipe.liquid_burning.LiquidBurningRecipe;
 import com.simibubi.create.AllBlocks;
@@ -47,6 +47,7 @@
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.capability.IFluidHandler;
 import net.neoforged.neoforge.fluids.capability.templates.FluidTank;
+import org.jetbrains.annotations.Nullable;
 
 public class LiquidBlazeBurnerBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IObserveTileEntity {
 	public static final int MAX_HEAT_CAPACITY = 10000;
@@ -101,9 +102,8 @@ private void update(FluidStack stack) {
 		lastFluid = stack.getFluid();
 	}
 
-	public Optional<RecipeHolder<LiquidBurningRecipe>> find(FluidStack stack, Level level) {
-		if (stack == null) return Optional.empty();
-		if (level == null) return Optional.empty();
+	public Optional<RecipeHolder<LiquidBurningRecipe>> find(@Nullable FluidStack stack,@Nullable Level level) {
+		if (stack == null || level == null) return Optional.empty();
 		if (CARecipes.LIQUID_BURNING_TYPE.get() == null) return Optional.empty();
 		return level.getRecipeManager().getRecipeFor(CARecipes.LIQUID_BURNING_TYPE.get(), new FluidRecipeWrapper(stack), level);
 	}
@@ -441,12 +441,12 @@ public enum FuelType {
 	@Override
 	public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
 		if (level == null) return false;
-		ObservePacketLegacy.send(worldPosition, 0);
+		ObservePacketPayload.send(worldPosition, 0);
 		return containedFluidTooltip(tooltip, isPlayerSneaking, level.getCapability(Capabilities.FluidHandler.BLOCK, getBlockPos(), null));
 	}
 
 	@Override
-	public void onObserved(ServerPlayer player, ObservePacketLegacy pack) {
+	public void onObserved(ServerPlayer player, ObservePacketPayload pack) {
 		notifyUpdate();
 	}
 }
diff --git a/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.liquid_blaze_burner;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/CAConnectivityHandler.java b/src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/CAConnectivityHandler.java
@@ -23,7 +23,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.common.capabilities.ForgeCapabilities;
+import net.neoforged.neoforge.capabilities.Capabilities;
 
 public class CAConnectivityHandler {
 
@@ -347,7 +347,7 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> void splitMu
 		}
 
 		if (be instanceof ModularAccumulatorBlockEntity ienergy && ienergy.hasAccumulator())
-			be.getCapability(ForgeCapabilities.ENERGY)
+			be.getCapability(Capabilities.EnergyStorage)
 				.invalidate();
 
 		if (tryReconnect)
diff --git a/src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.modular_accumulator;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/RedstoneRelayBlock.java b/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/RedstoneRelayBlock.java
@@ -209,14 +209,15 @@ public void setPlacedBy(Level worldIn, BlockPos pos, BlockState state, LivingEnt
 	}
 
 	@Override
-	public void playerDestroy(Level level, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) {
-		super.playerDestroy(level, player, pos, state, blockEntity, tool);
-
-		if (level.isClientSide()) return;
-		BlockEntity te = level.getBlockEntity(pos);
-		if (te == null) return;
-		if (!(te instanceof IWireNode cte)) return;
-		cte.dropWires(level, !player.isCreative());
+	public BlockState playerWillDestroy(Level worldIn, BlockPos pos, BlockState state, Player player) {
+		super.playerWillDestroy(worldIn, pos, state, player);
+
+		if (worldIn.isClientSide()) return state;
+		BlockEntity te = worldIn.getBlockEntity(pos);
+		if (te == null) return state;
+		if (!(te instanceof IWireNode cte)) return state;
+		cte.dropWires(worldIn, !player.isCreative());
+		return state;
 	}
 
 	@Override
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
@@ -15,10 +15,10 @@
 import com.mrh0.createaddition.energy.WireType;
 import com.mrh0.createaddition.energy.network.EnergyNetwork;
 import com.mrh0.createaddition.index.CABlocks;
+import com.mrh0.createaddition.network.EnergyNetworkPacketPayload;
+import com.mrh0.createaddition.network.ObservePacketPayload;
 import com.mrh0.createaddition.util.Util;
-import com.mrh0.createaddition.network.EnergyNetworkPacket;
 import com.mrh0.createaddition.network.IObserveTileEntity;
-import com.mrh0.createaddition.network.ObservePacketLegacy;
 import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@@ -372,9 +372,9 @@ public int getDemand() {
 	}
 
 	@Override
-	public void onObserved(ServerPlayer player, ObservePacketLegacy pack) {
-		if(isNetworkValid(pack.getNode()))
-			EnergyNetworkPacket.send(worldPosition, getNetwork(pack.getNode()).getPulled(), getNetwork(pack.getNode()).getPushed(), player);
+	public void onObserved(ServerPlayer player, ObservePacketPayload pack) {
+		if(isNetworkValid(pack.node()))
+			EnergyNetworkPacketPayload.send(worldPosition, getNetwork(pack.node()).getPulled(), getNetwork(pack.node()).getPushed(), player);
 	}
 
 	@Override
@@ -384,7 +384,7 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
 			return false;
 		int node = getAvailableNode(ray.getLocation());
 
-		ObservePacketLegacy.send(worldPosition, node);
+		ObservePacketPayload.send(worldPosition, node);
 
 		String spacing = " ";
 		tooltip.add(Component.literal(spacing)
@@ -397,7 +397,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)EnergyNetworkPacket.clientBuff)).append("fe/t").withStyle(ChatFormatting.AQUA));
+				.append(Util.format((int)EnergyNetworkPacketPayload.clientBuff)).append("fe/t").withStyle(ChatFormatting.AQUA));
 
 		return true;
 	}
diff --git a/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/package-info.java b/src/main/java/com/mrh0/createaddition/blocks/redstone_relay/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.redstone_relay;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/com/mrh0/createaddition/compat/computercraft/Peripherals.java b/src/main/java/com/mrh0/createaddition/compat/computercraft/Peripherals.java
@@ -4,11 +4,11 @@
 import com.mrh0.createaddition.blocks.modular_accumulator.ModularAccumulatorBlockEntity;
 import com.mrh0.createaddition.blocks.portable_energy_interface.PortableEnergyInterfaceBlockEntity;
 import com.mrh0.createaddition.blocks.redstone_relay.RedstoneRelayBlockEntity;
-import net.minecraftforge.common.capabilities.Capability;
 
 import static dan200.computercraft.shared.Capabilities.CAPABILITY_PERIPHERAL;
 
 import com.mrh0.createaddition.blocks.electric_motor.ElectricMotorBlockEntity;
+import net.neoforged.neoforge.capabilities.Capabilities;
 
 public class Peripherals {
 	public static boolean isPeripheral(Capability<?> cap) {
diff --git a/src/main/java/com/mrh0/createaddition/compat/jei/CreateAdditionJEI.java b/src/main/java/com/mrh0/createaddition/compat/jei/CreateAdditionJEI.java
@@ -40,7 +40,7 @@
 @JeiPlugin
 public class CreateAdditionJEI implements IModPlugin {
 
-	private static final ResourceLocation ID = new ResourceLocation(CreateAddition.MODID, "jei_plugin");
+	private static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "jei_plugin");
 
 	@Override
 	@Nonnull
@@ -89,7 +89,7 @@ public void registerRecipes(IRecipeRegistration registration) {
 	public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
 		ALL.forEach(c -> c.registerCatalysts(registration));
 
-		registration.getJeiHelpers().getRecipeType(new ResourceLocation("create", "sandpaper_polishing"), SandPaperPolishingRecipe.class).ifPresent(type -> {
+		registration.getJeiHelpers().getRecipeType(ResourceLocation.fromNamespaceAndPath("create", "sandpaper_polishing"), SandPaperPolishingRecipe.class).ifPresent(type -> {
 			registration.addRecipeCatalyst(new ItemStack(CAItems.DIAMOND_GRIT_SANDPAPER.get()), type);
 		});
 		//registration.addRecipeCatalyst(new ItemStack(CAItems.DIAMOND_GRIT_SANDPAPER.get()), new ResourceLocation(Create.ID, "deploying"));
diff --git a/src/main/java/com/mrh0/createaddition/config/CommonConfig.java b/src/main/java/com/mrh0/createaddition/config/CommonConfig.java
@@ -231,6 +231,8 @@ public class CommonConfig {
 		COMMON_CONFIG = COMMON_BUILDER.build();
 	}
 
+
+	// What does this do? Just Load? If yes why not use onLoad event
 	public static void loadConfig(ModConfigSpec spec, java.nio.file.Path path) {
 		final CommentedFileConfig configData = CommentedFileConfig.builder(path)
 			.sync()
diff --git a/src/main/java/com/mrh0/createaddition/index/CAPartials.java b/src/main/java/com/mrh0/createaddition/index/CAPartials.java
@@ -16,11 +16,11 @@ public class CAPartials {
 	public static final PartialModel PORTABLE_ENERGY_INTERFACE_TOP = block("portable_energy_interface/block_top");
 
 	private static PartialModel block(String path) {
-		return PartialModel.of(new ResourceLocation(CreateAddition.MODID, "block/" + path));
+		return PartialModel.of(ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/" + path));
 	}
 
 	private static PartialModel entity(String path) {
-		return PartialModel.of(new ResourceLocation(CreateAddition.MODID, "entity/" + path));
+		return PartialModel.of(ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "entity/" + path));
 	}
 
 	public static void init() {
diff --git a/src/main/java/com/mrh0/createaddition/index/CAPonders.java b/src/main/java/com/mrh0/createaddition/index/CAPonders.java
@@ -15,7 +15,7 @@ public class CAPonders {
 	public static final ResourceLocation ELECTRIC = CreateAddition.asResource("electric");
 
 	public static void registerTags(PonderTagRegistrationHelper<ResourceLocation> helper) {
-		PonderTagRegistrationHelper<RegistryEntry<?>> HELPER = helper.withKeyFunction(RegistryEntry::getId);
+		PonderTagRegistrationHelper<RegistryEntry<?,?>> HELPER = helper.withKeyFunction(RegistryEntry::getId);
 
 		HELPER.registerTag(ELECTRIC)
 				.addToIndex()
@@ -45,7 +45,7 @@ public static void registerTags(PonderTagRegistrationHelper<ResourceLocation> he
 	}
 
 	public static void registerScenes(PonderSceneRegistrationHelper<ResourceLocation> helper) {
-		PonderSceneRegistrationHelper<ItemProviderEntry<?>> HELPER = helper.withKeyFunction(RegistryEntry::getId);
+		PonderSceneRegistrationHelper<ItemProviderEntry<?,?>> HELPER = helper.withKeyFunction(RegistryEntry::getId);
 
 		HELPER.addStoryBoard(CABlocks.ELECTRIC_MOTOR, "electric_motor", PonderScenes::electricMotor, AllCreatePonderTags.KINETIC_SOURCES, ELECTRIC);
 		HELPER.addStoryBoard(CABlocks.ALTERNATOR, "alternator", PonderScenes::alternator, AllCreatePonderTags.KINETIC_APPLIANCES, ELECTRIC);
diff --git a/src/main/java/com/mrh0/createaddition/index/CASpriteShifts.java b/src/main/java/com/mrh0/createaddition/index/CASpriteShifts.java
@@ -15,18 +15,18 @@ public class CASpriteShifts {
 	public static final CTSpriteShiftEntry
 		ACCUMULATOR = getCT(
 				RECTANGLE,
-				new ResourceLocation(CreateAddition.MODID, "block/modular_accumulator/block"),
-				new ResourceLocation(CreateAddition.MODID, "block/modular_accumulator/block_connected")
+				ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/modular_accumulator/block"),
+				ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/modular_accumulator/block_connected")
 			),
 		ACCUMULATOR_TOP = getCT(
 				RECTANGLE,
-				new ResourceLocation(CreateAddition.MODID, "block/modular_accumulator/block_top"),
-				new ResourceLocation(CreateAddition.MODID, "block/modular_accumulator/block_top_connected")
+				ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/modular_accumulator/block_top"),
+				ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/modular_accumulator/block_top_connected")
 			),
 
 		COPPER_WIRE_CASING = getCT(
 				OMNIDIRECTIONAL,
-			new ResourceLocation(CreateAddition.MODID, "block/copper_wire_casing/block"),
-			new ResourceLocation(CreateAddition.MODID, "block/copper_wire_casing/block_connected")
+			ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/copper_wire_casing/block"),
+			ResourceLocation.fromNamespaceAndPath(CreateAddition.MODID, "block/copper_wire_casing/block_connected")
 		);
 }
diff --git a/src/main/java/com/mrh0/createaddition/item/BrassAmulet.java b/src/main/java/com/mrh0/createaddition/item/BrassAmulet.java
@@ -14,10 +14,10 @@ public BrassAmulet(Properties props) {
         super(props.stacksTo(1));
     }
 
-    @Override
-    public Rarity getRarity(ItemStack pStack) {
-        return Rarity.UNCOMMON;
-    }
+//    @Override
+//    public Rarity getRarity(ItemStack pStack) {
+//        return Rarity.UNCOMMON;
+//    }
 
     @Override
     public void inventoryTick(ItemStack stack, Level level, Entity entity, int pSlotId, boolean pIsSelected) {
diff --git a/src/main/java/com/mrh0/createaddition/item/DiamondGritSandpaper.java b/src/main/java/com/mrh0/createaddition/item/DiamondGritSandpaper.java
@@ -25,7 +25,8 @@ public DiamondGritSandpaper(Properties properties) {
 	public int getMaxDamage(ItemStack stack) {
 		return USES;
 	}
-	
+
+	// This needs to be redone OnlyIn is never recommended
 	@Override
 	@OnlyIn(Dist.CLIENT)
 	public void initializeClient(Consumer<IClientItemExtensions> consumer) {
diff --git a/src/main/java/com/mrh0/createaddition/item/ElectrumAmulet.java b/src/main/java/com/mrh0/createaddition/item/ElectrumAmulet.java
@@ -14,10 +14,10 @@ public ElectrumAmulet(Properties props) {
         super(props.stacksTo(1));
     }
 
-    @Override
-    public Rarity getRarity(ItemStack pStack) {
-        return Rarity.UNCOMMON;
-    }
+//    @Override
+//    public Rarity getRarity(ItemStack pStack) {
+//        return Rarity.UNCOMMON;
+//    }
 
     @Override
     public void inventoryTick(ItemStack stack, Level level, Entity entity, int pSlotId, boolean pIsSelected) {
diff --git a/src/main/java/com/mrh0/createaddition/item/WireSpool.java b/src/main/java/com/mrh0/createaddition/item/WireSpool.java
diff --git a/src/main/java/com/mrh0/createaddition/item/package-info.java b/src/main/java/com/mrh0/createaddition/item/package-info.java
diff --git a/src/main/java/com/mrh0/createaddition/recipe/rolling/RollingRecipe.java b/src/main/java/com/mrh0/createaddition/recipe/rolling/RollingRecipe.java
diff --git a/src/main/java/com/mrh0/createaddition/recipe/rolling/SequencedAssemblyRollingRecipeSerializer.java b/src/main/java/com/mrh0/createaddition/recipe/rolling/SequencedAssemblyRollingRecipeSerializer.java
diff --git a/src/main/java/com/mrh0/createaddition/trains/schedule/condition/EnergyThresholdCondition.java b/src/main/java/com/mrh0/createaddition/trains/schedule/condition/EnergyThresholdCondition.java
