diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index a18c7dd8e..8f9a73795 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -365,9 +365,9 @@ public class ClientProxy extends CommonProxy { public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { Minecraft mc = Minecraft.getMinecraft(); if(record == null) - world.playAuxSFXAtEntity(null, 1005, pos, 0); + world.playAuxSFXAtEntity(null, 1010, pos, 0); else { - world.playAuxSFXAtEntity(null, 1005, pos, Item.getIdFromItem(record)); + world.playAuxSFXAtEntity(null, 1010, pos, Item.getIdFromItem(record)); mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal()); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java new file mode 100644 index 000000000..b1c10835d --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -0,0 +1,46 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.LootCondition; +import net.minecraft.world.storage.loot.functions.LootFunction; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.relic.ItemRelic; +import vazkii.botania.common.lib.LibMisc; + +import java.util.Random; + +public class BindUuid extends LootFunction { + + protected BindUuid(LootCondition[] conditionsIn) { + super(conditionsIn); + } + + @Override + public ItemStack apply(ItemStack stack, Random rand, LootContext context) { + if (context.getKillerPlayer() != null) { + ((ItemRelic) ModItems.dice).bindToUUID(context.getKillerPlayer().getUniqueID(), stack); + } + + return stack; + } + + public static class Serializer extends LootFunction.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "bind_uuid"), BindUuid.class); + } + + @Override + public void serialize(JsonObject object, BindUuid functionClazz, JsonSerializationContext serializationContext) {} + + @Override + public BindUuid deserialize(JsonObject object, JsonDeserializationContext deserializationContext, LootCondition[] conditionsIn) { + return new BindUuid(conditionsIn); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java new file mode 100644 index 000000000..590465737 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -0,0 +1,35 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.LootCondition; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; + +import java.util.Random; + +public class EnableRelics implements LootCondition { + + @Override + public boolean testCondition(Random rand, LootContext context) { + return ConfigHandler.relicsEnabled; + } + + public static class Serializer extends LootCondition.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "enable_relics"), EnableRelics.class); + } + + @Override + public void serialize(JsonObject json, EnableRelics value, JsonSerializationContext context) {} + + @Override + public EnableRelics deserialize(JsonObject json, JsonDeserializationContext context) { + return new EnableRelics(); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java new file mode 100644 index 000000000..b7ad5a5ba --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -0,0 +1,21 @@ +package vazkii.botania.common.core.loot; + +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootTableList; +import net.minecraft.world.storage.loot.conditions.LootConditionManager; +import net.minecraft.world.storage.loot.functions.LootFunctionManager; +import vazkii.botania.common.lib.LibMisc; + +public final class LootHandler { + + public static void init() { + LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian")); + LootTableList.register(new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_2")); + LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); + LootConditionManager.registerCondition(new EnableRelics.Serializer()); + LootFunctionManager.registerFunction(new BindUuid.Serializer()); + } + + private LootHandler() {} + +} diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java new file mode 100644 index 000000000..91bd2f138 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -0,0 +1,36 @@ +package vazkii.botania.common.core.loot; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.LootCondition; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.lib.LibMisc; + +import java.util.Random; + +public class TrueGuardianKiller implements LootCondition { + + @Override + public boolean testCondition(Random rand, LootContext context) { + return context.getLootedEntity() instanceof EntityDoppleganger + && context.getKillerPlayer() == ((EntityDoppleganger) context.getLootedEntity()).trueKiller; + } + + public static class Serializer extends LootCondition.Serializer { + protected Serializer() { + super(new ResourceLocation(LibMisc.MOD_ID, "true_guardian_killer"), TrueGuardianKiller.class); + } + + @Override + public void serialize(JsonObject json, TrueGuardianKiller value, JsonSerializationContext context) {} + + @Override + public TrueGuardianKiller deserialize(JsonObject json, JsonDeserializationContext context) { + return new TrueGuardianKiller(); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f46b8c7d0..504e34340 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -59,6 +59,7 @@ import vazkii.botania.common.core.handler.ChestGenHandler; import vazkii.botania.common.core.handler.CommonTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; +import vazkii.botania.common.core.loot.LootHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.handler.PixieHandler; @@ -112,6 +113,7 @@ public class CommonProxy { ModBanners.init(); ChestGenHandler.init(); + LootHandler.init(); if(Botania.gardenOfGlassLoaded) new WorldTypeSkyblock(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 39139745d..bf7e0cd4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -15,6 +15,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; @@ -58,6 +59,9 @@ import net.minecraft.world.BossInfo; import net.minecraft.world.BossInfoServer; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -79,12 +83,14 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; +import vazkii.botania.common.lib.LibMisc; import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Random; import java.util.UUID; import java.util.regex.Pattern; @@ -134,6 +140,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi private boolean anyWithArmor = false; private List playersWhoAttacked = new ArrayList<>(); + public EntityPlayer trueKiller = null; private static boolean isPlayingMusic = false; @@ -452,54 +459,39 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } @Override - protected void dropFewItems(boolean par1, int par2) { - if(par1) { - for(int pl = 0; pl < playersWhoAttacked.size(); pl++) { - boolean hard = isHardMode(); - entityDropItem(new ItemStack(ModItems.manaResource, pl == 0 ? hard ? 16 : 8 : hard ? 10 : 6, 5), 1F); - boolean droppedRecord = false; + public ResourceLocation getLootTable() { + return new ResourceLocation(LibMisc.MOD_ID, isHardMode() ? "gaia_guardian_2" : "gaia_guardian"); + } - if(hard) { - entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); - if(ConfigHandler.relicsEnabled) { - ItemStack dice = new ItemStack(ModItems.dice); - ((ItemRelic) ModItems.dice).bindToUUID(playersWhoAttacked.get(pl), dice); - entityDropItem(dice, 1F); - } - - if(Math.random() < 0.25) - entityDropItem(new ItemStack(ModItems.overgrowthSeed, rand.nextInt(3) + 1), 1F); - if(Math.random() < 0.5) { - boolean voidLotus = Math.random() < 0.3F; - entityDropItem(new ItemStack(ModItems.blackLotus, voidLotus ? 1 : rand.nextInt(3) + 1, voidLotus ? 1 : 0), 1F); - } - if(Math.random() < 0.9) - entityDropItem(new ItemStack(ModItems.manaResource, 16 + rand.nextInt(12)), 1F); - if(Math.random() < 0.7) - entityDropItem(new ItemStack(ModItems.manaResource, 8 + rand.nextInt(6), 1), 1F); - if(Math.random() < 0.5) - entityDropItem(new ItemStack(ModItems.manaResource, 4 + rand.nextInt(3), 2), 1F); - - int runes = rand.nextInt(6) + 1; - for(int i = 0; i < runes; i++) - if(Math.random() < 0.3) - entityDropItem(new ItemStack(ModItems.rune, 2 + rand.nextInt(3), rand.nextInt(16)), 1F); - - if(Math.random() < 0.2) - entityDropItem(new ItemStack(ModItems.pinkinator), 1F); - if(Math.random() < 0.3) { - int i = Item.getIdFromItem(Items.record_13); - int j = Item.getIdFromItem(Items.record_wait); - int k = i + rand.nextInt(j - i + 1); - entityDropItem(new ItemStack(Item.getItemById(k)), 1F); - droppedRecord = true; - } - } - - if(!droppedRecord && Math.random() < 0.2) - entityDropItem(new ItemStack(hard ? ModItems.recordGaia2 : ModItems.recordGaia1), 1F); - } + @Override + protected void dropLoot(boolean wasRecentlyHit, int lootingModifier, DamageSource source) + { + // Save true killer, they get extra loot + if ("player".equals(source.getDamageType()) + && source.getEntity() instanceof EntityPlayer) { + this.trueKiller = ((EntityPlayer) source.getEntity()); } + + // Drop equipment and clear it so multiple calls to super don't do it again + super.dropEquipment(wasRecentlyHit, lootingModifier); + + for (EntityEquipmentSlot e : EntityEquipmentSlot.values()) { + this.setItemStackToSlot(e, null); + } + + // Generate loot table for every single attacking player + for (UUID u : playersWhoAttacked) { + EntityPlayer player = worldObj.getPlayerEntityByUUID(u); + if (player == null) + continue; + + EntityPlayer saveLastAttacker = this.attackingPlayer; + attackingPlayer = player; + super.dropLoot(wasRecentlyHit, lootingModifier, DamageSource.causePlayerDamage(player)); + attackingPlayer = saveLastAttacker; + } + + trueKiller = null; } @Override diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian.json new file mode 100644 index 000000000..e71ed2c84 --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian.json @@ -0,0 +1,31 @@ +{ + "pools": [ + { + "__comment": "Life essence", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 5 }, + { "function": "set_count", "count": 6 }, + { + "function": "set_count", + "count": 8, + "conditions": [{ "condition": "botania:true_guardian_killer" }] + } + ] + }] + }, + { + "__comment": "Music disc", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.2 } + ], + "rolls": 1, + "entries": [{ "type": "item", "name": "botania:recordGaia1" }] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json new file mode 100644 index 000000000..d0ce27d4a --- /dev/null +++ b/src/main/resources/assets/botania/loot_tables/gaia_guardian_2.json @@ -0,0 +1,179 @@ +{ + "pools": [ + { + "__comment": "Life essence", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 5 }, + { "function": "set_count", "count": 10 }, + { + "function": "set_count", + "count": 16, + "conditions": [{ "condition": "botania:true_guardian_killer" }] + } + ] + }] + }, + { + "__comment": "Black Lotuses", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "botania:blackLotus", + "weight": 15, + "quality": 5, + "functions": [ + { "function": "set_count", "count": 1 }, + { "function": "set_data", "data": 1 } + ] + }, + { + "type": "item", + "name": "botania:blackLotus", + "weight": 35, + "functions": [ + { "function": "set_count", "count": { "min": 1, "max": 3 } }, + { "function": "set_data", "data": 0 } + ] + }, + { "type": "empty", "weight": 50 } + ] + }, + { + "__comment": "Ancient wills", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:ancientWill", + "functions": [{ "function": "set_data", "data": { "min": 0, "max": 5 } }] + }] + }, + { + "__comment": "Overgrowth seeds", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.25 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:overgrowthSeed", + "functions": [{ "function": "set_count", "count": { "min": 1, "max": 3 } }] + }] + }, + { + "__comment": "Manasteel", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.9 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [{ "function": "set_count", "count": { "min": 16, "max": 27 } }] + }] + }, + { + "__comment": "Mana pearl", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.7 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 1 }, + { "function": "set_count", "count": { "min": 8, "max": 13 } } + ] + }] + }, + { + "__comment": "Mana diamond", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.5 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:manaResource", + "functions": [ + { "function": "set_data", "data": 2 }, + { "function": "set_count", "count": { "min": 4, "max": 6 } } + ] + }] + }, + { + "__comment": "Runes", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": { "min": 1, "max": 6 }, + "entries": [{ + "conditions": [{ "condition": "random_chance", "chance": 0.3 }], + "type": "item", + "name": "botania:rune", + "functions": [ + { "function": "set_data", "data": { "min": 0, "max": 15 } }, + { "function": "set_count", "count": { "min": 2, "max": 4 } } + ] + }] + }, + { + "__comment": "Pinkinator", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "random_chance", "chance": 0.2 } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:pinkinator" + }] + }, + { + "__comment": "Music discs", + "conditions": [{ "condition": "killed_by_player" }], + "rolls": 1, + "entries": [ + { + "weight": 14, + "type": "item", + "name": "botania:recordGaia2" + }, + { + "weight": 15, + "type": "item", + "name": "minecraft:record_13" + }, + { + "weight": 15, + "type": "item", + "name": "minecraft:record_wait" + }, + { "type": "empty", "weight": 56 } + ] + }, + { + "__comment": "Relics", + "conditions": [ + { "condition": "killed_by_player" }, + { "condition": "botania:enable_relics" } + ], + "rolls": 1, + "entries": [{ + "type": "item", + "name": "botania:dice", + "functions": [{ "function": "botania:bind_uuid" }] + }] + } + ] +} \ No newline at end of file