From ebc6f1a8c69afa3cf2cf4531c0da8b98fbdf501a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 11 May 2016 19:27:15 -0500 Subject: [PATCH] Loonium now can be set to a custom loot table. For mapmakers --- .../subtile/functional/SubTileLoonuim.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 011d4b2c7..8b289be3f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.WorldServer; import net.minecraft.world.storage.loot.LootContext; @@ -21,12 +22,16 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; import java.util.Random; public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; private static final int RANGE = 3; + private static final String TAG_LOOT_TABLE = "lootTable"; + + private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon"); @Override public void onUpdate() { @@ -36,7 +41,10 @@ public class SubTileLoonuim extends SubTileFunctional { ItemStack stack; do { - stack = supertile.getWorld().getLootTableManager().getLootTableFromLocation(new ResourceLocation("minecraft", "chests/simple_dungeon")).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()).get(0); + List stacks = supertile.getWorld().getLootTableManager().getLootTableFromLocation(lootTable).generateLootForPools(rand, new LootContext.Builder(((WorldServer) supertile.getWorld())).build()); + if (stacks.isEmpty()) + return; + else stack = stacks.get(0); } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; @@ -77,4 +85,17 @@ public class SubTileLoonuim extends SubTileFunctional { return new RadiusDescriptor.Square(toBlockPos(), RANGE); } + @Override + public void readFromPacketNBT(NBTTagCompound cmp) { + super.readFromPacketNBT(cmp); + if (cmp.hasKey(TAG_LOOT_TABLE)) + lootTable = new ResourceLocation(cmp.getString(TAG_LOOT_TABLE)); + } + + @Override + public void writeToPacketNBT(NBTTagCompound cmp) { + super.writeToPacketNBT(cmp); + cmp.setString(TAG_LOOT_TABLE, lootTable.toString()); + } + }