1.1 Update

SammySemicolon · Apr 15, 2023 · ac5f774 · ac5f774
1 parent 56827c8
commit ac5f774
Show file tree

Hide file tree

Showing 31 changed files with 851 additions and 197 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 # Dependency Version
 minecraftVersion=1.18.2
-forgeVersion=40.1.73
+forgeVersion=40.2.0
 # Build Dependencies Versions
 mixinVersion=0.8.5
 parchmentVersion=2022.08.02
@@ -12,6 +12,6 @@ shadowVersion = 7.1.0
 # Mod Meta
 modName=Miner's Delight
 modId=miners_delight
-modVersion=1.0.3
+modVersion=1.1
 # Mod Dependency Versions
 jeiVersion=9.7.0.209
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -3,8 +3,8 @@ e5ef60b3e80f07524801fe680b9197916588b95b assets/miners_delight/blockstates/cave_
 01bc9a48359fac9f8ff8d10c69a5fada13fb34f9 assets/miners_delight/blockstates/gossypium.json
 0397810dd264b1814a37bac221f6224b4fd090b8 assets/miners_delight/blockstates/stuffed_squid.json
 38b223d8a6b3db40af3317150c92b4e248c5026d assets/miners_delight/blockstates/wild_cave_carrots.json
-2dadecc196b0b507e2749bacede586cc5c94459b assets/miners_delight/lang/en_ud.json
-c5000cd52cc21271cc3d52a0b45dc715a6791be2 assets/miners_delight/lang/en_us.json
+86c9b9201a5ca9c9448e5bcd74a69ab6a3f5de0a assets/miners_delight/lang/en_ud.json
+e9ca949eacef0e92c23940aaae25513411fbe81f assets/miners_delight/lang/en_us.json
 f75e0f799a954bcb768f800b994afdf8b98a9c8d assets/miners_delight/models/block/cave_carrots_0.json
 4d8bea25df7ffa8c45ca77ff8ba4e1d3e0d6c68d assets/miners_delight/models/block/cave_carrots_1.json
 86f7722add8f430b1ddfc55a6acb98487c7ca7d5 assets/miners_delight/models/block/cave_carrots_2.json
@@ -41,12 +41,14 @@ d35594f4b582cd52eb60a973feb0e56501e89155 assets/miners_delight/models/item/impro
 0eb292b56979c5e6d9034b5c12aae99b1f0b5a88 assets/miners_delight/models/item/silverfish_eggs.json
 91f3bbc4e7ce1bcd13ac6e0ec5b2ecd8aac8c1bf assets/miners_delight/models/item/smoked_bat_wing.json
 484f2549e4b4f6b60e335e1f4037b8296ff849a6 assets/miners_delight/models/item/squid.json
+5dba2d6dd7f23adca43230f4ea69c0bb2a255592 assets/miners_delight/models/item/sticky_basket.json
 9892fcf58b5421d2f583365d61aa523eb07e1fb9 assets/miners_delight/models/item/stuffed_squid.json
 b73a6a7bf78faf3c82b2287ae495f23639eb53c6 assets/miners_delight/models/item/tentacles.json
 2f71a4982cb6dce073b164f9abf5a9ad78af0ab5 assets/miners_delight/models/item/vegetable_soup_cup.json
 fccc24cffe1f890f09036bf6ebe9b5e54bddcc0c assets/miners_delight/models/item/water_cup.json
 4a16829968d5d8f59778401cbfadded8fcefca7a assets/miners_delight/models/item/weird_caviar.json
 314658a27f70d8376bde5a003498215b8b5e01f9 assets/miners_delight/models/item/wild_cave_carrots.json
+8d2434befe183802e0bdc51e92522db8e447d5f8 data/forge/tags/items/milk.json
 b1e6d350a95ac2657c96d29c7b546b28744c4222 data/minecraft/advancements/recipes/miners_delight/baked_cave_carrot.json
 031eccdc1ae6bde1040d396b7a63b950d5e4bdcb data/minecraft/advancements/recipes/miners_delight/baked_cave_carrot_campfire.json
 3c537e445216d5aacb00a3af9f1cb1f445f6dfd5 data/minecraft/advancements/recipes/miners_delight/baked_cave_carrot_smoking.json
