From 64006a8115e9f23bb922b5e3a48de05ad7bb7968 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 28 Aug 2015 19:26:02 +0100 Subject: [PATCH] Manatide Bellows. Are you stoked yet? --- .../client/core/proxy/ClientProxy.java | 9 +- .../botania/client/lib/LibRenderIDs.java | 1 + .../botania/client/lib/LibResources.java | 1 + .../botania/client/model/ModelBellows.java | 94 ++++++++++++ .../client/render/block/RenderBellows.java | 51 +++++++ .../client/render/tile/RenderTileBellows.java | 57 +++++++ .../botania/common/block/ModBlocks.java | 5 + .../common/block/mana/BlockBellows.java | 86 +++++++++++ .../subtile/functional/SubTileExoflame.java | 2 +- .../common/block/tile/mana/TileBellows.java | 139 ++++++++++++++++++ .../common/block/tile/mana/TilePool.java | 33 ++++- .../common/block/tile/mana/TilePump.java | 4 +- .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/lib/LibBlockNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 1 + src/main/resources/assets/botania/sounds.json | 1 + .../assets/botania/sounds/bellows.ogg | Bin 0 -> 13438 bytes .../assets/botania/textures/model/bellows.png | Bin 0 -> 16250 bytes 18 files changed, 479 insertions(+), 7 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/model/ModelBellows.java create mode 100644 src/main/java/vazkii/botania/client/render/block/RenderBellows.java create mode 100644 src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java create mode 100644 src/main/java/vazkii/botania/common/block/mana/BlockBellows.java create mode 100644 src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java create mode 100644 src/main/resources/assets/botania/sounds/bellows.ogg create mode 100644 src/main/resources/assets/botania/textures/model/bellows.png 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 27cb7abd1..110ceb8bd 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -60,6 +60,7 @@ import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.integration.nei.NEIGuiHooks; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.block.RenderAltar; +import vazkii.botania.client.render.block.RenderBellows; import vazkii.botania.client.render.block.RenderBrewery; import vazkii.botania.client.render.block.RenderCocoon; import vazkii.botania.client.render.block.RenderCorporeaCrystalCube; @@ -91,6 +92,7 @@ import vazkii.botania.client.render.item.RenderLexicon; import vazkii.botania.client.render.item.RenderTransparentItem; import vazkii.botania.client.render.tile.RenderTileAlfPortal; import vazkii.botania.client.render.tile.RenderTileAltar; +import vazkii.botania.client.render.tile.RenderTileBellows; import vazkii.botania.client.render.tile.RenderTileBrewery; import vazkii.botania.client.render.tile.RenderTileCocoon; import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; @@ -133,6 +135,7 @@ import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.block.tile.mana.TilePump; @@ -237,7 +240,9 @@ public class ClientProxy extends CommonProxy { LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId(); LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId(); LibRenderIDs.idCocoon = RenderingRegistry.getNextAvailableRenderId(); - + LibRenderIDs.idLightRelay = RenderingRegistry.getNextAvailableRenderId(); + LibRenderIDs.idBellows = RenderingRegistry.getNextAvailableRenderId(); + RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower); RenderingRegistry.registerBlockHandler(new RenderAltar()); RenderingRegistry.registerBlockHandler(specialFlowerRender); @@ -255,6 +260,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerBlockHandler(new RenderIncensePlate()); RenderingRegistry.registerBlockHandler(new RenderHourglass()); RenderingRegistry.registerBlockHandler(new RenderCocoon()); + RenderingRegistry.registerBlockHandler(new RenderBellows()); IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); @@ -298,6 +304,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileSparkChanger.class, new RenderTileSparkChanger()); ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); + ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); diff --git a/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java b/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java index 93fb62ab8..59f17ecd6 100644 --- a/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java +++ b/src/main/java/vazkii/botania/client/lib/LibRenderIDs.java @@ -29,5 +29,6 @@ public final class LibRenderIDs { public static int idHourglass = -1; public static int idCocoon = -1; public static int idLightRelay = -1; + public static int idBellows = -1; } diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index ba6f4d9dc..bc77e7afb 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -108,6 +108,7 @@ public final class LibResources { public static final String MODEL_INCENSE_PLATE = PREFIX_MODEL + "incensePlate.png"; public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png"; public static final String MODEL_COCOON = PREFIX_MODEL + "cocoon.png"; + public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png"; diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java new file mode 100644 index 000000000..7fc51a2f6 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -0,0 +1,94 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 28, 2015, 5:16:17 PM (GMT)] + */ +package vazkii.botania.client.model; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.core.handler.ClientTickHandler; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelBellows extends ModelBase { + + ModelRenderer Base; + ModelRenderer Top; + ModelRenderer Funnel; + ModelRenderer Pipe; + ModelRenderer Handle1; + ModelRenderer Handle2; + ModelRenderer Handle3; + + public ModelBellows() { + textureWidth = 64; + textureHeight = 32; + + Base = new ModelRenderer(this, 0, 0); + Base.addBox(0F, 0F, 0F, 10, 2, 10); + Base.setRotationPoint(-5F, 22F, -5F); + Base.setTextureSize(64, 32); + Base.mirror = true; + Top = new ModelRenderer(this, 0, 14); + Top.addBox(0F, 0F, 0F, 8, 1, 8); + Top.setRotationPoint(-4F, 14F, -4F); + Top.setTextureSize(64, 32); + Top.mirror = true; + Funnel = new ModelRenderer(this, 34, 14); + Funnel.addBox(0F, 0F, 0F, 6, 7, 6); + Funnel.setRotationPoint(0F, 0F, 0F); + Funnel.setTextureSize(64, 32); + Funnel.mirror = true; + Pipe = new ModelRenderer(this, 43, 1); + Pipe.addBox(0F, 0F, 0F, 2, 2, 3); + Pipe.setRotationPoint(-1F, 22F, -8F); + Pipe.setTextureSize(64, 32); + Pipe.mirror = true; + Handle1 = new ModelRenderer(this, 43, 8); + Handle1.addBox(0F, 0F, -0.5F, 1, 2, 1); + Handle1.setRotationPoint(-2F, 12F, 0F); + Handle1.setTextureSize(64, 32); + Handle1.mirror = true; + Handle2 = new ModelRenderer(this, 48, 8); + Handle2.addBox(1F, 0F, -0.5F, 2, 1, 1); + Handle2.setRotationPoint(-2F, 12F, 0F); + Handle2.setTextureSize(64, 32); + Handle2.mirror = true; + Handle3 = new ModelRenderer(this, 55, 8); + Handle3.addBox(3F, 0F, -0.5F, 1, 2, 1); + Handle3.setRotationPoint(-2F, 12F, 0F); + Handle3.setTextureSize(64, 32); + Handle3.mirror = true; + } + + public void render(float fract) { + float f5 = 1F / 16F; + Base.render(f5); + Pipe.render(f5); + + //float fract = Math.max(0.1F, (float) (Math.sin(((double) ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.5F); + float mov = (1F - fract) * 0.5F; + + GL11.glTranslatef(0F, mov, 0F); + Top.render(f5); + Handle1.render(f5); + Handle2.render(f5); + Handle3.render(f5); + GL11.glTranslatef(0F, -mov, 0F); + + GL11.glRotatef(180F, 1F, 0F, 0F); + GL11.glTranslatef(-0.19F, -1.375F, -0.19F); + GL11.glScalef(1F, fract, 1F); + Funnel.render(f5); + GL11.glScalef(1F, 1F / fract, 1F); + } + + +} diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBellows.java b/src/main/java/vazkii/botania/client/render/block/RenderBellows.java new file mode 100644 index 000000000..e1eb2a7a9 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/block/RenderBellows.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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 28, 2015, 7:13:45 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.mana.TileBellows; +import vazkii.botania.common.block.tile.mana.TilePump; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + +public class RenderBellows implements ISimpleBlockRenderingHandler { + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + GL11.glPushMatrix(); + GL11.glTranslatef(-0.5F, -0.3F, -0.5F); + GL11.glScalef(1.2F, 1.2F, 1.2F); + TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileBellows(), 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.idBellows; + } + +} diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java new file mode 100644 index 000000000..9bfdeb8ce --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -0,0 +1,57 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 28, 2015, 5:30:41 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.ModelBellows; +import vazkii.botania.client.model.ModelPump; +import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.block.tile.mana.TilePump; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +public class RenderTileBellows extends TileEntitySpecialRenderer { + + private static final float[] ROTATIONS = new float[] { + 180F, 0F, 90F, 270F + }; + + private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BELLOWS); + private static final ModelBellows model = new ModelBellows(); + + @Override + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + TileBellows bellows = (TileBellows) tileentity; + + GL11.glPushMatrix(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glTranslated(d0, d1, d2); + + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + int meta = bellows.getWorldObj() != null ? bellows.getBlockMetadata() : 0; + + GL11.glTranslatef(0.5F, 1.5F, 0.5F); + GL11.glScalef(1F, -1F, -1F); + GL11.glRotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); + model.render(Math.max(0.1F, 1F - (bellows.movePos + bellows.moving * f + 0.1F))); + GL11.glColor3f(1F, 1F, 1F); + GL11.glScalef(1F, -1F, -1F); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index c86c6f423..691722d57 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -48,6 +48,7 @@ import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart; import vazkii.botania.common.block.dispenser.BehaviourSeeds; import vazkii.botania.common.block.dispenser.BehaviourWand; import vazkii.botania.common.block.mana.BlockAlchemyCatalyst; +import vazkii.botania.common.block.mana.BlockBellows; import vazkii.botania.common.block.mana.BlockBrewery; import vazkii.botania.common.block.mana.BlockConjurationCatalyst; import vazkii.botania.common.block.mana.BlockDistributor; @@ -141,6 +142,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; +import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.block.tile.mana.TileManaVoid; @@ -241,6 +243,7 @@ public final class ModBlocks { public static Block lightLauncher; public static Block manaBomb; public static Block cacophonium; + public static Block bellows; public static void init() { flower = new BlockModFlower(); @@ -322,6 +325,7 @@ public final class ModBlocks { lightLauncher = new BlockLightLauncher(); manaBomb = new BlockManaBomb(); cacophonium = new BlockCacophonium(); + bellows = new BlockBellows(); ModFluffBlocks.init(); @@ -417,6 +421,7 @@ public final class ModBlocks { registerTile(TileCocoon.class, LibBlockNames.COCOON); registerTile(TileLightRelay.class, LibBlockNames.LIGHT_RELAY); registerTile(TileCacophonium.class, LibBlockNames.CACOPHONIUM); + registerTile(TileBellows.class, LibBlockNames.BELLOWS); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java new file mode 100644 index 000000000..95ae0d08e --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -0,0 +1,86 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 28, 2015, 5:18:13 PM (GMT)] + */ +package vazkii.botania.common.block.mana; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import vazkii.botania.client.lib.LibRenderIDs; +import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.mana.TileBellows; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockBellows extends BlockModContainer { + + private static final int[] META_ROTATIONS = new int[] { 3, 4, 2, 5 }; + + public BlockBellows() { + super(Material.wood); + setHardness(2.0F); + setStepSound(soundTypeWood); + setBlockName(LibBlockNames.BELLOWS); + + float f = (1F - 10 / 16F) / 2F; + setBlockBounds(f, 0F, f, 1F - f, 10F / 16F, 1F - f); + } + + @Override + public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + // NO-OP + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { + if(EntityDoppleganger.isTruePlayer(player)) + ((TileBellows) world.getTileEntity(x, y, z)).interact(); + return true; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public IIcon getIcon(int par1, int par2) { + return ModBlocks.livingwood.getIcon(par1, 0); + } + + @Override + public int getRenderType() { + return LibRenderIDs.idBellows; + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileBellows(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index e28c317f7..ad2cb6ab9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -86,7 +86,7 @@ public class SubTileExoflame extends SubTileFunctional { sync(); } - public boolean canFurnaceSmelt(TileEntityFurnace furnace){ + public static boolean canFurnaceSmelt(TileEntityFurnace furnace){ if(furnace.getStackInSlot(0) == null) return false; else { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java new file mode 100644 index 000000000..0f36ace4a --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -0,0 +1,139 @@ +/** + * 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 the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Aug 28, 2015, 5:27:43 PM (GMT)] + */ +package vazkii.botania.common.block.tile.mana; + +import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.common.block.subtile.functional.SubTileExoflame; +import vazkii.botania.common.block.tile.TileMod; + +public class TileBellows extends TileMod { + + private static final String TAG_ACTIVE = "active"; + + public float movePos; + public boolean active = false; + public float moving = 0F; + + public void interact() { + if(moving == 0F) + setActive(true); + } + + @Override + public void updateEntity() { + boolean disable = true; + TileEntity tile = getLinkedTile(); + if(!active && tile instanceof TilePool) { + TilePool pool = (TilePool) tile; + boolean transfer = pool.isDoingTransfer; + if(transfer) { + if(!active && pool.ticksDoingTransfer >= getBlockMetadata() * 2 - 2) + setActive(true); + disable = false; + } + } + + float max = 0.9F; + float min = 0F; + + float incr = max / 20F; + + if(movePos < max && active && moving >= 0F) { + if(moving == 0F) + worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "botania:bellows", 0.1F, 3F); + + if(tile instanceof TileEntityFurnace) { + TileEntityFurnace furnace = (TileEntityFurnace) tile; + if(SubTileExoflame.canFurnaceSmelt(furnace)) { + furnace.furnaceCookTime = Math.min(199, furnace.furnaceCookTime + 20); + furnace.furnaceBurnTime = Math.max(0, furnace.furnaceBurnTime - 10); + } + + if(furnace.getBlockType() == Blocks.lit_furnace) { + // Copypasta from BlockFurnace + int x = furnace.xCoord; + int y = furnace.yCoord; + int z = furnace.zCoord; + int l = worldObj.getBlockMetadata(x, y, z); + float f = (float)x + 0.5F; + float f1 = (float)y + 0.0F + worldObj.rand.nextFloat() * 6.0F / 16.0F; + float f2 = (float)z + 0.5F; + float f3 = 0.52F; + float f4 = worldObj.rand.nextFloat() * 0.6F - 0.3F; + + if(l == 4) { + worldObj.spawnParticle("smoke", (double)(f - f3), (double)f1, (double)(f2 + f4), 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle("flame", (double)(f - f3), (double)f1, (double)(f2 + f4), 0.0D, 0.0D, 0.0D); + } else if(l == 5) { + worldObj.spawnParticle("smoke", (double)(f + f3), (double)f1, (double)(f2 + f4), 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle("flame", (double)(f + f3), (double)f1, (double)(f2 + f4), 0.0D, 0.0D, 0.0D); + } else if(l == 2) { + worldObj.spawnParticle("smoke", (double)(f + f4), (double)f1, (double)(f2 - f3), 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle("flame", (double)(f + f4), (double)f1, (double)(f2 - f3), 0.0D, 0.0D, 0.0D); + } else if(l == 3) { + worldObj.spawnParticle("smoke", (double)(f + f4), (double)f1, (double)(f2 + f3), 0.0D, 0.0D, 0.0D); + worldObj.spawnParticle("flame", (double)(f + f4), (double)f1, (double)(f2 + f3), 0.0D, 0.0D, 0.0D); + } + } + } + + movePos += incr * 3; + moving = incr * 3; + if(movePos >= max) { + movePos = Math.min(max, movePos); + moving = 0F; + if(disable) + setActive(false); + } + } else if(movePos > min) { + movePos -= incr; + moving = -incr; + if(movePos <= min) { + movePos = Math.max(min, movePos); + moving = 0F; + } + } + + super.updateEntity(); + } + + public TileEntity getLinkedTile() { + int meta = getBlockMetadata(); + ForgeDirection dir = ForgeDirection.getOrientation(meta); + return worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + cmp.setBoolean(TAG_ACTIVE, active); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + active = cmp.getBoolean(TAG_ACTIVE); + } + + public void setActive(boolean active) { + if(!worldObj.isRemote) { + boolean diff = this.active != active; + this.active = active; + if(diff) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + } + } + + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index cb76a1a90..3d18d2c19 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -25,8 +25,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -54,6 +56,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable, IThrottledPacket { @@ -85,13 +88,15 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc boolean canAccept = true; boolean canSpare = true; public boolean fragile = false; - + public boolean isDoingTransfer = false; + public int ticksDoingTransfer = 0; + String inputKey = ""; String outputKey = ""; int ticks = 0; boolean sendPacket = false; - + @Override public boolean isFull() { Block blockBelow = worldObj.getBlock(xCoord, yCoord - 1, zCoord); @@ -181,6 +186,8 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc @Override public void updateEntity() { + boolean wasDoingTransfer = isDoingTransfer; + isDoingTransfer = false; if(manaCap == -1) manaCap = getBlockMetadata() == 2 ? MAX_MANA_DILLUTED : MAX_MANA; @@ -217,12 +224,21 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc if(outputting && mana.canReceiveManaFromPool(stack, this) || !outputting && mana.canExportManaToPool(stack, this)) { boolean didSomething = false; + int bellowCount = 0; + if(outputting) + for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { + TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); + if(tile != null && tile instanceof TileBellows && ((TileBellows) tile).getLinkedTile() == this) + bellowCount++; + } + int transfRate = 1000 * (bellowCount + 1); + if(outputting) { if(canSpare) { if(getCurrentMana() > 0 && mana.getMana(stack) < mana.getMaxMana(stack)) didSomething = true; - int manaVal = Math.min(1000, Math.min(getCurrentMana(), mana.getMaxMana(stack) - mana.getMana(stack))); + int manaVal = Math.min(transfRate, Math.min(getCurrentMana(), mana.getMaxMana(stack) - mana.getMana(stack))); if(!worldObj.isRemote) mana.addMana(stack, manaVal); recieveMana(-manaVal); @@ -232,7 +248,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc if(mana.getMana(stack) > 0 && !isFull()) didSomething = true; - int manaVal = Math.min(1000, Math.min(manaCap - getCurrentMana(), mana.getMana(stack))); + int manaVal = Math.min(transfRate, Math.min(manaCap - getCurrentMana(), mana.getMana(stack))); if(!worldObj.isRemote) mana.addMana(stack, -manaVal); recieveMana(manaVal); @@ -245,11 +261,20 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc Vector3 tileVec = Vector3.fromTileEntity(this).add(0.2 + Math.random() * 0.6, 0, 0.2 + Math.random() * 0.6); LightningHandler.spawnLightningBolt(worldObj, outputting ? tileVec : itemVec, outputting ? itemVec : tileVec, 80, worldObj.rand.nextLong(), 0x4400799c, 0x4400C6FF); } + isDoingTransfer = outputting; } } } } + if(isDoingTransfer) + ticksDoingTransfer++; + else { + ticksDoingTransfer = 0; + if(wasDoingTransfer) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } + ticks++; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index dd8296434..0f15e6304 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -90,8 +90,10 @@ public class TilePump extends TileMod { public void setActive(boolean active) { if(!worldObj.isRemote) { + boolean diff = this.active != active; this.active = active; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + if(diff) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 1dd0952b8..94d570016 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -242,6 +242,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.conjurationCatalyst); addBlock(ModBlocks.distributor); addBlock(ModBlocks.manaVoid); + addBlock(ModBlocks.bellows); addBlock(ModBlocks.manaDetector); addBlock(ModBlocks.manaBomb); addBlock(ModBlocks.ghostRail); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 49d679e21..6a61e794f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -94,6 +94,7 @@ public final class LibBlockNames { public static final String LIGHT_LAUNCHER = "lightLauncher"; public static final String MANA_BOMB = "manaBomb"; public static final String CACOPHONIUM = "cacophoniumBlock"; + public static final String BELLOWS = "bellows"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1cd46cb05..3bfcfaef3 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1019,6 +1019,7 @@ tile.botania:buriedPetals13.name=Buried Green Petal tile.botania:buriedPetals14.name=Buried Red Petal tile.botania:buriedPetals15.name=Buried Black Petal tile.botania:cacophoniumBlock.name=Cacophonium Block +tile.botania:bellows.name=Manatide Bellows # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 8fe1f76f1..3f9bc9775 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -4,6 +4,7 @@ "altarCraft": { "category": "block", "sounds":["altarCraft"] }, "babylonAttack": { "category": "player", "sounds":["babylonAttack"] }, "babylonSpawn": { "category": "player", "sounds":["babylonSpawn"] }, + "bellows": { "category": "block", "sounds":["bellows"] }, "bifrostRod": { "category": "player", "sounds":["bifrostRod"] }, "blackLotus": { "category": "block", "sounds":["blackLotus"] }, "dash": { "category": "player", "sounds":["dash"] }, diff --git a/src/main/resources/assets/botania/sounds/bellows.ogg b/src/main/resources/assets/botania/sounds/bellows.ogg new file mode 100644 index 0000000000000000000000000000000000000000..726b7c47c0ac493b6a3317bc7c56c7e6849bc4d5 GIT binary patch literal 13438 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 dp?o@yKO@YC!H?GdSz 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