From a7d79fa10a7dbb92a92a1dc68a3344d7561a568a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 23 Jul 2014 20:59:15 +0100 Subject: [PATCH] Added the Life Imbuer. --- .../client/core/proxy/ClientProxy.java | 6 + .../botania/client/lib/LibRenderIDs.java | 1 + .../botania/client/lib/LibResources.java | 1 + .../client/model/ModelSpawnerClaw.java | 84 ++++++++++ .../render/block/RenderSpawnerClaw.java | 51 ++++++ .../render/tile/RenderTileSpawnerClaw.java | 59 +++++++ .../common/block/BlockSpawnerClaw.java | 60 +++++++ .../botania/common/block/ModBlocks.java | 6 +- .../common/block/tile/TileSpawnerClaw.java | 155 ++++++++++++++++++ .../common/core/BotaniaCreativeTab.java | 5 +- .../botania/common/lib/LibBlockNames.java | 1 + .../botania/common/lib/LibObfuscation.java | 8 + resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/model/spawnerClaw.png | Bin 0 -> 4236 bytes 14 files changed, 435 insertions(+), 3 deletions(-) create mode 100644 MODSRC/vazkii/botania/client/model/ModelSpawnerClaw.java create mode 100644 MODSRC/vazkii/botania/client/render/block/RenderSpawnerClaw.java create mode 100644 MODSRC/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java create mode 100644 MODSRC/vazkii/botania/common/block/BlockSpawnerClaw.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileSpawnerClaw.java create mode 100644 resources/assets/botania/textures/model/spawnerClaw.png diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index b3477f963..d4daf8153 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -38,6 +38,7 @@ import vazkii.botania.client.render.block.RenderAltar; import vazkii.botania.client.render.block.RenderMiniIsland; import vazkii.botania.client.render.block.RenderPool; import vazkii.botania.client.render.block.RenderPylon; +import vazkii.botania.client.render.block.RenderSpawnerClaw; import vazkii.botania.client.render.block.RenderSpecialFlower; import vazkii.botania.client.render.block.RenderSpreader; import vazkii.botania.client.render.block.RenderTinyPotato; @@ -52,6 +53,7 @@ import vazkii.botania.client.render.tile.RenderTileMiniIsland; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.RenderTileRuneAltar; +import vazkii.botania.client.render.tile.RenderTileSpawnerClaw; import vazkii.botania.client.render.tile.RenderTileSpreader; import vazkii.botania.client.render.tile.RenderTileTinyPotato; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -60,6 +62,7 @@ import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileMiniIsland; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; +import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TileSpreader; @@ -103,6 +106,7 @@ public class ClientProxy extends CommonProxy { LibRenderIDs.idPylon = RenderingRegistry.getNextAvailableRenderId(); LibRenderIDs.idMiniIsland = RenderingRegistry.getNextAvailableRenderId(); LibRenderIDs.idTinyPotato = RenderingRegistry.getNextAvailableRenderId(); + LibRenderIDs.idSpawnerClaw = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new RenderAltar()); RenderingRegistry.registerBlockHandler(new RenderSpecialFlower(LibRenderIDs.idSpecialFlower)); @@ -111,6 +115,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new RenderPylon()); RenderingRegistry.registerBlockHandler(new RenderMiniIsland()); RenderingRegistry.registerBlockHandler(new RenderTinyPotato()); + RenderingRegistry.registerBlockHandler(new RenderSpawnerClaw()); MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); if(ConfigHandler.lexicon3dModel) @@ -125,6 +130,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileAlfPortal.class, new RenderTileAlfPortal()); ClientRegistry.bindTileEntitySpecialRenderer(TileMiniIsland.class, new RenderTileMiniIsland()); ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato()); + ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw()); RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(ModItems.vineBall)); diff --git a/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java b/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java index 0ed229acb..214b9d370 100644 --- a/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java +++ b/MODSRC/vazkii/botania/client/lib/LibRenderIDs.java @@ -20,5 +20,6 @@ public final class LibRenderIDs { public static int idPylon = -1; public static int idMiniIsland = -1; public static int idTinyPotato = -1; + public static int idSpawnerClaw = -1; } diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index d0c480c79..17f3b3143 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -79,6 +79,7 @@ public final class LibResources { public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; public static final String MODEL_MINI_ISLAND = PREFIX_MODEL + "miniIsland.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; + public static final String MODEL_SPAWNER_CLAW = PREFIX_MODEL + "spawnerClaw.png"; public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; diff --git a/MODSRC/vazkii/botania/client/model/ModelSpawnerClaw.java b/MODSRC/vazkii/botania/client/model/ModelSpawnerClaw.java new file mode 100644 index 000000000..2b09271d6 --- /dev/null +++ b/MODSRC/vazkii/botania/client/model/ModelSpawnerClaw.java @@ -0,0 +1,84 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 23, 2014, 5:46:38 PM (GMT)] + */ +package vazkii.botania.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelSpawnerClaw extends ModelBase { + ModelRenderer Plate; + ModelRenderer Claw1; + ModelRenderer Claw2; + ModelRenderer Claw3; + ModelRenderer Claw4; + ModelRenderer Claw5; + ModelRenderer Claw6; + ModelRenderer Claw7; + ModelRenderer Claw8; + + public ModelSpawnerClaw() { + textureWidth = 64; + textureHeight = 32; + + Plate = new ModelRenderer(this, 0, 0); + Plate.addBox(0F, 0F, 0F, 12, 1, 12); + Plate.setRotationPoint(-6F, 23F, -6F); + Plate.setTextureSize(64, 32); + Claw1 = new ModelRenderer(this, 0, 14); + Claw1.addBox(0F, 0F, 0F, 2, 1, 3); + Claw1.setRotationPoint(-1F, 23F, 6F); + Claw1.setTextureSize(64, 32); + Claw2 = new ModelRenderer(this, 11, 14); + Claw2.addBox(0F, 0F, 0F, 2, 1, 3); + Claw2.setRotationPoint(-1F, 23F, -9F); + Claw2.setTextureSize(64, 32); + Claw3 = new ModelRenderer(this, 0, 19); + Claw3.addBox(0F, 0F, 0F, 3, 1, 2); + Claw3.setRotationPoint(-9F, 23F, -1F); + Claw3.setTextureSize(64, 32); + Claw4 = new ModelRenderer(this, 11, 19); + Claw4.addBox(0F, 0F, 0F, 3, 1, 2); + Claw4.setRotationPoint(6F, 23F, -1F); + Claw4.setTextureSize(64, 32); + Claw5 = new ModelRenderer(this, 23, 16); + Claw5.addBox(0F, 0F, 0F, 2, 5, 1); + Claw5.setRotationPoint(-1F, 24F, 8F); + Claw5.setTextureSize(64, 32); + Claw6 = new ModelRenderer(this, 30, 16); + Claw6.addBox(0F, 0F, 0F, 1, 5, 2); + Claw6.setRotationPoint(8F, 24F, -1F); + Claw6.setTextureSize(64, 32); + Claw7 = new ModelRenderer(this, 37, 16); + Claw7.addBox(0F, 0F, 0F, 2, 5, 1); + Claw7.setRotationPoint(-1F, 24F, -9F); + Claw7.setTextureSize(64, 32); + Claw8 = new ModelRenderer(this, 44, 16); + Claw8.addBox(0F, 0F, 0F, 1, 5, 2); + Claw8.setRotationPoint(-9F, 24F, -1F); + Claw8.setTextureSize(64, 32); + } + + public void render() { + float f5 = 1F / 16F; + Plate.render(f5); + Claw1.render(f5); + Claw2.render(f5); + Claw3.render(f5); + Claw4.render(f5); + Claw5.render(f5); + Claw6.render(f5); + Claw7.render(f5); + Claw8.render(f5); + } + +} diff --git a/MODSRC/vazkii/botania/client/render/block/RenderSpawnerClaw.java b/MODSRC/vazkii/botania/client/render/block/RenderSpawnerClaw.java new file mode 100644 index 000000000..485bab76b --- /dev/null +++ b/MODSRC/vazkii/botania/client/render/block/RenderSpawnerClaw.java @@ -0,0 +1,51 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 23, 2014, 6:23:54 PM (GMT)] + */ +package vazkii.botania.client.render.block; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.common.block.tile.TileSpawnerClaw; +import vazkii.botania.common.block.tile.TileTinyPotato; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + +public class RenderSpawnerClaw implements ISimpleBlockRenderingHandler { + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + GL11.glPushMatrix(); + GL11.glTranslatef(-0.5F, 0F, -0.5F); + TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileSpawnerClaw(), 0.0D, 0.0D, 0.0D, 0.0F); + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + return false; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return LibRenderIDs.idSpawnerClaw; + } + +} diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java new file mode 100644 index 000000000..983e925f6 --- /dev/null +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java @@ -0,0 +1,59 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 23, 2014, 5:46:10 PM (GMT)] + */ +package vazkii.botania.client.render.tile; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.ModelSpawnerClaw; +import vazkii.botania.client.model.ModelTinyPotato; +import vazkii.botania.common.block.tile.TileTinyPotato; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class RenderTileSpawnerClaw extends TileEntitySpecialRenderer { + + private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPAWNER_CLAW); + private static final ModelSpawnerClaw model = new ModelSpawnerClaw(); + + @Override + public void renderTileEntityAt(TileEntity var1, double d0, double d1, double d2, float var8) { +// TileTinyPotato potato = (TileTinyPotato) var1; + GL11.glPushMatrix(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glTranslated(d0, d1, d2); + + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + + GL11.glTranslatef(0.5F, 1.5F, 0.5F); + GL11.glScalef(1F, -1F, -1F); +// int meta = potato.getWorldObj() == null ? 3 : potato.getBlockMetadata(); +// GL11.glRotatef(meta * 90F - 180F, 0F, 1F, 0F); +// +// int jump = potato.jumpTicks; +// float up = (float) -Math.abs(Math.sin((float) jump / 10 * Math.PI)) * 0.2F; +// float rot = (float) Math.sin((float) jump / 10 * Math.PI) * 2; +// +// GL11.glTranslatef(0F, up, 0F); +// GL11.glRotatef(rot, 0F, 0F, 1F); + + model.render(); + GL11.glColor3f(1F, 1F, 1F); + GL11.glScalef(1F, -1F, -1F); + GL11.glPopMatrix(); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/BlockSpawnerClaw.java b/MODSRC/vazkii/botania/common/block/BlockSpawnerClaw.java new file mode 100644 index 000000000..64e848a70 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockSpawnerClaw.java @@ -0,0 +1,60 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 23, 2014, 5:28:55 PM (GMT)] + */ +package vazkii.botania.common.block; + +import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.tile.TileSpawnerClaw; +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class BlockSpawnerClaw extends BlockModContainer { + + protected BlockSpawnerClaw() { + super(Material.iron); + setHardness(3.0F); + setBlockName(LibBlockNames.SPAWNER_CLAW); + + float f = 1F / 8F; + float f1 = 1F / 16F; + setBlockBounds(f, 0F, f, 1F - f, f1, 1F - f); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + //NO-OP + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getRenderType() { + return LibRenderIDs.idSpawnerClaw; + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileSpawnerClaw(); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 5ee420fec..7499ed676 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -88,6 +88,7 @@ import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; +import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.block.tile.TileTinyPotato; @@ -140,6 +141,7 @@ public final class ModBlocks { public static Block seaLamp; public static Block miniIsland; public static Block tinyPotato; + public static Block spawnerClaw; public static Block livingwoodStairs; public static Block livingwoodSlab; @@ -231,7 +233,8 @@ public final class ModBlocks { seaLamp = new BlockSeaLamp(); miniIsland = new BlockMiniIsland(); tinyPotato = new BlockTinyPotato(); - + spawnerClaw = new BlockSpawnerClaw(); + livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); livingwoodSlabFull = new BlockLivingwoodSlab(true); @@ -369,6 +372,7 @@ public final class ModBlocks { registerTile(TileBifrost.class, LibBlockNames.BIFROST); registerTile(TileMiniIsland.class, LibBlockNames.MINI_ISLAND); registerTile(TileTinyPotato.class, LibBlockNames.TINY_POTATO); + registerTile(TileSpawnerClaw.class, LibBlockNames.SPAWNER_CLAW); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/MODSRC/vazkii/botania/common/block/tile/TileSpawnerClaw.java new file mode 100644 index 000000000..b2f7c2a7c --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -0,0 +1,155 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jul 23, 2014, 5:32:11 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import java.awt.Color; +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.MobSpawnerBaseLogic; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityMobSpawner; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.WeightedRandom; +import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.relauncher.ReflectionHelper; + +public class TileSpawnerClaw extends TileMod implements IManaReceiver { + + private static final String TAG_MANA = "mana"; + + int mana = 0; + + @Override + public void updateEntity() { + TileEntity tileBelow = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); + if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { + TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; + MobSpawnerBaseLogic logic = spawner.func_145881_a(); + + if(!logic.isActivated()) { + if(!worldObj.isRemote) + mana -= 6; + + if(logic.getSpawnerWorld().isRemote) { + if(logic.spawnDelay > 0) + --logic.spawnDelay; + + if(Math.random() > 0.5) + Botania.proxy.wispFX(worldObj, xCoord + 0.3 + Math.random() * 0.5, yCoord - 0.3 + Math.random() * 0.25, zCoord + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); + + logic.field_98284_d = logic.field_98287_c; + logic.field_98287_c = (logic.field_98287_c + (double)(1000.0F / ((float)logic.spawnDelay + 200.0F))) % 360.0D; + } else if(logic.spawnDelay == -1) + resetTimer(logic); + + if(logic.spawnDelay > 0) { + --logic.spawnDelay; + return; + } + + boolean flag = false; + + int spawnCount = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_COUNT); + int spawnRange = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.SPAWN_RANGE); + int maxNearbyEntities = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_NEARBY_ENTITIES); + + for(int i = 0; i < spawnCount; ++i) { + Entity entity = EntityList.createEntityByName(logic.getEntityNameToSpawn(), logic.getSpawnerWorld()); + + if (entity == null) + return; + + int j = logic.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox((double)logic.getSpawnerX(), (double)logic.getSpawnerY(), (double)logic.getSpawnerZ(), (double)(logic.getSpawnerX() + 1), (double)(logic.getSpawnerY() + 1), (double)(logic.getSpawnerZ() + 1)).expand(spawnRange * 2, 4.0D, spawnRange * 2)).size(); + + if (j >= maxNearbyEntities) { + resetTimer(logic); + return; + } + + double d2 = (double)logic.getSpawnerX() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + double d3 = (double)(logic.getSpawnerY() + logic.getSpawnerWorld().rand.nextInt(3) - 1); + double d4 = (double)logic.getSpawnerZ() + (logic.getSpawnerWorld().rand.nextDouble() - logic.getSpawnerWorld().rand.nextDouble()) * spawnRange; + EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; + entity.setLocationAndAngles(d2, d3, d4, logic.getSpawnerWorld().rand.nextFloat() * 360.0F, 0.0F); + + if(entityliving == null || entityliving.getCanSpawnHere()) { + logic.func_98265_a(entity); + logic.getSpawnerWorld().playAuxSFX(2004, logic.getSpawnerX(), logic.getSpawnerY(), logic.getSpawnerZ(), 0); + + if (entityliving != null) + entityliving.spawnExplosionParticle(); + + flag = true; + } + } + + if (flag) + resetTimer(logic); + } + } + } + + private void resetTimer(MobSpawnerBaseLogic logic) { + int maxSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_SPAWN_DELAY); + int minSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MIN_SPAWN_DELAY); + List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); + + if(maxSpawnDelay <= minSpawnDelay) + logic.spawnDelay = minSpawnDelay; + else { + int i = maxSpawnDelay - minSpawnDelay; + logic.spawnDelay = minSpawnDelay + logic.getSpawnerWorld().rand.nextInt(i); + } + + if(potentialEntitySpawns != null && potentialEntitySpawns.size() > 0) + logic.setRandomEntity((MobSpawnerBaseLogic.WeightedRandomMinecart)WeightedRandom.getRandomItem(logic.getSpawnerWorld().rand, potentialEntitySpawns)); + + logic.func_98267_a(1); + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + cmp.setInteger(TAG_MANA, mana); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + mana = cmp.getInteger(TAG_MANA); + } + + @Override + public int getCurrentMana() { + return mana; + } + + @Override + public boolean isFull() { + return mana >= 160; + } + + @Override + public void recieveMana(int mana) { + this.mana = Math.min(160, this.mana + mana); + } + + @Override + public boolean canRecieveManaFromBursts() { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 5ed08ec95..0ff3fe841 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -68,7 +68,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.grassHorn); addItem(ModItems.waterRod); addItem(ModItems.openBucket); - addItem(ModItems.spawnerMover); addItem(ModItems.rainbowRod); addItem(ModItems.tornadoRod); addItem(ModItems.fireRod); @@ -77,7 +76,9 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.vineBall); addBlock(ModBlocks.forestDrum); addBlock(ModBlocks.forestEye); - + addItem(ModItems.spawnerMover); + addBlock(ModBlocks.spawnerClaw); + addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); addBlock(ModBlocks.openCrate); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 6088830fa..4d9fcb75c 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -49,6 +49,7 @@ public final class LibBlockNames { public static final String SEA_LAMP = "seaLamp"; public static final String MINI_ISLAND = "miniIsland"; public static final String TINY_POTATO = "tinyPotato"; + public static final String SPAWNER_CLAW = "spawnerClaw"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java index 10d085899..88f150ace 100644 --- a/MODSRC/vazkii/botania/common/lib/LibObfuscation.java +++ b/MODSRC/vazkii/botania/common/lib/LibObfuscation.java @@ -55,5 +55,13 @@ public final class LibObfuscation { public static final String[] NET_CLIENT_HANDLER = new String[] { "netClientHandler", "field_78774_b", "b" }; public static final String[] CURRENT_GAME_TYPE = new String[] { "currentGameType", "field_78779_k", "k" }; + // MobSpawnerBaseLogic + public static final String[] SPAWN_RANGE = new String[] { "spawnRange", "field_98290_m", "m" }; + public static final String[] SPAWN_COUNT = new String[] { "spawnCount", "field_98294_i", "i" }; + public static final String[] MAX_NEARBY_ENTITIES = new String[] { "maxNearbyEntities", "field_98292_k", "k" }; + public static final String[] MAX_SPAWN_DELAY = new String[] { "maxSpawnDelay", "field_98293_h", "h" }; + public static final String[] MIN_SPAWN_DELAY = new String[] { "minSpawnDelay", "field_98283_g", "g" }; + public static final String[] POTENTIAL_ENTITY_SPAWNS = new String[] { "potentialEntitySpawns", "field_98285_e", "e" }; + } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 8015add67..fffbe39f2 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -352,6 +352,7 @@ tile.botania:miniIsland13.name=Floating Green Flower tile.botania:miniIsland14.name=Floating Red Flower tile.botania:miniIsland15.name=Floating Black Flower tile.botania:tinyPotato.name=Tiny Potato +tile.botania:spawnerClaw.name=Life Imbuer # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/model/spawnerClaw.png b/resources/assets/botania/textures/model/spawnerClaw.png new file mode 100644 index 0000000000000000000000000000000000000000..44dd720e583d01f7a4226b48fd6ea385b196af1c GIT binary patch literal 4236 zcmV;75OeQ|P)pPPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000HINklprj2&5R%YJJT!H-DJ628b?kL~ z=g-H(X2x#gfZV9AQ+Zx?ckYg6zq98%=gcS(VKHOV@NVg%or`*wi|P_>)-a@dQA#l; z<20nnTGK(*6*SZg4QT?9Wf@8-L+)bDqbmtQVL_t^#Q;d+NiOXL%R+zJvGHW#}3k&wGmX{{^Q^0{^76E zQLS?K-}W=SEF;TW1k_ril)_rO`~j#*H^02&5c{6o&j}f$ zDyz7s>+_Ul$wQOB;7c!li_L0)M?UZXpZfDxXy_(cmLZ`<@gM;dsRfKNi6L6+<*xzy z@(-2}Kq*XaD9e)R>6Y4~6mq$^Na?8dN~u)1h)@&-B7$@7ZPNg?*iA=9KPV$oD=P1qg$`$8v|dUtFx1@pFGGZ>P&zb@|<7#`UpU9>YH(=?<>r)p18xUMFc@KaPn zg&wnpaW~1dE>qDWlKkF#pFYpGz_Twrzq9}hY`#rm42}Jn=lK-@##-C5v&%m^gpj@; zDek>b#YT(s-Y0r%trPX*oVE6f5ER)lUohuuNz4((7+(IzQMIHDc&Clm1);$$J0;Rn zYt7h+XRnIx(AM`$S(eG)m)gGG5*KjJB}@8$C$sq}?s{gCd1FygnPY!nZHP#+xCq=r zqkr^$;=Si=@8hZMc&2wQT953Ide385%ttnkb^mTr>lO{bhE3ZfhLk8;MN#0rr#7-f zqD76Jcs2=UQ4~qcoO2jsQlVLvrFMvO0JZUtC+zCXwaY?G>l@xKkzM`gKM^lXo?w-p2d(9wWM!&yUf2p@!pf?Ij4^wQ5!aG6Q$;& zb#$Q9$B(FMYJtAt?GnK#iUNSy+1UkyNo{0@7-P~!Mx|0Agm8suzFXZ$hqR+F|6?u$ zrm{-_R4c2oxMYoao@1nCjW=-v9kfx&3hZo2$Q8{n3&1K}!6~0?TSTtu7@Yu!zO0m@ zEK7_rN#qt1z_Kh;zK_2A#_=Aro}RLus%k@P&7_~% zHrCLNXrZYr=lw+hZuU2{+Ep|n0UJD*w0rXa)JAs5d?C|Xr<gGq>69a|>_$Os~4;b=OrAT&T#ma@|T4zQ+526#!NMSOH)K ifE55%0C?w&{|*4