From 285295f2ed8db62340f0b9553f55216463ab401e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 7 Jun 2014 14:46:31 +0100 Subject: [PATCH] Added the Abtruse Platform. --- .../botania/common/block/BlockCamo.java | 144 ++++++++++++++++++ .../botania/common/block/BlockPlatform.java | 48 ++++++ .../botania/common/block/ModBlocks.java | 4 + .../botania/common/block/tile/TileCamo.java | 51 +++++++ .../common/block/tile/TilePlatform.java | 23 +++ .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/lib/LibBlockNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + .../botania/textures/blocks/platform.png | Bin 0 -> 3086 bytes 9 files changed, 273 insertions(+) create mode 100644 MODSRC/vazkii/botania/common/block/BlockCamo.java create mode 100644 MODSRC/vazkii/botania/common/block/BlockPlatform.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileCamo.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TilePlatform.java create mode 100644 resources/assets/botania/textures/blocks/platform.png diff --git a/MODSRC/vazkii/botania/common/block/BlockCamo.java b/MODSRC/vazkii/botania/common/block/BlockCamo.java new file mode 100644 index 000000000..d34083367 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockCamo.java @@ -0,0 +1,144 @@ +/** + * 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 @ [Jun 7, 2014, 2:20:51 PM (GMT)] + */ +package vazkii.botania.common.block; + +import java.util.Arrays; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockDirectional; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import vazkii.botania.common.block.tile.TileCamo; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public abstract class BlockCamo extends BlockModContainer { + + static List validRenderTypes = Arrays.asList(0, 31, 39); + + protected BlockCamo(Material par2Material) { + super(par2Material); + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + TileEntity tile = world.getTileEntity(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + Block block = camo.camo; + if(block != null && isValidRenderType(block.getRenderType())) + return block.getIcon(side, camo.camoMeta); + } + + return getIconFromSideAfterCheck(tile, meta, side); + } + + public boolean isValidRenderType(int type) { + return validRenderTypes.contains(type); + } + + @Override + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { + TileEntity tile = par1World.getTileEntity(par2, par3, par4); + + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + ItemStack currentStack = par5EntityPlayer.getCurrentEquippedItem(); + + if(currentStack == null) + currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0); + + boolean doChange = true; + Block block = null; + checkChange : { + if(currentStack.getItem() != Item.getItemFromBlock(Block.getBlockFromName("air"))) { + if(Item.getIdFromItem(currentStack.getItem()) == 0) { + doChange = false; + break checkChange; + } + + block = Block.getBlockFromItem(currentStack.getItem()); + if(block == null || !isValidRenderType(block.getRenderType()) || block instanceof BlockCamo || block.getMaterial() == Material.air) + doChange = false; + } + } + + if(doChange) { + int metadata = currentStack.getItemDamage(); + if(block instanceof BlockDirectional) { + switch (par6) { + case 0: + case 1: + break; + case 2: + metadata = metadata & 12 | 2; + break; + case 3: + metadata = metadata & 12; + break; + case 4: + metadata = metadata & 12 | 1; + break; + case 5: + metadata = metadata & 12 | 3; + break; + } + } + camo.camo = Block.getBlockFromItem(currentStack.getItem()); + camo.camoMeta = metadata; + par1World.markBlockForUpdate(par2,par3,par4); + + return true; + } + } + + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public int colorMultiplier(IBlockAccess par1World, int par2, int par3, int par4) { + TileEntity tile = par1World.getTileEntity(par2, par3, par4); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + Block block = camo.camo; + if(block != null) + return block instanceof BlockCamo ? 0xFFFFFF : block.colorMultiplier(par1World, par2, par3, par4); + + } + return 0xFFFFFF; + } + + public IIcon getIconFromSideAfterCheck(TileEntity tile, int meta, int side) { + return blockIcon; + } + +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/block/BlockPlatform.java b/MODSRC/vazkii/botania/common/block/BlockPlatform.java new file mode 100644 index 000000000..f19d289c9 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockPlatform.java @@ -0,0 +1,48 @@ +/** + * 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 @ [Jun 7, 2014, 2:25:22 PM (GMT)] + */ +package vazkii.botania.common.block; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import vazkii.botania.common.block.tile.TileCamo; +import vazkii.botania.common.block.tile.TilePlatform; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockPlatform extends BlockCamo { + + public BlockPlatform() { + super(Material.wood); + setHardness(2.0F); + setResistance(5.0F); + setStepSound(Block.soundTypeWood); + setBlockName(LibBlockNames.PLATFORM); + } + + @Override + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + if(par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + + @Override + public TileCamo createNewTileEntity(World world, int meta) { + return new TilePlatform(); + } + +} \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index dc4fbd0e3..9145c42ed 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -52,6 +52,7 @@ import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.block.tile.TileManaBeacon; 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.TileSpecialFlower; @@ -93,6 +94,7 @@ public final class ModBlocks { public static Block storage; public static Block forestDrum; public static Block shinyFlower; + public static Block platform; public static void init() { flower = new BlockModFlower(); @@ -119,6 +121,7 @@ public final class ModBlocks { storage = new BlockStorage(); forestDrum = new BlockForestDrum(); shinyFlower = new BlockShinyFlower(); + platform = new BlockPlatform(); for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); @@ -151,6 +154,7 @@ public final class ModBlocks { registerTile(TileTinyPlanet.class, LibBlockNames.TINY_PLANET); registerTile(TileOpenCrate.class, LibBlockNames.OPEN_CRATE); registerTile(TileForestEye.class, LibBlockNames.FOREST_EYE); + registerTile(TilePlatform.class, LibBlockNames.PLATFORM); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileCamo.java b/MODSRC/vazkii/botania/common/block/tile/TileCamo.java new file mode 100644 index 000000000..1cfe2a211 --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileCamo.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 @ [Jun 7, 2014, 2:21:28 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + + +import net.minecraft.block.Block; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; + +public class TileCamo extends TileMod { + + private static final String TAG_CAMO = "camo"; + private static final String TAG_CAMO_META = "camoMeta"; + + public Block camo; + public int camoMeta; + + @Override + public boolean canUpdate() { + return false; + } + + public void writeCustomNBT(NBTTagCompound cmp) { + if(camo!=null) { + cmp.setString(TAG_CAMO, Block.blockRegistry.getNameForObject(camo)); + cmp.setInteger(TAG_CAMO_META, camoMeta); + } + } + + public void readCustomNBT(NBTTagCompound cmp) { + camo = Block.getBlockFromName(cmp.getString(TAG_CAMO)); + camoMeta = cmp.getInteger(TAG_CAMO_META); + } + + @Override + public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) { + super.onDataPacket(manager, packet); + worldObj.markBlockRangeForRenderUpdate(xCoord,yCoord,zCoord,xCoord,yCoord,zCoord); + } +} diff --git a/MODSRC/vazkii/botania/common/block/tile/TilePlatform.java b/MODSRC/vazkii/botania/common/block/tile/TilePlatform.java new file mode 100644 index 000000000..7176db9be --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TilePlatform.java @@ -0,0 +1,23 @@ +/** + * 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 @ [Jun 7, 2014, 2:24:51 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import vazkii.botania.api.mana.IManaCollisionGhost; + +public class TilePlatform extends TileCamo implements IManaCollisionGhost { + + @Override + public boolean isGhost() { + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index a83b828e8..6c6c1903d 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -69,6 +69,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); addBlock(ModBlocks.openCrate); + addBlock(ModBlocks.platform); addBlock(ModBlocks.altar); addBlock(ModBlocks.runeAltar); addBlock(ModBlocks.pylon); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 66d3c923b..5988834e8 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -38,6 +38,7 @@ public final class LibBlockNames { public static final String STORAGE = "storage"; public static final String FOREST_DRUM = "forestDrum"; public static final String SHINY_FLOWER = "shinyFlower"; + public static final String PLATFORM = "platform"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 616536964..4b60972d7 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -182,6 +182,7 @@ tile.botania:shinyFlower12.name=Glimmering Brown Flower tile.botania:shinyFlower13.name=Glimmering Green Flower tile.botania:shinyFlower14.name=Glimmering Red Flower tile.botania:shinyFlower15.name=Glimmering Black Flower +tile.botania:platform.name=Abtruse Platform # FLOWER NAMES tile.botania:flower..name=Botania Flower diff --git a/resources/assets/botania/textures/blocks/platform.png b/resources/assets/botania/textures/blocks/platform.png new file mode 100644 index 0000000000000000000000000000000000000000..98ece6c974e757aa22fdf28fc3a3ecdba8d65289 GIT binary patch literal 3086 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