From 124b8ba650af981bf61a20778df7eb9b23eb43dc Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 10 Apr 2014 17:40:01 +0100 Subject: [PATCH] Added Pasture Seeds. --- .../botania/common/block/tile/TilePool.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 125 +++++++++++++++++- .../vazkii/botania/common/item/ModItems.java | 4 +- .../botania/common/lib/LibItemNames.java | 1 + resources/assets/botania/lang/en_US.lang | 1 + 5 files changed, 130 insertions(+), 3 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/tile/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/TilePool.java index 3029a1aa4..e89e2de14 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/TilePool.java @@ -131,7 +131,7 @@ public class TilePool extends TileMod implements IManaPool { if(worldObj.isRemote) { double particleChance = 1F - (double) getCurrentMana() / (double) MAX_MANA * 0.1; Color color = new Color(0x00C6FF); - if(Math.random() > particleChance); + if(Math.random() > particleChance) Botania.proxy.wispFX(worldObj, xCoord + 0.3 + Math.random() * 0.5, yCoord + 0.6 + Math.random() * 0.25, zCoord + Math.random(), color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F); } diff --git a/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java b/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java index b642c6f36..c3ebf09e0 100644 --- a/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java @@ -11,6 +11,129 @@ */ package vazkii.botania.common.item; -public class ItemGrassSeeds { +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; + +public class ItemGrassSeeds extends ItemMod { + + private static Map> blockSwappers = new HashMap(); + + public ItemGrassSeeds() { + super(); + setUnlocalizedName(LibItemNames.GRASS_SEEDS); + FMLCommonHandler.instance().bus().register(this); + } + + @Override + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + Block block = par3World.getBlock(par4, par5, par6); + if(block == Blocks.dirt) { + addBlockSwapper(par3World, par4, par5, par6); + + par3World.setBlock(par4, par5, par6, Blocks.grass); + for(int i = 0; i < 50; i++) { + double x = (Math.random() - 0.5) * 3; + double y = (Math.random() - 0.5) + 1; + double z = (Math.random() - 0.5) * 3; + + float velMul = 0.025F; + + Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, 0F, 0.4F, 0F, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + } + + par1ItemStack.stackSize--; + } + + return true; + } + + @SubscribeEvent + public void onTickEnd(TickEvent.WorldTickEvent event) { + if(event.phase == Phase.END) { + int dim = event.world.provider.dimensionId; + if(blockSwappers.containsKey(dim)) { + List swappers = blockSwappers.get(dim); + List swappersSafe = new ArrayList(swappers); + + for(BlockSwapper s : swappersSafe) + s.tick(swappers); + } + } + } + + private static void addBlockSwapper(World world, int x, int y, int z) { + BlockSwapper swapper = new BlockSwapper(world, new ChunkCoordinates(x, y, z)); + + int dim = world.provider.dimensionId; + if(!blockSwappers.containsKey(dim)) + blockSwappers.put(dim, new ArrayList()); + blockSwappers.get(dim).add(swapper); + } + + private static class BlockSwapper { + + final World world; + final Random rand; + + ChunkCoordinates startCoords; + int ticksExisted = 0; + + BlockSwapper(World world, ChunkCoordinates coords) { + this.world = world; + rand = new Random(coords.posX ^ coords.posY ^ coords.posZ); + startCoords = coords; + } + + void tick(List list) { + ++ticksExisted; + + int range = 3; + for(int i = -range; i < range + 1; i++) + for(int j = -range; j < range + 1; j++) { + int x = startCoords.posX + i; + int y = startCoords.posY; + int z = startCoords.posZ + j; + Block block = world.getBlock(x, y, z); + if(block == Blocks.grass) { + if(ticksExisted % 20 == 0) { + List validCoords = new ArrayList(); + for(int k = -1; k < 2; k++) + for(int l = -1; l < 2; l++) { + int x1 = x + k; + int z1 = z + l; + Block block1 = world.getBlock(x1, y, z1); + if(block1 == Blocks.dirt) + validCoords.add(new ChunkCoordinates(x1, y, z1)); + } + + if(!validCoords.isEmpty() && !world.isRemote) { + ChunkCoordinates coords = validCoords.get(rand.nextInt(validCoords.size())); + world.setBlock(coords.posX, coords.posY, coords.posZ, Blocks.grass); + } + } + } + } + + + if(ticksExisted >= 80) + list.remove(this); + } + } + } diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index a90dbae79..9138dd06b 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -33,6 +33,7 @@ public final class ModItems { public static Item manaGun; public static Item manaCookie; public static Item fertilizer; + public static Item grassSeeds; public static void init() { lexicon = new ItemLexicon(); @@ -49,7 +50,8 @@ public final class ModItems { manaGun = new ItemManaGun(); manaCookie = new ItemManaCookie(); fertilizer = new ItemFertilizer(); - + grassSeeds = new ItemGrassSeeds(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index e7d82d96c..ca45ddac7 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -29,6 +29,7 @@ public final class LibItemNames { public static final String MANA_GUN = LibResources.PREFIX_MOD + "manaGun"; public static final String MANA_COOKIE = LibResources.PREFIX_MOD + "manaCookie"; public static final String FERTILIZER = LibResources.PREFIX_MOD + "fertilizer"; + public static final String GRASS_SEEDS = LibResources.PREFIX_MOD + "grassSeeds"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 3edeb8da7..fa6648d8e 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -252,6 +252,7 @@ item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Composite Mana Lens: %s %s item.botania:manaCookie.name=Mana Cookie item.botania:fertilizer.name=Floral Fertilizer +item.botania:grassSeeds.name=Pasture Seeds item.botania:livingwoodTwig.name=Livingwood Twig # GUI TEXT