@@ -71,7 +73,7 @@ fc718e55e0bff4967d457e5cd4a074db1496382d data/minecraft/recipes/baked_squid.json
 416dbb92136ade126e05a8f45468b0365ddf5228 data/minecraft/recipes/smoked_bat_wing.json
 b0869e3c6821be3e03dd38d439fd567e7fab3d27 data/minecraft/recipes/smoked_bat_wing_campfire.json
 de38a9e25b0d4c21913b7428204c91a3f06ce66c data/minecraft/recipes/smoked_bat_wing_smoking.json
-a10545a95b5357b30e4f2428311be129536966f7 data/minecraft/tags/blocks/mineable/axe.json
+f2df1f0b7be7c6c709923f19d0f2328b3ede311c data/minecraft/tags/blocks/mineable/axe.json
 9d5139cb2e9c5eff2e63ee72884e2f76034dc551 data/minecraft/tags/blocks/mineable/pickaxe.json
 05c77ffc2ba6ea00637dc82843bd92e83b496c05 data/minecraft/tags/blocks/small_flowers.json
 eee444f50f3c088e51e37e43ad29a6195d2a7f6e data/miners_delight/advancements/recipes/miners_delight/cave_carrot_crate.json
@@ -82,12 +84,13 @@ ff3f46c51b95c70265dda081fe7b7da50e213b05 data/miners_delight/advancements/recipe
 c3e9b2f29168cd4c38250d783656ce34c86fc9b1 data/miners_delight/advancements/recipes/miners_delight/copper_cup.json
 938a976eb8b8474ee425c78d97f6909327e4ed43 data/miners_delight/advancements/recipes/miners_delight/copper_pot.json
 f40adef557bd2e37b4cba7b8afc7ec639f5313dd data/miners_delight/advancements/recipes/miners_delight/improvised_barbecue_stick.json
+7885bb3e2582b08d44aa88a2e2d06fd9fbc97918 data/miners_delight/advancements/recipes/miners_delight/sticky_basket.json
 d442fcea60232dbc095f4c0f714ff815d1270855 data/miners_delight/advancements/recipes/miners_delight/weird_caviar.json
 ca88583670fcffc6f65e929b77fbf4c6b9238f6d data/miners_delight/advancements/recipes/misc/string_from_gossypium.json
 a795752b2c6db1e726c470cf5b6efb33ca37fd79 data/miners_delight/loot_tables/blocks/cave_carrot_crate.json
 e8cd3a68f0a51e113d022a5456e9ad0e14b3b675 data/miners_delight/loot_tables/blocks/cave_carrots.json
-e0ea0002fe72dfda3ea9596db5a3dda113e3f69b data/miners_delight/loot_tables/blocks/copper_pot.json
 c902ca8bd8ac6579769a2045742955d9195e1045 data/miners_delight/loot_tables/blocks/gossypium.json
+99aa02bdef2ca028e96eb523ded90e86116579e6 data/miners_delight/loot_tables/blocks/sticky_basket.json
 1fad9cf104de4eb3e19ba61bd6351157b03debd7 data/miners_delight/loot_tables/blocks/stuffed_squid.json
 e04d6d9715bbe2334dd7b3c8f309a4f942757991 data/miners_delight/recipes/cave_carrot_crate.json
 cdc77a1e8549403a3603b07389bd531076cf410e data/miners_delight/recipes/cave_carrots_from_crate.json
@@ -101,5 +104,6 @@ b3e92e8093d74d23674d1f5d9d3b85fe074ea4cc data/miners_delight/recipes/cooking/cav
 6eb4fb9ea855208529d8274d1b8c92bf1b6ad588 data/miners_delight/recipes/cutting/squid.json
 e6205b211cc49d07c661dc5803e898ee1d4bf68d data/miners_delight/recipes/cutting/wild_cave_carrot.json
 7b93224b4ab460576b15d3d3feb24a9f77ee1744 data/miners_delight/recipes/improvised_barbecue_stick.json
+97b116e366e4fc56a93abfebdd618054db82c9cc data/miners_delight/recipes/sticky_basket.json
 48c884f3e226e98f0c7f9f76cdceb849c64b5b19 data/miners_delight/recipes/string_from_gossypium.json
 2de3c03184dd0990d3ec16e259e44ccb0381e152 data/miners_delight/recipes/weird_caviar.json
diff --git a/src/generated/resources/assets/miners_delight/lang/en_ud.json b/src/generated/resources/assets/miners_delight/lang/en_ud.json
@@ -3,6 +3,7 @@
   "block.miners_delight.cave_carrots": "s\u0287o\u0279\u0279\u0250\u0186 \u01DD\u028C\u0250\u0186",
   "block.miners_delight.copper_pot": "\u0287o\u0500 \u0279\u01DDddo\u0186",
   "block.miners_delight.gossypium": "\u026Fn\u0131d\u028Esso\u2141",
