diff --git a/build.gradle b/build.gradle index dcd6cf6c7..e97865e10 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ repositories { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-31.1.12" + minecraft "net.minecraftforge:forge:${mc_version}-31.1.24" compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-28.142") { transitive = false } compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.2:api") diff --git a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java new file mode 100644 index 000000000..53529e8c7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java @@ -0,0 +1,51 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonObject; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.LootParameters; +import net.minecraft.world.storage.loot.conditions.ILootCondition; +import net.minecraftforge.common.loot.GlobalLootModifierSerializer; +import net.minecraftforge.common.loot.LootModifier; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumPick; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.List; + +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class DisposeModifier extends LootModifier { + protected DisposeModifier(ILootCondition[] conditions) { + super(conditions); + } + + @SubscribeEvent + public static void register(RegistryEvent.Register> evt) { + evt.getRegistry().register(new Serializer().setRegistryName(prefix("dispose"))); + } + + @Nonnull + @Override + protected List doApply(List generatedLoot, LootContext context) { + Entity e = context.get(LootParameters.THIS_ENTITY); + ItemStack tool = context.get(LootParameters.TOOL); + if (e != null && tool != null && !tool.isEmpty()) { + ItemElementiumPick.filterDisposable(generatedLoot, e, tool); + } + return generatedLoot; + } + + public static class Serializer extends GlobalLootModifierSerializer { + @Override + public DisposeModifier read(ResourceLocation location, JsonObject object, ILootCondition[] conditions) { + return new DisposeModifier(conditions); + } + } +} diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index bc46f44c6..f82c34d48 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -9,6 +9,7 @@ package vazkii.botania.common.item.equipment.tool.elementium; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; @@ -19,21 +20,19 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.ModTags; +import java.util.List; + public class ItemElementiumPick extends ItemManasteelPick { public ItemElementiumPick(Properties props) { super(BotaniaAPI.ELEMENTIUM_ITEM_TIER, props, -2.8F); - MinecraftForge.EVENT_BUS.addListener(this::onHarvestDrops); } - private void onHarvestDrops(HarvestDropsEvent event) { - if (event.getHarvester() != null) { - ItemStack stack = event.getHarvester().getHeldItemMainhand(); - if (!stack.isEmpty() && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { - event.getDrops().removeIf(s -> !s.isEmpty() && (isDisposable(s) - || isSemiDisposable(s) && !event.getHarvester().isSneaking())); + public static void filterDisposable(List drops, Entity e, ItemStack stack) { + if (!stack.isEmpty() && (stack.getItem() == ModItems.elementiumPick + || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { + drops.removeIf(s -> !s.isEmpty() && (isDisposable(s) || isSemiDisposable(s) && !e.isSneaking())); } - } } public static boolean isDisposable(Block block) { diff --git a/src/main/resources/data/botania/loot_modifiers/dispose.json b/src/main/resources/data/botania/loot_modifiers/dispose.json new file mode 100644 index 000000000..7bfd8d131 --- /dev/null +++ b/src/main/resources/data/botania/loot_modifiers/dispose.json @@ -0,0 +1,4 @@ +{ + "conditions": [], + "function": "botania:dispose" +} diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 000000000..731be80df --- /dev/null +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "entries": [ + "botania:dispose" + ] +}