Skip to content

Soft Touch & Fortuna Extract fix try 2 #2148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stellanera98 wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

Soft Touch & Fortuna Extract fix try 2 #2148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 18 additions & 35 deletions src/main/java/wayoftime/bloodmagic/loot/GlobalLootModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.loot.LootContext;
Expand Down Expand Up @@ -50,19 +51,6 @@ public class GlobalLootModifier
public static final RegistryObject<Codec<SmeltingModifier>> SMELT = GLM.register("smelt", SmeltingModifier.CODEC);
public static final RegistryObject<Codec<VoidingModifier>> VOID = GLM.register("voiding", VoidingModifier.CODEC);

private static LootParams.Builder copyBlockNoTool(LootContext context) {
LootParams.Builder builder = new LootParams.Builder(context.getLevel());
builder.withLuck(context.getLuck());
builder.withParameter(LootContextParams.BLOCK_STATE, context.getParam(LootContextParams.BLOCK_STATE));
builder.withParameter(LootContextParams.ORIGIN, context.getParam(LootContextParams.ORIGIN));

builder.withOptionalParameter(LootContextParams.THIS_ENTITY, context.getParamOrNull(LootContextParams.THIS_ENTITY));
builder.withOptionalParameter(LootContextParams.BLOCK_ENTITY, context.getParamOrNull(LootContextParams.BLOCK_ENTITY));
builder.withOptionalParameter(LootContextParams.EXPLOSION_RADIUS, context.getParamOrNull(LootContextParams.EXPLOSION_RADIUS));

return builder;
}

private static class SilkTouchTestModifier extends LootModifier
{
public static final Supplier<Codec<SilkTouchTestModifier>> CODEC = Suppliers.memoize(() -> RecordCodecBuilder.create(inst -> codecStart(inst).apply(inst, SilkTouchTestModifier::new)));
Expand All @@ -75,15 +63,13 @@ public SilkTouchTestModifier(LootItemCondition[] conditionsIn)
@Nonnull
@Override
protected @NotNull ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
BMLog.DEFAULT.info("doApply!");
ItemStack ctxTool = context.getParamOrNull(LootContextParams.TOOL);
if (ctxTool.is(BloodMagicTags.CHARGES)) {
return generatedLoot;
}
// return early if silk-touch is already applied (otherwise we'll get stuck in
// an infinite loop).
if (EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH)) {
BMLog.DEFAULT.info("silk touch present, returning data '{}'", generatedLoot.get(0).getOrCreateTag());
return generatedLoot;
}
AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool);
Expand All @@ -92,13 +78,18 @@ public SilkTouchTestModifier(LootItemCondition[] conditionsIn)
return generatedLoot;
}

BlockPos pos = BlockPos.containing(context.getParam(LootContextParams.ORIGIN));
BlockState state = context.getParam(LootContextParams.BLOCK_STATE);
BlockEntity tile = context.getParamOrNull(LootContextParams.BLOCK_ENTITY);

ItemStack fakeTool = ctxTool.copy();
fakeTool.enchant(Enchantments.SILK_TOUCH, 1);
LootParams.Builder builder = copyBlockNoTool(context);
builder.withParameter(LootContextParams.TOOL, fakeTool);
LootTable lootTable = context.getLevel().getServer().getLootData().getLootTable(context.getParam(LootContextParams.BLOCK_STATE).getBlock().getLootTable());
BMLog.DEFAULT.info("loot table I guess '{}'", lootTable.getLootTableId());
return lootTable.getRandomItems(builder.create(LootContextParamSets.EMPTY));

List<ItemStack> drops = Block.getDrops(state, context.getLevel(), pos, tile, null, fakeTool);
ObjectArrayList<ItemStack> returnList = new ObjectArrayList<>();
returnList.addAll(drops);

return returnList;
}

@Override
Expand Down Expand Up @@ -154,23 +145,15 @@ public FortuneModifier(LootItemCondition[] conditionsIn)
enchants.put(Enchantments.BLOCK_FORTUNE, baseFortuneLevel + additionalFortune);
EnchantmentHelper.setEnchantments(enchants, fakeTool);

// EnchantmentHelper.setEnchantmentLevel(p_182441_, p_182442_);
BlockPos pos = BlockPos.containing(context.getParam(LootContextParams.ORIGIN));
BlockState state = context.getParam(LootContextParams.BLOCK_STATE);
BlockEntity tile = context.getParamOrNull(LootContextParams.BLOCK_ENTITY);

LootParams.Builder builder = new LootParams.Builder(context.getLevel());
builder.withParameter(LootContextParams.TOOL, fakeTool);

Vec3 vec = context.getParam(LootContextParams.ORIGIN);
if (vec != null) {
BlockPos pos = BlockPos.containing(vec);
BlockEntity be = context.getLevel().getBlockEntity(pos);
if (be != null) {
builder.withParameter(LootContextParams.BLOCK_ENTITY, be);
}
}
List<ItemStack> drops = Block.getDrops(state, context.getLevel(), pos, tile, null, fakeTool);
ObjectArrayList<ItemStack> returnList = new ObjectArrayList<>();
returnList.addAll(drops);

LootParams ctx = builder.create(LootContextParamSets.EMPTY);
LootTable loottable = context.getLevel().getServer().getLootData().getLootTable(context.getParamOrNull(LootContextParams.BLOCK_STATE).getBlock().getLootTable());
return loottable.getRandomItems(ctx);
return returnList;
}

@Override
Expand Down