+  "block.miners_delight.sticky_basket": "\u0287\u01DD\u029Es\u0250\u15FA \u028E\u029E\u0254\u0131\u0287S",
   "block.miners_delight.stuffed_squid": "p\u0131nbS p\u01DD\u025F\u025Fn\u0287S",
   "block.miners_delight.wild_cave_carrots": "s\u0287o\u0279\u0279\u0250\u0186 \u01DD\u028C\u0250\u0186 p\u05DF\u0131M",
   "item.miners_delight.baked_cave_carrot": "\u0287o\u0279\u0279\u0250\u0186 \u01DD\u028C\u0250\u0186 p\u01DD\u029E\u0250\u15FA",

diff --git a/src/generated/resources/assets/miners_delight/lang/en_us.json b/src/generated/resources/assets/miners_delight/lang/en_us.json
@@ -3,6 +3,7 @@
   "block.miners_delight.cave_carrots": "Cave Carrots",
   "block.miners_delight.copper_pot": "Copper Pot",
   "block.miners_delight.gossypium": "Gossypium",
+  "block.miners_delight.sticky_basket": "Sticky Basket",
   "block.miners_delight.stuffed_squid": "Stuffed Squid",
   "block.miners_delight.wild_cave_carrots": "Wild Cave Carrots",
   "item.miners_delight.baked_cave_carrot": "Baked Cave Carrot",

diff --git a/src/generated/resources/assets/miners_delight/models/item/sticky_basket.json b/src/generated/resources/assets/miners_delight/models/item/sticky_basket.json
@@ -0,0 +1,3 @@
+{
+  "parent": "miners_delight:block/sticky_basket"
+}
diff --git a/src/generated/resources/data/forge/tags/items/milk.json b/src/generated/resources/data/forge/tags/items/milk.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "miners_delight:milk_cup"
+  ]
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "miners_delight:sticky_basket",
     "miners_delight:stuffed_squid",
     "miners_delight:cave_carrot_crate"
   ]

diff --git a/...ated/resources/data/miners_delight/advancements/recipes/miners_delight/sticky_basket.json b/...ated/resources/data/miners_delight/advancements/recipes/miners_delight/sticky_basket.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "miners_delight:sticky_basket"
+    ]
+  },
+  "criteria": {
+    "has_cobweb": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:cobweb"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "miners_delight:sticky_basket"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_cobweb",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/...elight/loot_tables/blocks/copper_pot.json → ...ght/loot_tables/blocks/sticky_basket.json b/...elight/loot_tables/blocks/copper_pot.json → ...ght/loot_tables/blocks/sticky_basket.json
@@ -7,7 +7,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "miners_delight:copper_pot"
+          "name": "miners_delight:sticky_basket"
         }
       ],
       "conditions": [

diff --git a/src/generated/resources/data/miners_delight/recipes/sticky_basket.json b/src/generated/resources/data/miners_delight/recipes/sticky_basket.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "X X",
+    "Y Y",
+    "XYX"
+  ],
+  "key": {
+    "X": {
+      "tag": "forge:rods/wooden"
+    },
+    "Y": {
+      "item": "minecraft:cobweb"
+    }
+  },
+  "result": {
+    "item": "miners_delight:sticky_basket"
+  }
+}
diff --git a/src/main/java/com/sammy/minersdelight/MinersDelightMod.java b/src/main/java/com/sammy/minersdelight/MinersDelightMod.java
@@ -1,21 +1,19 @@
 package com.sammy.minersdelight;
 
-import com.sammy.minersdelight.data.MDLangMerger;
-import com.sammy.minersdelight.data.MDRecipeProvider;
+import com.sammy.minersdelight.data.*;
 import com.sammy.minersdelight.setup.*;
-import com.tterrag.registrate.Registrate;
-import com.tterrag.registrate.util.nullness.NonNullSupplier;
-import net.minecraft.data.DataGenerator;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.tterrag.registrate.*;
+import com.tterrag.registrate.util.nullness.*;
+import net.minecraft.data.*;
+import net.minecraft.resources.*;
+import net.minecraftforge.common.*;
+import net.minecraftforge.eventbus.api.*;
+import net.minecraftforge.fml.common.*;
+import net.minecraftforge.fml.javafmlmod.*;
+import net.minecraftforge.forge.event.lifecycle.*;
+import org.apache.logging.log4j.*;
 
