R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Lorenz Wrobel 2026-05-18 22:59:04 +02:00
parent 32856f8da7
commit 02bc8178d8
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/thedarkcolour/exdeorum/blockentity/AbstractSieveBlockEntity.java
View File

@ -26,7 +26,6 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.stats.Stats;
import net.minecraft.util.RandomSource;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.ItemInteractionResult;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
@ -37,10 +36,8 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.neoforged.neoforge.common.util.FakePlayer;
import org.jetbrains.annotations.Nullable;
import thedarkcolour.exdeorum.blockentity.logic.SieveLogic;
import thedarkcolour.exdeorum.config.EConfig;
import thedarkcolour.exdeorum.recipe.RecipeCaches;
import java.util.function.Function;

2
src/main/java/thedarkcolour/exdeorum/blockentity/LavaCrucibleBlockEntity.java
View File

@ -23,12 +23,10 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import thedarkcolour.exdeorum.recipe.RecipeUtil;
import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe;
import thedarkcolour.exdeorum.registry.EBlockEntities;
import javax.annotation.Nullable;
import java.util.Objects;
public class LavaCrucibleBlockEntity extends AbstractCrucibleBlockEntity {
public LavaCrucibleBlockEntity(BlockPos pos, BlockState state) {

1
src/main/java/thedarkcolour/exdeorum/blockentity/logic/SieveLogic.java
View File

@ -29,7 +29,6 @@ import net.minecraft.util.RandomSource;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.storage.loot.LootContext;
import thedarkcolour.exdeorum.config.EConfig;

7
src/main/java/thedarkcolour/exdeorum/compat/CompatUtil.java
View File

@ -24,14 +24,17 @@ import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.crafting.*;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeInput;
import net.minecraft.world.item.crafting.RecipeManager;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.item.enchantment.ItemEnchantments;
import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.Level;
import net.neoforged.fml.ModList;
import thedarkcolour.exdeorum.material.DefaultMaterials;
import thedarkcolour.exdeorum.material.MaterialRegistry;
import thedarkcolour.exdeorum.recipe.RecipeUtil;
import thedarkcolour.exdeorum.registry.EItems;
import java.util.ArrayList;

1
src/main/java/thedarkcolour/exdeorum/compat/XeiSieveRecipe.java
View File

@ -30,7 +30,6 @@ import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.minecraft.world.level.storage.loot.providers.number.NumberProvider;
import org.apache.commons.lang3.mutable.MutableInt;
import thedarkcolour.exdeorum.client.ClientsideCode;
import thedarkcolour.exdeorum.recipe.RecipeUtil;
import thedarkcolour.exdeorum.recipe.sieve.SieveRecipe;
import thedarkcolour.exdeorum.registry.EItems;

5
src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java
View File

@ -3,6 +3,7 @@ package thedarkcolour.exdeorum.loot;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
import net.neoforged.neoforge.common.loot.IGlobalLootModifier;
import net.neoforged.neoforge.common.loot.LootModifier;
@ -24,7 +25,7 @@ public class CompressedHammerLootModifier extends HammerLootModifier {
}
@Override
protected @Nullable HammerRecipe getRecipe(Item itemForm) {
return RecipeUtil.getServerRecipeCaches().getCompressedHammerRecipe(itemForm);
protected @Nullable HammerRecipe getRecipe(Item itemForm, LootContext context) {
return RecipeUtil.getCaches(context.getLevel()).getCompressedHammerRecipe(itemForm);
}
}

6
src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java
View File

@ -69,7 +69,7 @@ public class HammerLootModifier extends LootModifier {
return generatedLoot;
}
var recipe = getRecipe(itemForm);
var recipe = getRecipe(itemForm, context);
if (recipe == null) {
return generatedLoot;
}
@ -91,8 +91,8 @@ public class HammerLootModifier extends LootModifier {
}
@Nullable
protected HammerRecipe getRecipe(Item itemForm) {
return RecipeUtil.getServerRecipeCaches().getHammerRecipe(itemForm);
protected HammerRecipe getRecipe(Item itemForm, LootContext context) {
return RecipeUtil.getCaches(context.getLevel()).getHammerRecipe(itemForm);
}
@Override