Bump forge, fix #3123 with global loot modifier

This commit is contained in:
Vincent Lee committed 2020-03-16 21:40:35 -05:00
1 parent f1ce9a2e7b
commit 160b0c9887
5 files changed
+69 -9

No files matched your search

@@ -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<GlobalLootModifierSerializer<?>> evt) {
evt.getRegistry().register(new Serializer().setRegistryName(prefix("dispose")));
}
@Nonnull
@Override
protected List<ItemStack> doApply(List<ItemStack> 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<DisposeModifier> {
@Override
public DisposeModifier read(ResourceLocation location, JsonObject object, ILootCondition[] conditions) {
return new DisposeModifier(conditions);
}
}
}
@@ -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<ItemStack> 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) {