-import java.util.Random;
+import java.util.*;
 
 @Mod(MinersDelightMod.MODID)
 public class MinersDelightMod {
@@ -27,6 +25,7 @@ public class MinersDelightMod {
 	public static Registrate registrate(){
 		return REGISTRATE.get();
 	}
+
 	public MinersDelightMod() {
 		IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
 		IEventBus forgeBus = MinecraftForge.EVENT_BUS;
@@ -36,6 +35,7 @@ public MinersDelightMod() {
 		MDBlocks.register();
 		MDItems.register();
 		MDBlockEntities.register();
+		modBus.addListener(MDCauldronInteractions::addCauldronInteractions);
 		modBus.addListener(DataOnly::gatherData);
 	}
 

diff --git a/src/main/java/com/sammy/minersdelight/content/block/copper_pot/CopperPotBlock.java b/src/main/java/com/sammy/minersdelight/content/block/copper_pot/CopperPotBlock.java
@@ -1,72 +1,47 @@
 package com.sammy.minersdelight.content.block.copper_pot;
 
-import com.sammy.minersdelight.setup.MDBlockEntities;
-import net.minecraft.ChatFormatting;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.Containers;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
+import com.sammy.minersdelight.setup.*;
+import net.minecraft.*;
+import net.minecraft.core.*;
+import net.minecraft.nbt.*;
+import net.minecraft.network.chat.*;
+import net.minecraft.server.level.*;
+import net.minecraft.sounds.*;
+import net.minecraft.world.*;
+import net.minecraft.world.entity.*;
+import net.minecraft.world.entity.player.*;
+import net.minecraft.world.item.*;
+import net.minecraft.world.item.context.*;
+import net.minecraft.world.level.*;
 import net.minecraft.world.level.block.*;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityTicker;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.StateDefinition;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.minecraft.world.level.block.state.properties.DirectionProperty;
-import net.minecraft.world.level.block.state.properties.EnumProperty;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.level.material.Material;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.CollisionContext;
-import net.minecraft.world.phys.shapes.Shapes;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.items.ItemStackHandler;
-import net.minecraftforge.network.NetworkHooks;
-import vectorwing.farmersdelight.common.block.state.CookingPotSupport;
-import vectorwing.farmersdelight.common.registry.ModBlockEntityTypes;
-import vectorwing.farmersdelight.common.registry.ModSounds;
-import vectorwing.farmersdelight.common.tag.ModTags;
-import vectorwing.farmersdelight.common.utility.MathUtils;
-import vectorwing.farmersdelight.common.utility.TextUtils;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Random;
+import net.minecraft.world.level.block.entity.*;
+import net.minecraft.world.level.block.state.*;
+import net.minecraft.world.level.block.state.properties.*;
+import net.minecraft.world.level.material.*;
+import net.minecraft.world.phys.*;
+import net.minecraft.world.phys.shapes.*;
+import net.minecraftforge.api.distmarker.*;
+import net.minecraftforge.data.loading.*;
+import net.minecraftforge.network.*;
+import vectorwing.farmersdelight.common.block.state.*;
+import vectorwing.farmersdelight.common.registry.*;
+import vectorwing.farmersdelight.common.tag.*;
+import vectorwing.farmersdelight.common.utility.*;
+
+import javax.annotation.*;
+import java.util.*;
 
 @SuppressWarnings("deprecation")
 public class CopperPotBlock extends BaseEntityBlock implements SimpleWaterloggedBlock {
 	public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 	public static final EnumProperty<CookingPotSupport> SUPPORT = EnumProperty.create("support", CookingPotSupport.class);
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 
-	protected static final VoxelShape SHAPE = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 10.0D, 14.0D);
+	protected static final VoxelShape SHAPE = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 8.0D, 13.0D);
 	protected static final VoxelShape SHAPE_WITH_TRAY = Shapes.or(SHAPE, Block.box(0.0D, -1.0D, 0.0D, 16.0D, 0.0D, 16.0D));
 
-	public CopperPotBlock(BlockBehaviour.Properties pProperties) {
-		super(pProperties);
+	public CopperPotBlock(BlockBehaviour.Properties properties) {
+		super(DatagenModLoader.isRunningDataGen() ? properties.noDrops() : properties); //TODO: help);
 		this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(SUPPORT, CookingPotSupport.NONE).setValue(WATERLOGGED, false));
 	}
 

diff --git a/src/main/java/com/sammy/minersdelight/content/block/copper_pot/CopperPotBlockEntity.java b/src/main/java/com/sammy/minersdelight/content/block/copper_pot/CopperPotBlockEntity.java
@@ -1,7 +1,7 @@
 package com.sammy.minersdelight.content.block.copper_pot;
 
 import com.google.common.collect.Lists;
-import com.sammy.minersdelight.setup.CupConversionHandler;
+import com.sammy.minersdelight.logic.*;
 import com.sammy.minersdelight.setup.MDBlocks;
 import com.sammy.minersdelight.setup.MDItems;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -37,7 +37,6 @@
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.wrapper.RecipeWrapper;
 import vectorwing.farmersdelight.common.block.CookingPotBlock;
-import vectorwing.farmersdelight.common.block.entity.CookingPotBlockEntity;
 import vectorwing.farmersdelight.common.block.entity.HeatableBlockEntity;
 import vectorwing.farmersdelight.common.block.entity.SyncedBlockEntity;
 import vectorwing.farmersdelight.common.crafting.CookingPotRecipe;
@@ -299,8 +298,8 @@ private boolean hasInput() {
 	protected boolean canCook(CookingPotRecipe recipe) {
 		if (hasInput()) {
 			ItemStack resultStack = recipe.getResultItem();
-			if (CupConversionHandler.BOWL_TO_CUP.containsKey(resultStack.getItem())) {
-				ItemStack cupResultStack = new ItemStack(CupConversionHandler.BOWL_TO_CUP.get(resultStack.getItem()), resultStack.getCount());
+			if (CupConversionReloadListener.BOWL_TO_CUP.containsKey(resultStack.getItem())) {
+				ItemStack cupResultStack = new ItemStack(CupConversionReloadListener.BOWL_TO_CUP.get(resultStack.getItem()), resultStack.getCount());
 				cupResultStack.setTag(resultStack.getTag());
 				resultStack = cupResultStack;
 			}
@@ -334,10 +333,10 @@ private boolean processCooking(CookingPotRecipe recipe, CopperPotBlockEntity coo
 
 		cookTime = 0;
 		ItemStack resultStack = recipe.getResultItem();
-		boolean cupServed = CupConversionHandler.BOWL_TO_CUP.containsKey(resultStack.getItem());
+		boolean cupServed = CupConversionReloadListener.BOWL_TO_CUP.containsKey(resultStack.getItem());
 		mealContainerStack = cupServed ? MDItems.COPPER_CUP.asStack() : recipe.getOutputContainer();
 		if (cupServed) {
-			ItemStack cupResultStack = new ItemStack(CupConversionHandler.BOWL_TO_CUP.get(resultStack.getItem()), resultStack.getCount());
+			ItemStack cupResultStack = new ItemStack(CupConversionReloadListener.BOWL_TO_CUP.get(resultStack.getItem()), resultStack.getCount());
 			cupResultStack.setTag(resultStack.getTag());
 			resultStack = cupResultStack;
 		}

diff --git a/...n/java/com/sammy/minersdelight/content/block/copper_pot/CopperPotRecipeBookComponent.java b/...n/java/com/sammy/minersdelight/content/block/copper_pot/CopperPotRecipeBookComponent.java
@@ -1,6 +1,6 @@
 package com.sammy.minersdelight.content.block.copper_pot;
 
-import com.sammy.minersdelight.setup.CupConversionHandler;
+import com.sammy.minersdelight.logic.*;
 import com.sammy.minersdelight.setup.MDItems;
 import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
 import net.minecraft.network.chat.Component;
@@ -38,9 +38,9 @@ protected Component getRecipeFilterName() {
 	@Override
 	public void setupGhostRecipe(Recipe<?> recipe, List<Slot> slots) {
 		ItemStack resultStack = recipe.getResultItem();
-		boolean cupServed = CupConversionHandler.BOWL_TO_CUP.containsKey(resultStack.getItem());
+		boolean cupServed = CupConversionReloadListener.BOWL_TO_CUP.containsKey(resultStack.getItem());
 		if (cupServed) {
-			ItemStack cupResultStack = new ItemStack(CupConversionHandler.BOWL_TO_CUP.get(resultStack.getItem()), resultStack.getCount());
+			ItemStack cupResultStack = new ItemStack(CupConversionReloadListener.BOWL_TO_CUP.get(resultStack.getItem()), resultStack.getCount());
 			cupResultStack.setTag(resultStack.getTag());
 			resultStack = cupResultStack;
 		}