From 7a18e1fc7a0be33ce223b43c7fd12e47b3eea57e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 1 May 2014 16:38:38 +0100 Subject: [PATCH] Added a Tiny Planet block, will have to work on it later. --- .../botania/common/block/BlockTinyPlanet.java | 52 ++++++++++++++++++ .../botania/common/block/ModBlocks.java | 6 +- .../common/block/tile/TileSpreader.java | 2 +- .../common/block/tile/TileTinyPlanet.java | 23 ++++++++ .../item/equipment/bauble/ItemTinyPlanet.java | 26 ++++++--- .../botania/common/lib/LibBlockNames.java | 1 + .../textures/blocks/tinyPlanetBlock.png | Bin 0 -> 3090 bytes 7 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java create mode 100644 MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java create mode 100644 resources/assets/botania/textures/blocks/tinyPlanetBlock.png diff --git a/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java b/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java new file mode 100644 index 000000000..c81bebadd --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java @@ -0,0 +1,52 @@ +/** + * 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 @ [May 1, 2014, 3:49:12 PM (GMT)] + */ +package vazkii.botania.common.block; + +import vazkii.botania.common.block.tile.TileTinyPlanet; +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class BlockTinyPlanet extends BlockModContainer { + + protected BlockTinyPlanet() { + super(Material.rock); + setHardness(20F); + setResistance(100F); + setStepSound(soundTypeStone); + float size = 3F / 16F; + setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); + setBlockName(LibBlockNames.TINY_PLANET); + } + + @Override + boolean registerInCreative() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileTinyPlanet(); + } + +} diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 3bdb64bc1..61970004a 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -44,6 +44,7 @@ import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.block.tile.TileTurntable; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; @@ -69,6 +70,7 @@ public final class ModBlocks { public static Block manaDetector; public static Block enchanter; public static Block turntable; + public static Block tinyPlanet; public static void init() { flower = new BlockModFlower(); @@ -88,7 +90,8 @@ public final class ModBlocks { manaDetector = new BlockManaDetector(); enchanter = new BlockEnchanter(); turntable = new BlockTurntable(); - + tinyPlanet = new BlockTinyPlanet(); + for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); @@ -112,6 +115,7 @@ public final class ModBlocks { GameRegistry.registerTileEntity(TileManaDetector.class, LibBlockNames.MANA_DETECTOR); GameRegistry.registerTileEntity(TileEnchanter.class, LibBlockNames.ENCHANTER); GameRegistry.registerTileEntity(TileTurntable.class, LibBlockNames.TURNTABLE); + GameRegistry.registerTileEntity(TileTinyPlanet.class, LibBlockNames.TINY_PLANET); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java b/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java index cb23d04b6..cb1fbe12a 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java @@ -123,7 +123,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(redstoneSide > 0) redstone = true; } - + if(needsNewBurstSimulation()) checkForReceiver(); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java b/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java new file mode 100644 index 000000000..1db177cbf --- /dev/null +++ b/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.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 @ [May 1, 2014, 3:49:53 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; + +public class TileTinyPlanet extends TileMod { + + @Override + public void updateEntity() { + ItemTinyPlanet.applyEffect(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 708d77207..e17484b4f 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -18,6 +18,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; @@ -39,8 +40,19 @@ public class ItemTinyPlanet extends ItemBauble { @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); + + double x = player.posX; + double y = player.posY + 1.2F; + double z = player.posZ; + if(player.worldObj.isRemote) + y -= 1.62F; + + applyEffect(player.worldObj, x, y, z); + } + + public static void applyEffect(World world, double x, double y, double z) { int range = 8; - List entities = player.worldObj.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List entities = world.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range, y + range, z + range)); for(Entity entity : entities) { IManaBurst burst = (IManaBurst) entity; int orbitTime = getEntityOrbitTime(entity); @@ -50,11 +62,9 @@ public class ItemTinyPlanet extends ItemBauble { float radius = (Math.max(40, orbitTime) - 40) / 40F + 1.5F; int angle = orbitTime % 360; - float xTarget = (float) (player.posX + Math.cos(angle * 10 * Math.PI / 180F) * radius); - float yTarget = (float) player.posY + 1.2F; - float zTarget = (float) (player.posZ + Math.sin(angle * 10 * Math.PI / 180F) * radius); - if(player.worldObj.isRemote) - yTarget -= 1.62F; + float xTarget = (float) (x + Math.cos(angle * 10 * Math.PI / 180F) * radius); + float yTarget = (float) y; + float zTarget = (float) (z + Math.sin(angle * 10 * Math.PI / 180F) * radius); Vector3 targetVec = new Vector3(xTarget, yTarget, zTarget); Vector3 currentVec = new Vector3(entity.posX, entity.posY, entity.posZ); @@ -66,14 +76,14 @@ public class ItemTinyPlanet extends ItemBauble { } } - public int getEntityOrbitTime(Entity entity) { + public static int getEntityOrbitTime(Entity entity) { NBTTagCompound cmp = entity.getEntityData(); if(cmp.hasKey(TAG_ORBIT)) return cmp.getInteger(TAG_ORBIT); else return 0; } - public void incrementOrbitTime(Entity entity) { + public static void incrementOrbitTime(Entity entity) { NBTTagCompound cmp = entity.getEntityData(); int time = getEntityOrbitTime(entity); cmp.setInteger(TAG_ORBIT, time + 1); diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 684792fd3..6489cc212 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -32,6 +32,7 @@ public final class LibBlockNames { public static final String MANA_DETECTOR = LibResources.PREFIX_MOD + "manaDetector"; public static final String ENCHANTER = LibResources.PREFIX_MOD + "enchanter"; public static final String TURNTABLE = LibResources.PREFIX_MOD + "turntable"; + public static final String TINY_PLANET = LibResources.PREFIX_MOD + "tinyPlanetBlock"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/resources/assets/botania/textures/blocks/tinyPlanetBlock.png b/resources/assets/botania/textures/blocks/tinyPlanetBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..18d335bd902ccd7ea528b0afff276bffc0c906ca GIT binary patch literal 3090 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 literal 0 HcmV?d00001