diff --git a/src/main/java/mods/natura/CloudMaterial.java b/src/main/java/mods/natura/CloudMaterial.java index eaada160..63f1f7ae 100644 --- a/src/main/java/mods/natura/CloudMaterial.java +++ b/src/main/java/mods/natura/CloudMaterial.java @@ -4,6 +4,7 @@ import net.minecraft.block.material.Material; public class CloudMaterial extends Material { + public CloudMaterial() { super(MapColor.snowColor); // this.setReplaceable(); diff --git a/src/main/java/mods/natura/Natura.java b/src/main/java/mods/natura/Natura.java index ed98adf3..01efd008 100644 --- a/src/main/java/mods/natura/Natura.java +++ b/src/main/java/mods/natura/Natura.java @@ -1,24 +1,10 @@ package mods.natura; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; + import mantle.lib.TabTools; import mantle.pulsar.control.PulseManager; import mods.natura.common.NContent; @@ -33,6 +19,7 @@ import mods.natura.worldgen.BaseTreeWorldgen; import mods.natura.worldgen.retro.TickHandlerWorld; import mods.natura.worldgen.retro.WorldHandler; + import net.minecraft.block.material.Material; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLiving; @@ -51,9 +38,26 @@ import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.oredict.OreDictionary; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + @Mod( modid = "Natura", name = "Natura", @@ -61,6 +65,7 @@ acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:Mantle;after:TConstruct") public class Natura { + /* Proxies for sides, used for graphics processing */ @SidedProxy(clientSide = "mods.natura.client.NProxyClient", serverSide = "mods.natura.common.NProxyCommon") public static NProxyCommon proxy; @@ -106,12 +111,12 @@ public void preInit(FMLPreInitializationEvent evt) { @EventHandler public void init(FMLInitializationEvent evt) { if (PHNatura.enableBerryBushes | PHNatura.enableNetherBerryBushes) - GameRegistry.registerWorldGenerator( - crops = new BaseCropWorldgen(), 20); // TODO 1.7 Find correct weight (param 2) - GameRegistry.registerWorldGenerator( - clouds = new BaseCloudWorldgen(), 20); // TODO 1.7 Find correct weight (param 2) - GameRegistry.registerWorldGenerator( - trees = new BaseTreeWorldgen(), 20); // TODO 1.7 Find correct weight (param 2) + GameRegistry.registerWorldGenerator(crops = new BaseCropWorldgen(), 20); // TODO 1.7 Find correct weight + // (param 2) + GameRegistry.registerWorldGenerator(clouds = new BaseCloudWorldgen(), 20); // TODO 1.7 Find correct weight + // (param 2) + GameRegistry.registerWorldGenerator(trees = new BaseTreeWorldgen(), 20); // TODO 1.7 Find correct weight (param + // 2) proxy.registerRenderer(); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new NGuiHandler()); @@ -147,12 +152,9 @@ public void postInit(FMLPostInitializationEvent evt) { /** * Runtime IMC Handler * - * Message tag: set-worldgen-overrides - * Message NBT data: - * dimensions: int[] - array of dimension IDs to update - * settings: int[] - array of settings to set for the corresponding dimension IDs - * Both arrays must be of the same length - * Settings format: integer with bitfields, enable bits: 1 = crops (berry bushes), 2 = clouds, 4 = trees + * Message tag: set-worldgen-overrides Message NBT data: dimensions: int[] - array of dimension IDs to update + * settings: int[] - array of settings to set for the corresponding dimension IDs Both arrays must be of the same + * length Settings format: integer with bitfields, enable bits: 1 = crops (berry bushes), 2 = clouds, 4 = trees */ @SubscribeEvent public void tickEvent(TickEvent.ServerTickEvent event) { @@ -214,8 +216,7 @@ public void interactEvent(EntityInteractEvent event) { if (event.target instanceof EntityCow || event.target instanceof EntitySheep) { ItemStack equipped = event.entityPlayer.getCurrentEquippedItem(); EntityAnimal creature = (EntityAnimal) event.target; - if (equipped != null - && equipped.getItem() == NContent.plantItem + if (equipped != null && equipped.getItem() == NContent.plantItem && equipped.getItemDamage() == 0 && creature.getGrowingAge() == 0 && !creature.isInLove()) { @@ -236,12 +237,11 @@ public void interactEvent(EntityInteractEvent event) { @SubscribeEvent public void spawnEvent(EntityJoinWorldEvent event) { if (event.entity instanceof EntityCow || event.entity instanceof EntitySheep) { - ((EntityLiving) event.entity) - .tasks.addTask( - 3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.plantItem, false)); + ((EntityLiving) event.entity).tasks + .addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.plantItem, false)); } else if (event.entity instanceof EntityChicken) { - ((EntityLiving) event.entity) - .tasks.addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.seeds, false)); + ((EntityLiving) event.entity).tasks + .addTask(3, new EntityAITempt((EntityCreature) event.entity, 0.25F, NContent.seeds, false)); } } diff --git a/src/main/java/mods/natura/blocks/CloudBlock.java b/src/main/java/mods/natura/blocks/CloudBlock.java index 2f8ee236..b0bb4a69 100644 --- a/src/main/java/mods/natura/blocks/CloudBlock.java +++ b/src/main/java/mods/natura/blocks/CloudBlock.java @@ -3,6 +3,7 @@ import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -16,8 +17,9 @@ import net.minecraft.world.World; public class CloudBlock extends NBlock { + public CloudBlock() { - super(Natura.cloud, 0.3F, new String[] {"cloud_white", "cloud_gray", "cloud_dark", "cloud_sulfur"}); + super(Natura.cloud, 0.3F, new String[] { "cloud_white", "cloud_gray", "cloud_dark", "cloud_sulfur" }); this.setStepSound(soundTypeCloth); this.setBlockName("cloud"); this.setCreativeTab(NaturaTab.tab); @@ -36,8 +38,7 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e y, z, 1, - entityarrow.shootingEntity instanceof EntityLiving - ? (EntityLiving) entityarrow.shootingEntity + entityarrow.shootingEntity instanceof EntityLiving ? (EntityLiving) entityarrow.shootingEntity : null); world.setBlockToAir(x, y, z); return; @@ -51,11 +52,10 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 3 - && player.getCurrentEquippedItem() != null + if (meta == 3 && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel) { world.setBlockToAir(x, y, z); this.explode(world, x, y, z, 1, player); @@ -66,11 +66,9 @@ public boolean onBlockActivated( @Override public void onBlockDestroyedByExplosion(World world, int x, int y, int z, Explosion par5Explosion) { - /*int meta = world.getBlockMetadata(x, y, z); - if (meta == 3) - { - this.explode(world, x, y, z, 1, null); - }*/ + /* + * int meta = world.getBlockMetadata(x, y, z); if (meta == 3) { this.explode(world, x, y, z, 1, null); } + */ } public void explode(World world, int x, int y, int z, int size, EntityLivingBase living) { diff --git a/src/main/java/mods/natura/blocks/GrassBlock.java b/src/main/java/mods/natura/blocks/GrassBlock.java index f00d3424..0c7f4962 100644 --- a/src/main/java/mods/natura/blocks/GrassBlock.java +++ b/src/main/java/mods/natura/blocks/GrassBlock.java @@ -1,10 +1,10 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.client.GrassColorizerAlternate; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +17,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.BiomeGenBase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class GrassBlock extends Block { + public GrassBlock() { super(Material.grass); setHardness(0.6F); @@ -55,9 +59,9 @@ public int getBlockColor() { @Override @SideOnly(Side.CLIENT) public int getRenderColor(int meta) { - /*if (par1 % 8 == 0) - return this.getBlockColor(); - return 0xFFFFFF;*/ + /* + * if (par1 % 8 == 0) return this.getBlockColor(); return 0xFFFFFF; + */ double d0 = 0.5D; double d1 = 1.0D; switch (meta) { diff --git a/src/main/java/mods/natura/blocks/GrassSlab.java b/src/main/java/mods/natura/blocks/GrassSlab.java index 12cff5ce..3f8554f7 100644 --- a/src/main/java/mods/natura/blocks/GrassSlab.java +++ b/src/main/java/mods/natura/blocks/GrassSlab.java @@ -1,10 +1,10 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.client.GrassColorizerAlternate; import mods.natura.common.NaturaTab; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -16,7 +16,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.BiomeGenBase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class GrassSlab extends NSlabBase { + public GrassSlab() { super(Material.ground); setHardness(0.6F); @@ -54,9 +58,9 @@ public int getBlockColor() { @Override @SideOnly(Side.CLIENT) public int getRenderColor(int meta) { - /*if (par1 % 8 == 0) - return this.getBlockColor(); - return 0xFFFFFF;*/ + /* + * if (par1 % 8 == 0) return this.getBlockColor(); return 0xFFFFFF; + */ double d0 = 0.5D; double d1 = 1.0D; switch (meta) { diff --git a/src/main/java/mods/natura/blocks/NBlock.java b/src/main/java/mods/natura/blocks/NBlock.java index 98ac03c3..bafb9ebb 100644 --- a/src/main/java/mods/natura/blocks/NBlock.java +++ b/src/main/java/mods/natura/blocks/NBlock.java @@ -1,9 +1,9 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +12,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NBlock extends Block { + public String[] textureNames; public IIcon[] icons; diff --git a/src/main/java/mods/natura/blocks/NButton.java b/src/main/java/mods/natura/blocks/NButton.java index c323416d..bf36c88a 100644 --- a/src/main/java/mods/natura/blocks/NButton.java +++ b/src/main/java/mods/natura/blocks/NButton.java @@ -1,14 +1,17 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockButton; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NButton extends BlockButton { + Block modelBlock; int modelMeta; diff --git a/src/main/java/mods/natura/blocks/NFenceGate.java b/src/main/java/mods/natura/blocks/NFenceGate.java index 598cf510..a1548da7 100644 --- a/src/main/java/mods/natura/blocks/NFenceGate.java +++ b/src/main/java/mods/natura/blocks/NFenceGate.java @@ -1,14 +1,17 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NFenceGate extends BlockFenceGate { + Block modelBlock; int modelMeta; diff --git a/src/main/java/mods/natura/blocks/NLadder.java b/src/main/java/mods/natura/blocks/NLadder.java index 649760c3..45aaca31 100644 --- a/src/main/java/mods/natura/blocks/NLadder.java +++ b/src/main/java/mods/natura/blocks/NLadder.java @@ -1,9 +1,9 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.BlockLadder; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -11,7 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NLadder extends BlockLadder { + public String[] textureNames; public IIcon[] icons; diff --git a/src/main/java/mods/natura/blocks/NPressurePlate.java b/src/main/java/mods/natura/blocks/NPressurePlate.java index 29ca9dba..29fd5ccd 100644 --- a/src/main/java/mods/natura/blocks/NPressurePlate.java +++ b/src/main/java/mods/natura/blocks/NPressurePlate.java @@ -1,15 +1,18 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockPressurePlate; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NPressurePlate extends BlockPressurePlate { + Block modelBlock; int modelMeta; diff --git a/src/main/java/mods/natura/blocks/NSlabBase.java b/src/main/java/mods/natura/blocks/NSlabBase.java index 5e5fce8b..e8c61c99 100644 --- a/src/main/java/mods/natura/blocks/NSlabBase.java +++ b/src/main/java/mods/natura/blocks/NSlabBase.java @@ -1,9 +1,9 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +16,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NSlabBase extends Block { + Block modelBlock; int startingMeta; int totalSize; @@ -35,8 +39,8 @@ public NSlabBase(Material material, Block model, int meta, int totalSize) { } @Override - public void addCollisionBoxesToList( - World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, + Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } @@ -55,16 +59,8 @@ public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) } @Override - public int onBlockPlaced( - World par1World, - int blockX, - int blockY, - int blockZ, - int side, - float clickX, - float clickY, - float clickZ, - int metadata) { + public int onBlockPlaced(World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, + float clickZ, int metadata) { if (side == 1) return metadata; if (side == 0 || clickY >= 0.5F) return metadata | 8; diff --git a/src/main/java/mods/natura/blocks/NStairs.java b/src/main/java/mods/natura/blocks/NStairs.java index 9c0b0ba3..96909888 100644 --- a/src/main/java/mods/natura/blocks/NStairs.java +++ b/src/main/java/mods/natura/blocks/NStairs.java @@ -1,10 +1,12 @@ package mods.natura.blocks; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; public class NStairs extends BlockStairs { + public NStairs(Block par2Block, int par3) { super(par2Block, par3); this.setCreativeTab(NaturaTab.tab); diff --git a/src/main/java/mods/natura/blocks/NTrapdoor.java b/src/main/java/mods/natura/blocks/NTrapdoor.java index c4d36d92..bc06f68a 100644 --- a/src/main/java/mods/natura/blocks/NTrapdoor.java +++ b/src/main/java/mods/natura/blocks/NTrapdoor.java @@ -1,14 +1,17 @@ package mods.natura.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.block.BlockTrapDoor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NTrapdoor extends BlockTrapDoor { + String textureName; public NTrapdoor(Material material, String texture) { diff --git a/src/main/java/mods/natura/blocks/NaturaSnow.java b/src/main/java/mods/natura/blocks/NaturaSnow.java index de65b6b5..abefb772 100644 --- a/src/main/java/mods/natura/blocks/NaturaSnow.java +++ b/src/main/java/mods/natura/blocks/NaturaSnow.java @@ -1,12 +1,14 @@ package mods.natura.blocks; import java.util.Random; + import net.minecraft.block.BlockSnow; import net.minecraft.init.Blocks; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; public class NaturaSnow extends BlockSnow { + public NaturaSnow() { super(); } diff --git a/src/main/java/mods/natura/blocks/crops/BerryBush.java b/src/main/java/mods/natura/blocks/crops/BerryBush.java index ff9bcdba..59e8511c 100644 --- a/src/main/java/mods/natura/blocks/crops/BerryBush.java +++ b/src/main/java/mods/natura/blocks/crops/BerryBush.java @@ -1,12 +1,12 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.client.BerryRender; import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; @@ -26,20 +26,16 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BerryBush extends BlockLeavesBase implements IPlantable { + Random random; public IIcon[] fastIcons; public IIcon[] fancyIcons; - public static String[] textureNames = new String[] { - "raspberry", - "blueberry", - "blackberry", - "geoberry", - "raspberry_ripe", - "blueberry_ripe", - "blackberry_ripe", - "geoberry_ripe" - }; + public static String[] textureNames = new String[] { "raspberry", "blueberry", "blackberry", "geoberry", + "raspberry_ripe", "blueberry_ripe", "blackberry_ripe", "geoberry_ripe" }; public BerryBush() { super(Material.leaves, false); @@ -150,10 +146,11 @@ public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player /* Right-click harvests berries */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - /*if (world.isRemote) - return false;*/ + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { + /* + * if (world.isRemote) return false; + */ int meta = world.getBlockMetadata(x, y, z); if (meta >= 12) { diff --git a/src/main/java/mods/natura/blocks/crops/CropBlock.java b/src/main/java/mods/natura/blocks/crops/CropBlock.java index 8654b855..546a6ebe 100644 --- a/src/main/java/mods/natura/blocks/crops/CropBlock.java +++ b/src/main/java/mods/natura/blocks/crops/CropBlock.java @@ -1,11 +1,11 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Random; + import mods.natura.client.CropRender; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.IGrowable; @@ -20,7 +20,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class CropBlock extends BlockBush implements IGrowable { + public CropBlock() { super(); this.setTickRandomly(true); @@ -83,7 +87,11 @@ public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player if (meta == 8) { world.setBlock(x, y, z, this, 6, 3); EntityItem entityitem = new EntityItem( - world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(NContent.plantItem, 1, 3)); + world, + player.posX, + player.posY - 1.0D, + player.posZ, + new ItemStack(NContent.plantItem, 1, 3)); world.spawnEntityInWorld(entityitem); entityitem.onCollideWithPlayer(player); } @@ -92,10 +100,11 @@ public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player /* Right-click harvests crops */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - /*if (world.isRemote) - return false;*/ + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { + /* + * if (world.isRemote) return false; + */ int meta = world.getBlockMetadata(x, y, z); if (meta == 8) { @@ -103,7 +112,11 @@ public boolean onBlockActivated( world.setBlock(x, y, z, this, 6, 3); EntityItem entityitem = new EntityItem( - world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(NContent.plantItem, 1, 3)); + world, + player.posX, + player.posY - 1.0D, + player.posZ, + new ItemStack(NContent.plantItem, 1, 3)); world.spawnEntityInWorld(entityitem); entityitem.onCollideWithPlayer(player); return true; @@ -118,9 +131,8 @@ public float getBlockHardness(World world, int x, int y, int z) { } public IIcon[] icons; - public String[] textureNames = new String[] { - "barley_1", "barley_2", "barley_3", "barley_4", "cotton_1", "cotton_2", "cotton_3", "cotton_4", "cotton_5" - }; + public String[] textureNames = new String[] { "barley_1", "barley_2", "barley_3", "barley_4", "cotton_1", + "cotton_2", "cotton_3", "cotton_4", "cotton_5" }; @Override @SideOnly(Side.CLIENT) @@ -205,12 +217,10 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad return ret; } - /*@Override - public int quantityDropped(int meta, int fortune, Random random) { - if (meta % 4 == 0) - return 1+random.nextInt(fortune+1); - return random.nextInt(meta/4); - }*/ + /* + * @Override public int quantityDropped(int meta, int fortune, Random random) { if (meta % 4 == 0) return + * 1+random.nextInt(fortune+1); return random.nextInt(meta/4); } + */ /* only called by clickMiddleMouseButton , and passed to inventory.setCurrentItem (along with isCreative) */ @SideOnly(Side.CLIENT) @@ -229,7 +239,7 @@ public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) { return EnumPlantType.Crop; } - /* Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants. */ + /* Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants. */ @Override public boolean canBlockStay(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); // Wild crops can stay diff --git a/src/main/java/mods/natura/blocks/crops/FlowerBlock.java b/src/main/java/mods/natura/blocks/crops/FlowerBlock.java index 6b48dbc2..be666d8d 100644 --- a/src/main/java/mods/natura/blocks/crops/FlowerBlock.java +++ b/src/main/java/mods/natura/blocks/crops/FlowerBlock.java @@ -1,16 +1,18 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockFlower; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class FlowerBlock extends BlockFlower { + public FlowerBlock() { super(0); setCreativeTab(CreativeTabs.tabDecorations); diff --git a/src/main/java/mods/natura/blocks/crops/Glowshroom.java b/src/main/java/mods/natura/blocks/crops/Glowshroom.java index 7c90240f..f5e9de41 100644 --- a/src/main/java/mods/natura/blocks/crops/Glowshroom.java +++ b/src/main/java/mods/natura/blocks/crops/Glowshroom.java @@ -1,12 +1,12 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NaturaTab; import mods.natura.worldgen.GlowshroomGenBlueGreen; import mods.natura.worldgen.GlowshroomGenPurple; + import net.minecraft.block.BlockMushroom; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -16,9 +16,13 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Glowshroom extends BlockMushroom { + IIcon[] icons; - String[] textureNames = {"green", "purple", "blue"}; + String[] textureNames = { "green", "purple", "blue" }; public Glowshroom() { super(); diff --git a/src/main/java/mods/natura/blocks/crops/HerbBlock.java b/src/main/java/mods/natura/blocks/crops/HerbBlock.java index 4ea1a9c4..49088178 100644 --- a/src/main/java/mods/natura/blocks/crops/HerbBlock.java +++ b/src/main/java/mods/natura/blocks/crops/HerbBlock.java @@ -1,8 +1,10 @@ package mods.natura.blocks.crops; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,6 +14,7 @@ import net.minecraftforge.common.EnumPlantType; public class HerbBlock extends CropBlock { + protected HerbBlock() { super(); this.setTickRandomly(true); @@ -82,7 +85,7 @@ public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) { return EnumPlantType.Cave; } - /* Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants. */ + /* Can this block stay at this position. Similar to canPlaceBlockAt except gets checked often with plants. */ @Override public boolean canBlockStay(World par1World, int x, int y, int z) { Block soil = par1World.getBlock(x, y - 1, z); diff --git a/src/main/java/mods/natura/blocks/crops/LargeGlowshroom.java b/src/main/java/mods/natura/blocks/crops/LargeGlowshroom.java index c5a8a768..23076a10 100644 --- a/src/main/java/mods/natura/blocks/crops/LargeGlowshroom.java +++ b/src/main/java/mods/natura/blocks/crops/LargeGlowshroom.java @@ -1,9 +1,9 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +17,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class LargeGlowshroom extends Block { + private final String mushroomType; @SideOnly(Side.CLIENT) @@ -40,20 +44,13 @@ public LargeGlowshroom(Material material, String type) { @SideOnly(Side.CLIENT) @Override public IIcon getIcon(int side, int meta) { - return meta == 10 && side > 1 - ? this.iconStem - : (meta >= 1 && meta <= 9 && side == 1 - ? this.iconSkin - : (meta >= 1 && meta <= 3 && side == 2 - ? this.iconSkin - : (meta >= 7 && meta <= 9 && side == 3 - ? this.iconSkin - : ((meta == 1 || meta == 4 || meta == 7) && side == 4 - ? this.iconSkin - : ((meta == 3 || meta == 6 || meta == 9) && side == 5 - ? this.iconSkin - : (meta == 14 - ? this.iconSkin + return meta == 10 && side > 1 ? this.iconStem + : (meta >= 1 && meta <= 9 && side == 1 ? this.iconSkin + : (meta >= 1 && meta <= 3 && side == 2 ? this.iconSkin + : (meta >= 7 && meta <= 9 && side == 3 ? this.iconSkin + : ((meta == 1 || meta == 4 || meta == 7) && side == 4 ? this.iconSkin + : ((meta == 3 || meta == 6 || meta == 9) && side == 5 ? this.iconSkin + : (meta == 14 ? this.iconSkin : (meta == 15 ? this.iconStem : this.iconInside))))))); } @@ -107,10 +104,10 @@ public Item getItemDropped(int par1, Random par2Random, int par3) { } /* only called by clickMiddleMouseButton , and passed to inventory.setCurrentItem (along with isCreative) */ - /*@SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z) { - return Item.getItemFromBlock(NContent.glowshroom); - }*/ + /* + * @SideOnly(Side.CLIENT) public Item getItem(World world, int x, int y, int z) { return + * Item.getItemFromBlock(NContent.glowshroom); } + */ @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/mods/natura/blocks/crops/NetherBerryBush.java b/src/main/java/mods/natura/blocks/crops/NetherBerryBush.java index 674ec1ac..ebee3508 100644 --- a/src/main/java/mods/natura/blocks/crops/NetherBerryBush.java +++ b/src/main/java/mods/natura/blocks/crops/NetherBerryBush.java @@ -1,12 +1,12 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.client.BerryRender; import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; @@ -25,20 +25,16 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherBerryBush extends BlockLeavesBase implements IPlantable { + Random random; public IIcon[] fastIcons; public IIcon[] fancyIcons; - public static String[] textureNames = new String[] { - "blightberry", - "duskberry", - "skyberry", - "stingberry", - "blightberry_ripe", - "duskberry_ripe", - "skyberry_ripe", - "stingberry_ripe" - }; + public static String[] textureNames = new String[] { "blightberry", "duskberry", "skyberry", "stingberry", + "blightberry_ripe", "duskberry_ripe", "skyberry_ripe", "stingberry_ripe" }; public NetherBerryBush() { super(Material.leaves, false); @@ -148,8 +144,8 @@ public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player /* Right-click harvests berries */ @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { if (world.isRemote) return false; int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/mods/natura/blocks/crops/ThornVines.java b/src/main/java/mods/natura/blocks/crops/ThornVines.java index c14c68bb..ded6e6f7 100644 --- a/src/main/java/mods/natura/blocks/crops/ThornVines.java +++ b/src/main/java/mods/natura/blocks/crops/ThornVines.java @@ -1,9 +1,8 @@ package mods.natura.blocks.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.Natura; import mods.natura.common.NaturaTab; + import net.minecraft.block.BlockVine; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -13,7 +12,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ThornVines extends BlockVine { + public ThornVines() { super(); this.setCreativeTab(NaturaTab.tab); @@ -54,8 +57,9 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e } } - /*public int onBlockPlaced(World world, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { - return 15; - }*/ + /* + * public int onBlockPlaced(World world, int par2, int par3, int par4, int par5, float par6, float par7, float par8, + * int par9) { return 15; } + */ } diff --git a/src/main/java/mods/natura/blocks/nether/HeatSand.java b/src/main/java/mods/natura/blocks/nether/HeatSand.java index 397ba946..d20db320 100644 --- a/src/main/java/mods/natura/blocks/nether/HeatSand.java +++ b/src/main/java/mods/natura/blocks/nether/HeatSand.java @@ -1,8 +1,7 @@ package mods.natura.blocks.nether; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,7 +14,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class HeatSand extends BlockFalling { + IIcon[] icons; public HeatSand() { @@ -46,7 +49,8 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e } else if (entity instanceof EntityLiving && !entity.isImmuneToFire()) { entity.attackEntityFrom(DamageSource.inFire, 1); } - /*entity.motionX *= 0.4D; - entity.motionZ *= 0.4D;*/ + /* + * entity.motionX *= 0.4D; entity.motionZ *= 0.4D; + */ } } diff --git a/src/main/java/mods/natura/blocks/nether/NetherGlass.java b/src/main/java/mods/natura/blocks/nether/NetherGlass.java index f862ead4..c8a8e5f5 100644 --- a/src/main/java/mods/natura/blocks/nether/NetherGlass.java +++ b/src/main/java/mods/natura/blocks/nether/NetherGlass.java @@ -1,10 +1,10 @@ package mods.natura.blocks.nether; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,7 +20,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherGlass extends Block { + public NetherGlass() { super(Material.glass); } diff --git a/src/main/java/mods/natura/blocks/nether/TaintedSoil.java b/src/main/java/mods/natura/blocks/nether/TaintedSoil.java index fdae1b74..66ad62cd 100644 --- a/src/main/java/mods/natura/blocks/nether/TaintedSoil.java +++ b/src/main/java/mods/natura/blocks/nether/TaintedSoil.java @@ -3,6 +3,7 @@ import static net.minecraftforge.common.util.ForgeDirection.UP; import mods.natura.blocks.NBlock; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -12,8 +13,12 @@ import net.minecraftforge.common.util.ForgeDirection; public class TaintedSoil extends NBlock { + public TaintedSoil() { - super(Material.ground, 2.2f, new String[] {"tainted_soil", "tainted_farmland_dry", "tainted_farmland_heated"}); + super( + Material.ground, + 2.2f, + new String[] { "tainted_soil", "tainted_farmland_dry", "tainted_farmland_heated" }); this.setStepSound(Block.soundTypeGravel); this.setResistance(25f); } diff --git a/src/main/java/mods/natura/blocks/overrides/AlternateBookshelf.java b/src/main/java/mods/natura/blocks/overrides/AlternateBookshelf.java index ad088b52..65b40177 100644 --- a/src/main/java/mods/natura/blocks/overrides/AlternateBookshelf.java +++ b/src/main/java/mods/natura/blocks/overrides/AlternateBookshelf.java @@ -1,9 +1,9 @@ package mods.natura.blocks.overrides; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NContent; + import net.minecraft.block.BlockBookshelf; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -12,7 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class AlternateBookshelf extends BlockBookshelf { + IIcon[] icons; public AlternateBookshelf() { diff --git a/src/main/java/mods/natura/blocks/overrides/AlternateFence.java b/src/main/java/mods/natura/blocks/overrides/AlternateFence.java index 4dde3388..e2fb7429 100644 --- a/src/main/java/mods/natura/blocks/overrides/AlternateFence.java +++ b/src/main/java/mods/natura/blocks/overrides/AlternateFence.java @@ -1,10 +1,10 @@ package mods.natura.blocks.overrides; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.client.FenceRender; import mods.natura.common.NContent; + import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +14,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class AlternateFence extends BlockFence { + public AlternateFence(Material material) { super("", material); } diff --git a/src/main/java/mods/natura/blocks/overrides/AlternatePressurePlate.java b/src/main/java/mods/natura/blocks/overrides/AlternatePressurePlate.java index d6b8b29e..5543f075 100644 --- a/src/main/java/mods/natura/blocks/overrides/AlternatePressurePlate.java +++ b/src/main/java/mods/natura/blocks/overrides/AlternatePressurePlate.java @@ -4,6 +4,7 @@ import net.minecraft.block.material.Material; public class AlternatePressurePlate extends BlockPressurePlate { + public AlternatePressurePlate(String par1Str, Material material, Sensitivity sensitivity) { super(par1Str, material, sensitivity); } diff --git a/src/main/java/mods/natura/blocks/overrides/AlternateWorkbench.java b/src/main/java/mods/natura/blocks/overrides/AlternateWorkbench.java index c0c73487..bb50cd20 100644 --- a/src/main/java/mods/natura/blocks/overrides/AlternateWorkbench.java +++ b/src/main/java/mods/natura/blocks/overrides/AlternateWorkbench.java @@ -1,11 +1,11 @@ package mods.natura.blocks.overrides; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.gui.NGuiHandler; + import net.minecraft.block.BlockWorkbench; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -15,7 +15,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class AlternateWorkbench extends BlockWorkbench { + IIcon[] topIcons; IIcon[] sideIcons; IIcon[] faceIcons; @@ -66,8 +70,8 @@ public void getSubBlocks(Item par1, CreativeTabs tabs, List list) { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, + float par8, float par9) { if (world.isRemote) { return true; } else { diff --git a/src/main/java/mods/natura/blocks/overrides/NetherLever.java b/src/main/java/mods/natura/blocks/overrides/NetherLever.java index a504a3af..5f7479f1 100644 --- a/src/main/java/mods/natura/blocks/overrides/NetherLever.java +++ b/src/main/java/mods/natura/blocks/overrides/NetherLever.java @@ -1,9 +1,11 @@ package mods.natura.blocks.overrides; import mods.natura.client.LeverRender; + import net.minecraft.block.BlockLever; public class NetherLever extends BlockLever { + public NetherLever() { super(); } diff --git a/src/main/java/mods/natura/blocks/overrides/NetherrackButton.java b/src/main/java/mods/natura/blocks/overrides/NetherrackButton.java index dd4bc70d..4aa25d28 100644 --- a/src/main/java/mods/natura/blocks/overrides/NetherrackButton.java +++ b/src/main/java/mods/natura/blocks/overrides/NetherrackButton.java @@ -1,12 +1,14 @@ package mods.natura.blocks.overrides; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockButton; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherrackButton extends BlockButton { + public NetherrackButton() { super(false); } diff --git a/src/main/java/mods/natura/blocks/tech/BlazeHopper.java b/src/main/java/mods/natura/blocks/tech/BlazeHopper.java index 7f7498ea..8d077f7c 100644 --- a/src/main/java/mods/natura/blocks/tech/BlazeHopper.java +++ b/src/main/java/mods/natura/blocks/tech/BlazeHopper.java @@ -1,14 +1,17 @@ package mods.natura.blocks.tech; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.client.HopperRender; import mods.natura.common.NContent; + import net.minecraft.block.BlockHopper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlazeHopper extends BlockHopper { + @SideOnly(Side.CLIENT) private IIcon hopperIcon; @@ -43,8 +46,7 @@ public void registerBlockIcons(IIconRegister par1IconRegister) { @SideOnly(Side.CLIENT) public static IIcon hopperIcon(String par0Str) { - return par0Str.equals("hopper_outside") - ? NContent.netherHopper.hopperIcon + return par0Str.equals("hopper_outside") ? NContent.netherHopper.hopperIcon : (par0Str.equals("hopper_inside") ? NContent.netherHopper.hopperInsideIcon : null); } diff --git a/src/main/java/mods/natura/blocks/tech/BlazeRail.java b/src/main/java/mods/natura/blocks/tech/BlazeRail.java index 392cacbb..10e3632b 100644 --- a/src/main/java/mods/natura/blocks/tech/BlazeRail.java +++ b/src/main/java/mods/natura/blocks/tech/BlazeRail.java @@ -5,6 +5,7 @@ import net.minecraft.world.World; public class BlazeRail extends BlockRail { + public BlazeRail() { super(); } diff --git a/src/main/java/mods/natura/blocks/tech/BlazeRailDetector.java b/src/main/java/mods/natura/blocks/tech/BlazeRailDetector.java index 4e07d3aa..8b38ea4c 100644 --- a/src/main/java/mods/natura/blocks/tech/BlazeRailDetector.java +++ b/src/main/java/mods/natura/blocks/tech/BlazeRailDetector.java @@ -5,6 +5,7 @@ import net.minecraft.world.World; public class BlazeRailDetector extends BlockRailDetector { + public BlazeRailDetector() { super(); } diff --git a/src/main/java/mods/natura/blocks/tech/BlazeRailPowered.java b/src/main/java/mods/natura/blocks/tech/BlazeRailPowered.java index fb18df10..745eeaab 100644 --- a/src/main/java/mods/natura/blocks/tech/BlazeRailPowered.java +++ b/src/main/java/mods/natura/blocks/tech/BlazeRailPowered.java @@ -5,6 +5,7 @@ import net.minecraft.world.World; public class BlazeRailPowered extends BlockRailPowered { + boolean activator; public BlazeRailPowered(boolean activator) { @@ -18,13 +19,14 @@ public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int } /** - * This function is called by any minecart that passes over this rail. - * It is called once per update tick that the minecart is on the rail. + * This function is called by any minecart that passes over this rail. It is called once per update tick that the + * minecart is on the rail. + * * @param world The world. - * @param cart The cart on the rail. - * @param y The rail X coordinate. - * @param x The rail Y coordinate. - * @param z The rail Z coordinate. + * @param cart The cart on the rail. + * @param y The rail X coordinate. + * @param x The rail Y coordinate. + * @param z The rail Z coordinate. */ @Override public void onMinecartPass(World world, EntityMinecart cart, int x, int y, int z) { diff --git a/src/main/java/mods/natura/blocks/tech/NetherPistonBase.java b/src/main/java/mods/natura/blocks/tech/NetherPistonBase.java index 193f2660..4cf0aaf4 100644 --- a/src/main/java/mods/natura/blocks/tech/NetherPistonBase.java +++ b/src/main/java/mods/natura/blocks/tech/NetherPistonBase.java @@ -1,9 +1,9 @@ package mods.natura.blocks.tech; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.BlockPistonMoving; @@ -23,8 +23,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + // TODO 1.7 make sure this class still works (extending behavior) public class NetherPistonBase extends BlockPistonBase { + @SideOnly(Side.CLIENT) private IIcon iIcon; @@ -47,19 +51,15 @@ public IIcon getPistonExtensionTexture() { return this.tIcon; } - /*public int getRenderType () - { - return PistonRender.model; - }*/ + /* + * public int getRenderType () { return PistonRender.model; } + */ @SideOnly(Side.CLIENT) public static IIcon getBaseIcon(String par0Str) { - return par0Str == "piston_side" - ? NContent.piston.blockIcon - : (par0Str == "piston_top_normal" - ? NContent.piston.tIcon - : (par0Str == "piston_top_sticky" - ? NContent.piston.tIcon + return par0Str == "piston_side" ? NContent.piston.blockIcon + : (par0Str == "piston_top_normal" ? NContent.piston.tIcon + : (par0Str == "piston_top_sticky" ? NContent.piston.tIcon : (par0Str == "piston_inner" ? NContent.piston.iIcon : null))); } @@ -67,8 +67,8 @@ public static IIcon getBaseIcon(String par0Str) { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { this.blockIcon = par1IconRegister.registerIcon("natura:piston_side"); - this.tIcon = - par1IconRegister.registerIcon(this.sticky ? "natura:piston_top_sticky" : "natura:piston_top_normal"); + this.tIcon = par1IconRegister + .registerIcon(this.sticky ? "natura:piston_top_sticky" : "natura:piston_top_normal"); this.iIcon = par1IconRegister.registerIcon("natura:piston_inner"); this.bIcon = par1IconRegister.registerIcon("natura:piston_bottom"); } @@ -77,23 +77,19 @@ public void registerBlockIcons(IIconRegister par1IconRegister) { @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { int k = getOrientation(meta); - return k > 5 - ? this.tIcon + return k > 5 ? this.tIcon : (side == k - ? (!isExtended(meta) - && this.minX <= 0.0D - && this.minY <= 0.0D - && this.minZ <= 0.0D - && this.maxX >= 1.0D - && this.maxY >= 1.0D - && this.maxZ >= 1.0D - ? this.tIcon - : this.iIcon) + ? (!isExtended(meta) && this.minX <= 0.0D + && this.minY <= 0.0D + && this.minZ <= 0.0D + && this.maxX >= 1.0D + && this.maxY >= 1.0D + && this.maxZ >= 1.0D ? this.tIcon : this.iIcon) : (side == Facing.oppositeSide[k] ? this.bIcon : this.blockIcon)); } /** - * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two + * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block. */ @Override @@ -105,16 +101,8 @@ public boolean isOpaqueCube() { * Called upon block activation (right click on the block.) */ @Override - public boolean onBlockActivated( - World par1World, - int par2, - int par3, - int par4, - EntityPlayer par5EntityPlayer, - int par6, - float par7, - float par8, - float par9) { + public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, + int par6, float par7, float par8, float par9) { return false; } @@ -122,12 +110,7 @@ public boolean onBlockActivated( * Called when the block is placed in the world. */ @Override - public void onBlockPlacedBy( - World par1World, - int par2, - int par3, - int par4, - EntityLivingBase par5EntityLivingBase, + public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { int l = determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase); par1World.setBlockMetadataWithNotify(par2, par3, par4, l, 2); @@ -182,49 +165,45 @@ private void updatePistonState(World par1World, int par2, int par3, int par4) { * checks the block to that side to see if it is indirectly powered. */ private boolean isIndirectlyPowered(World par1World, int par2, int par3, int par4, int par5) { - return par5 != 0 && par1World.getIndirectPowerOutput(par2, par3 - 1, par4, 0) - ? true - : (par5 != 1 && par1World.getIndirectPowerOutput(par2, par3 + 1, par4, 1) - ? true - : (par5 != 2 && par1World.getIndirectPowerOutput(par2, par3, par4 - 1, 2) - ? true - : (par5 != 3 && par1World.getIndirectPowerOutput(par2, par3, par4 + 1, 3) - ? true - : (par5 != 5 && par1World.getIndirectPowerOutput(par2 + 1, par3, par4, 5) - ? true + return par5 != 0 && par1World.getIndirectPowerOutput(par2, par3 - 1, par4, 0) ? true + : (par5 != 1 && par1World.getIndirectPowerOutput(par2, par3 + 1, par4, 1) ? true + : (par5 != 2 && par1World.getIndirectPowerOutput(par2, par3, par4 - 1, 2) ? true + : (par5 != 3 && par1World.getIndirectPowerOutput(par2, par3, par4 + 1, 3) ? true + : (par5 != 5 && par1World.getIndirectPowerOutput(par2 + 1, par3, par4, 5) ? true : (par5 != 4 - && par1World.getIndirectPowerOutput( - par2 - 1, par3, par4, 4) - ? true - : (par1World.getIndirectPowerOutput(par2, par3, par4, 0) + && par1World.getIndirectPowerOutput(par2 - 1, par3, par4, 4) ? true - : (par1World.getIndirectPowerOutput( - par2, par3 + 2, par4, 1) + : (par1World.getIndirectPowerOutput(par2, par3, par4, 0) ? true : (par1World.getIndirectPowerOutput( - par2, par3 + 1, par4 - 1, 2) - ? true - : (par1World.getIndirectPowerOutput( - par2, par3 + 1, - par4 + 1, 3) - ? true + par2, + par3 + 2, + par4, + 1) ? true : (par1World - .getIndirectPowerOutput( - par2 - - 1, - par3 - + 1, - par4, - 4) - ? true - : par1World - .getIndirectPowerOutput( - par2 - + 1, - par3 - + 1, - par4, - 5))))))))))); + .getIndirectPowerOutput( + par2, + par3 + 1, + par4 - 1, + 2) ? true + : (par1World + .getIndirectPowerOutput( + par2, + par3 + 1, + par4 + 1, + 3) ? true + : (par1World + .getIndirectPowerOutput( + par2 - 1, + par3 + 1, + par4, + 4) ? true + : par1World + .getIndirectPowerOutput( + par2 + 1, + par3 + 1, + par4, + 5))))))))))); } /** @@ -295,8 +274,7 @@ public boolean onBlockEventReceived(World par1World, int par2, int par3, int par } } - if (!flag1 - && i2 != null + if (!flag1 && i2 != null && canPushBlock(i2, par1World, j1, k1, l1, false) && (i2.getMobilityFlag() == 0 || i2 == NContent.piston || i2 == NContent.pistonSticky)) { par2 += Facing.offsetsXForSide[par6]; @@ -304,7 +282,10 @@ && canPushBlock(i2, par1World, j1, k1, l1, false) par4 += Facing.offsetsZForSide[par6]; par1World.setBlock(par2, par3, par4, Blocks.piston, j2, 3); par1World.setTileEntity( - par2, par3, par4, BlockPistonMoving.getTileEntity(i2, j2, par6, false, false)); + par2, + par3, + par4, + BlockPistonMoving.getTileEntity(i2, j2, par6, false, false)); par1World.setBlockToAir(j1, k1, l1); } else if (!flag1) { par1World.setBlockToAir( @@ -378,14 +359,8 @@ public void setBlockBoundsForItemRender() { * mask.) Parameters: World, X, Y, Z, mask, list, colliding entity */ @Override - public void addCollisionBoxesToList( - World par1World, - int par2, - int par3, - int par4, - AxisAlignedBB par5AxisAlignedBB, - List par6List, - Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, + List par6List, Entity par7Entity) { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } @@ -425,8 +400,8 @@ public static boolean isExtended(int par0) { /** * gets the way this piston should face for that entity that placed it. */ - public static int determineOrientation( - World par0World, int par1, int par2, int par3, EntityLivingBase par4EntityLivingBase) { + public static int determineOrientation(World par0World, int par1, int par2, int par3, + EntityLivingBase par4EntityLivingBase) { if (MathHelper.abs((float) par4EntityLivingBase.posX - par1) < 2.0F && MathHelper.abs((float) par4EntityLivingBase.posZ - par3) < 2.0F) { double d0 = par4EntityLivingBase.posY + 1.82D - par4EntityLivingBase.yOffset; @@ -554,7 +529,13 @@ private boolean tryExtend(World par1World, int par2, int par3, int par4, int par // With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior. float chance = (i2 instanceof BlockSnow ? -1.0f : 1.0f); i2.dropBlockAsItemWithChance( - par1World, newX, newY, newZ, par1World.getBlockMetadata(newX, newY, newZ), chance, 0); + par1World, + newX, + newY, + newZ, + par1World.getBlockMetadata(newX, newY, newZ), + chance, + 0); par1World.setBlockToAir(newX, newY, newZ); } } @@ -583,11 +564,18 @@ private boolean tryExtend(World par1World, int par2, int par3, int par4, int par newY, newZ, BlockPistonMoving.getTileEntity( - NContent.pistonExtension, par5 | (this.sticky ? 8 : 0), par5, true, false)); + NContent.pistonExtension, + par5 | (this.sticky ? 8 : 0), + par5, + true, + false)); } else { par1World.setBlock(newX, newY, newZ, Blocks.piston, l3, 4); par1World.setTileEntity( - newX, newY, newZ, BlockPistonMoving.getTileEntity(k3, l3, par5, true, false)); + newX, + newY, + newZ, + BlockPistonMoving.getTileEntity(k3, l3, par5, true, false)); } aint[k2++] = k3; diff --git a/src/main/java/mods/natura/blocks/tech/NetherPistonExtension.java b/src/main/java/mods/natura/blocks/tech/NetherPistonExtension.java index 61cac3c1..92766fba 100644 --- a/src/main/java/mods/natura/blocks/tech/NetherPistonExtension.java +++ b/src/main/java/mods/natura/blocks/tech/NetherPistonExtension.java @@ -1,12 +1,14 @@ package mods.natura.blocks.tech; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockPistonExtension; import net.minecraft.util.Facing; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherPistonExtension extends BlockPistonExtension { + @SideOnly(Side.CLIENT) private IIcon head; @@ -24,13 +26,10 @@ public void setHeadTexture(IIcon par1Icon) { public IIcon getIcon(int par1, int par2) { int k = getDirectionMeta(par2); return par1 == k - ? (this.head != null - ? this.head - : ((par2 & 8) != 0 - ? NetherPistonBase.getBaseIcon("piston_top_sticky") + ? (this.head != null ? this.head + : ((par2 & 8) != 0 ? NetherPistonBase.getBaseIcon("piston_top_sticky") : NetherPistonBase.getBaseIcon("piston_top_normal"))) - : (k < 6 && par1 == Facing.oppositeSide[k] - ? NetherPistonBase.getBaseIcon("piston_top_normal") + : (k < 6 && par1 == Facing.oppositeSide[k] ? NetherPistonBase.getBaseIcon("piston_top_normal") : NetherPistonBase.getBaseIcon("piston_side")); } } diff --git a/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceBlock.java b/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceBlock.java index eaa1bc1f..5141446d 100644 --- a/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceBlock.java +++ b/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceBlock.java @@ -1,10 +1,10 @@ package mods.natura.blocks.tech; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import mods.natura.Natura; import mods.natura.gui.NGuiHandler; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,12 +21,16 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + /** * Abstract for blocks with inventories. * * @author mDiyo */ public class NetherrackFurnaceBlock extends BlockContainer { + protected Random rand = new Random(); public NetherrackFurnaceBlock() { @@ -48,8 +52,8 @@ public Object getModInstance() { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float clickX, + float clickY, float clickZ) { if (player.isSneaking()) return false; Integer integer = getGui(world, x, y, z, player); @@ -93,8 +97,7 @@ public void breakBlock(World par1World, int x, int y, int z, Block blockID, int new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { - entityitem.getEntityItem().setTagCompound((NBTTagCompound) - stack.getTagCompound().copy()); + entityitem.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); } float offset = 0.05F; @@ -222,8 +225,9 @@ public int getTextureIndex(int side) { @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { TileEntity logic = world.getTileEntity(x, y, z); - int direction = - (logic instanceof NetherrackFurnaceLogic) ? ((NetherrackFurnaceLogic) logic).getRenderDirection() : 0; + int direction = (logic instanceof NetherrackFurnaceLogic) + ? ((NetherrackFurnaceLogic) logic).getRenderDirection() + : 0; int meta = world.getBlockMetadata(x, y, z) % 8; if (meta == 0) { @@ -243,7 +247,7 @@ public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { @SideOnly(Side.CLIENT) public String[] getTextureNames() { - String[] textureNames = {"nfurnace_off", "nfurnace_on", "nfurnace_side", "nfurnace_top"}; + String[] textureNames = { "nfurnace_off", "nfurnace_on", "nfurnace_side", "nfurnace_top" }; return textureNames; } diff --git a/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceLogic.java b/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceLogic.java index 9db41f68..f2e68796 100644 --- a/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceLogic.java +++ b/src/main/java/mods/natura/blocks/tech/NetherrackFurnaceLogic.java @@ -1,9 +1,7 @@ package mods.natura.blocks.tech; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.BlockUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.block.material.Material; @@ -25,10 +23,15 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.MathHelper; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherrackFurnaceLogic extends TileEntityFurnace { - private static final int[] slots_top = new int[] {0}; - private static final int[] slots_bottom = new int[] {2, 1}; - private static final int[] slots_sides = new int[] {1}; + + private static final int[] slots_top = new int[] { 0 }; + private static final int[] slots_bottom = new int[] { 2, 1 }; + private static final int[] slots_sides = new int[] { 1 }; /** * The ItemStacks that hold the items currently being used in the furnace @@ -385,12 +388,9 @@ public static int getFuelTime(ItemStack par0ItemStack) { } } - if (item instanceof ItemTool - && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemSword - && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; - if (item instanceof ItemHoe - && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD")) return 200; + if (item instanceof ItemHoe && ((ItemHoe) item).getToolMaterialName().equals("WOOD")) return 200; if (item == Items.stick) return 100; if (item == Items.coal) return 1600; if (item == Items.lava_bucket) return 20000; @@ -412,8 +412,7 @@ public static boolean isItemFuel(ItemStack par0ItemStack) { */ @Override public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this - ? false + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D) <= 64.0D; } diff --git a/src/main/java/mods/natura/blocks/tech/RespawnObelisk.java b/src/main/java/mods/natura/blocks/tech/RespawnObelisk.java index 97e82677..88c2f33f 100644 --- a/src/main/java/mods/natura/blocks/tech/RespawnObelisk.java +++ b/src/main/java/mods/natura/blocks/tech/RespawnObelisk.java @@ -1,9 +1,9 @@ package mods.natura.blocks.tech; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import mods.natura.Natura; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,21 +14,31 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class RespawnObelisk extends Block { + public RespawnObelisk(Material material) { super(material); } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, + float hitY, float hitZ) { if (player.isSneaking()) return false; player.setSpawnChunk(new ChunkCoordinates(x, y, z), false, world.provider.dimensionId); if (!world.isRemote) player.addChatMessage(player.func_145748_c_().appendText("Spawn point set!")); world.setBlockMetadataWithNotify(x, y, z, 1, 3); world.playSound( - x + 0.5D, y + 0.5D, z + 0.5D, "portal.portal", 1.0F, Natura.random.nextFloat() * 0.4F + 0.8F, false); + x + 0.5D, + y + 0.5D, + z + 0.5D, + "portal.portal", + 1.0F, + Natura.random.nextFloat() * 0.4F + 0.8F, + false); return true; } diff --git a/src/main/java/mods/natura/blocks/trees/DarkTreeBlock.java b/src/main/java/mods/natura/blocks/trees/DarkTreeBlock.java index b77bc49c..b6f66c99 100644 --- a/src/main/java/mods/natura/blocks/trees/DarkTreeBlock.java +++ b/src/main/java/mods/natura/blocks/trees/DarkTreeBlock.java @@ -1,10 +1,10 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,9 +16,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class DarkTreeBlock extends Block { + public IIcon[] icons; - public String[] textureNames = new String[] {"darkwood_bark", "darkwood_heart", "fusewood_bark", "fusewood_heart"}; + public String[] textureNames = new String[] { "darkwood_bark", "darkwood_heart", "fusewood_bark", + "fusewood_heart" }; public DarkTreeBlock() { super(Material.wood); @@ -93,8 +98,8 @@ public void breakBlock(World par1World, int par2, int par3, int par4, int par5, * Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata */ @Override - public int onBlockPlaced( - World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { + public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, + float par8, int par9) { int j1 = par9 & 3; byte b0 = 0; diff --git a/src/main/java/mods/natura/blocks/trees/FruitTreeBlock.java b/src/main/java/mods/natura/blocks/trees/FruitTreeBlock.java index 39c9848d..c69f5ab9 100644 --- a/src/main/java/mods/natura/blocks/trees/FruitTreeBlock.java +++ b/src/main/java/mods/natura/blocks/trees/FruitTreeBlock.java @@ -1,12 +1,15 @@ package mods.natura.blocks.trees; import java.util.Random; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.item.Item; public class FruitTreeBlock extends BlockLog { + public FruitTreeBlock() { super(); this.setHardness(1.5F); @@ -16,29 +19,12 @@ public FruitTreeBlock() { this.setCreativeTab(NaturaTab.tab); } - /*public int getIcon(int side, int metadata) - { - int tex = blockIndexInTexture + (metadata % 4); - int orientation = metadata / 4; - - switch (orientation) //Ends of logs - { - case 0: - if (side == 0 || side == 1) - return tex + 16; - break; - case 1: - if (side == 4 || side == 5) - return tex + 16; - break; - case 2: - if (side == 2 || side == 3) - return tex + 16; - break; - } - - return tex; - }*/ + /* + * public int getIcon(int side, int metadata) { int tex = blockIndexInTexture + (metadata % 4); int orientation = + * metadata / 4; switch (orientation) //Ends of logs { case 0: if (side == 0 || side == 1) return tex + 16; break; + * case 1: if (side == 4 || side == 5) return tex + 16; break; case 2: if (side == 2 || side == 3) return tex + 16; + * break; } return tex; } + */ @Override public Item getItemDropped(int par1, Random par2Random, int par3) { @@ -50,21 +36,12 @@ public int damageDropped(int meta) { return meta % 4; } - /*public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) - { - return metadata % 4 != 2 ? blockFlammability[blockID] : 0; - } - - public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) - { - return metadata % 4 != 2 ? blockFireSpreadSpeed[blockID] : 0; - } - - @SideOnly(Side.CLIENT) - @Override - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) - { - for (int i = 0; i < 4; i++) - par3List.add(new ItemStack(par1, 1, i)); - }*/ + /* + * public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { return + * metadata % 4 != 2 ? blockFlammability[blockID] : 0; } public int getFireSpreadSpeed(World world, int x, int y, + * int z, int metadata, ForgeDirection face) { return metadata % 4 != 2 ? blockFireSpreadSpeed[blockID] : 0; } + * @SideOnly(Side.CLIENT) + * @Override public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < + * 4; i++) par3List.add(new ItemStack(par1, 1, i)); } + */ } diff --git a/src/main/java/mods/natura/blocks/trees/LogTwoxTwo.java b/src/main/java/mods/natura/blocks/trees/LogTwoxTwo.java index df53f485..a103b07f 100644 --- a/src/main/java/mods/natura/blocks/trees/LogTwoxTwo.java +++ b/src/main/java/mods/natura/blocks/trees/LogTwoxTwo.java @@ -1,11 +1,11 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,15 +16,18 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + /* * This class is for a single tree with a 2x2 base and inside textures */ public class LogTwoxTwo extends Block { + public IIcon[] icons; - public String[] textureNames = new String[] { - "bark", "heart_small", "upper_left", "upper_right", "side_left", "side_right", "lower_left", "lower_right" - }; + public String[] textureNames = new String[] { "bark", "heart_small", "upper_left", "upper_right", "side_left", + "side_right", "lower_left", "lower_right" }; public LogTwoxTwo(float hardness, Material material) { super(material); @@ -105,7 +108,7 @@ public static int limitToValidMetadata(int par0) { @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { if (meta == 15) // Fullbark - return icons[0]; + return icons[0]; // TODO: Rotating single log for 12, 13, 14 @@ -321,16 +324,8 @@ public IIcon getIcon(int side, int meta) { /* Combined stair and log placement */ @Override - public int onBlockPlaced( - World par1World, - int blockX, - int blockY, - int blockZ, - int side, - float clickX, - float clickY, - float clickZ, - int metadata) { + public int onBlockPlaced(World par1World, int blockX, int blockY, int blockZ, int side, float clickX, float clickY, + float clickZ, int metadata) { if (metadata >= 12) return metadata; int meta = metadata & 3; diff --git a/src/main/java/mods/natura/blocks/trees/NDoor.java b/src/main/java/mods/natura/blocks/trees/NDoor.java index d4456e8b..eb8e2f00 100644 --- a/src/main/java/mods/natura/blocks/trees/NDoor.java +++ b/src/main/java/mods/natura/blocks/trees/NDoor.java @@ -1,9 +1,9 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; @@ -17,7 +17,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NDoor extends BlockDoor { + private int meta; public IIcon[] icons; public IIcon[] iconsReverse; diff --git a/src/main/java/mods/natura/blocks/trees/NLeaves.java b/src/main/java/mods/natura/blocks/trees/NLeaves.java index 86f79b00..04af65e3 100644 --- a/src/main/java/mods/natura/blocks/trees/NLeaves.java +++ b/src/main/java/mods/natura/blocks/trees/NLeaves.java @@ -1,12 +1,12 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +19,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NLeaves extends BlockLeaves { + int[] adjacentTreeBlocks; public NLeaves() { @@ -55,8 +59,7 @@ public int colorMultiplier(IBlockAccess p_149720_1_, int p_149720_2_, int p_1497 for (int k1 = -1; k1 <= 1; ++k1) { for (int l1 = -1; l1 <= 1; ++l1) { - int i2 = p_149720_1_ - .getBiomeGenForCoords(p_149720_2_ + l1, p_149720_4_ + k1) + int i2 = p_149720_1_.getBiomeGenForCoords(p_149720_2_ + l1, p_149720_4_ + k1) .getBiomeFoliageColor(p_149720_2_ + l1, p_149720_3_, p_149720_4_ + k1); l += (i2 & 16711680) >> 16; i1 += (i2 & 65280) >> 8; @@ -117,8 +120,8 @@ public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) } @Override - public void dropBlockAsItemWithChance( - World par1World, int par2, int par3, int par4, int par5, float par6, int par7) { + public void dropBlockAsItemWithChance(World par1World, int par2, int par3, int par4, int par5, float par6, + int par7) { if (!par1World.isRemote) { ArrayList items = getDrops(par1World, par2, par3, par4, par5, par7); @@ -147,7 +150,7 @@ public IIcon getIcon(int side, int metadata) { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister iconRegister) { - String[] textureNames = new String[] {"redwood", "eucalyptus", "hopseed"}; + String[] textureNames = new String[] { "redwood", "eucalyptus", "hopseed" }; this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; @@ -159,7 +162,7 @@ public void registerBlockIcons(IIconRegister iconRegister) { /** * Returns true if the given side of this block type should be rendered, if the adjacent block is at the given - * coordinates. Args: blockAccess, x, y, z, side + * coordinates. Args: blockAccess, x, y, z, side */ @Override public boolean shouldSideBeRendered(IBlockAccess var1, int var2, int var3, int var4, int var5) { diff --git a/src/main/java/mods/natura/blocks/trees/NLeavesDark.java b/src/main/java/mods/natura/blocks/trees/NLeavesDark.java index f6a3c2cc..3111d1c2 100644 --- a/src/main/java/mods/natura/blocks/trees/NLeavesDark.java +++ b/src/main/java/mods/natura/blocks/trees/NLeavesDark.java @@ -1,11 +1,11 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -16,7 +16,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NLeavesDark extends NLeaves { + public NLeavesDark() { super(); this.setCreativeTab(NaturaTab.tab); @@ -25,7 +29,7 @@ public NLeavesDark() { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister iconRegister) { - String[] textureNames = new String[] {"darkwood", "darkwood_flowering", "darkwood_fruit", "fusewood"}; + String[] textureNames = new String[] { "darkwood", "darkwood_flowering", "darkwood_fruit", "fusewood" }; this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; diff --git a/src/main/java/mods/natura/blocks/trees/NLeavesNocolor.java b/src/main/java/mods/natura/blocks/trees/NLeavesNocolor.java index 365b716b..48631370 100644 --- a/src/main/java/mods/natura/blocks/trees/NLeavesNocolor.java +++ b/src/main/java/mods/natura/blocks/trees/NLeavesNocolor.java @@ -1,13 +1,13 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -19,7 +19,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NLeavesNocolor extends NLeaves { + public NLeavesNocolor() { super(); this.setCreativeTab(NaturaTab.tab); @@ -82,7 +86,7 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister iconRegister) { - String[] textureNames = new String[] {"sakura", "ghostwood", "bloodwood", "willow"}; + String[] textureNames = new String[] { "sakura", "ghostwood", "bloodwood", "willow" }; this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; diff --git a/src/main/java/mods/natura/blocks/trees/NSaplingBlock.java b/src/main/java/mods/natura/blocks/trees/NSaplingBlock.java index 82448233..5a71e6d3 100644 --- a/src/main/java/mods/natura/blocks/trees/NSaplingBlock.java +++ b/src/main/java/mods/natura/blocks/trees/NSaplingBlock.java @@ -1,9 +1,8 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; import mods.natura.worldgen.BloodTreeLargeGen; @@ -14,6 +13,7 @@ import mods.natura.worldgen.RedwoodTreeGen; import mods.natura.worldgen.SakuraTreeGen; import mods.natura.worldgen.WhiteTreeGen; + import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; @@ -28,11 +28,14 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NSaplingBlock extends BlockSapling { + public IIcon[] icons; - public String[] textureNames = - new String[] {"redwood", "eucalyptus", "hopseed", "sakura", "ghostwood", "bloodwood", "darkwood", "fusewood" - }; + public String[] textureNames = new String[] { "redwood", "eucalyptus", "hopseed", "sakura", "ghostwood", + "bloodwood", "darkwood", "fusewood" }; public NSaplingBlock() { super(); @@ -68,8 +71,7 @@ public boolean canPlaceBlockAt(World world, int x, int y, int z) { } public boolean canThisPlantGrowOnThisBlock(Block id) { - return id == Blocks.grass - || id == Blocks.dirt + return id == Blocks.grass || id == Blocks.dirt || id == Blocks.soul_sand || id == Blocks.netherrack || id == NContent.taintedSoil; @@ -90,9 +92,8 @@ public boolean canBlockStay(World world, int x, int y, int z) { case 6: case 7: Block netherSoil = world.getBlock(x, y - 1, z); - return netherSoil != null - && (netherSoil == Blocks.netherrack - || netherSoil.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this)); + return netherSoil != null && (netherSoil == Blocks.netherrack + || netherSoil.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this)); case 5: Block nSoil = world.getBlock(x, y + 1, z); return nSoil != null @@ -163,8 +164,8 @@ public IIcon getIcon(int side, int meta) { return icons[meta % 8]; } - public void func_149879_c( - World p_149879_1_, int p_149879_2_, int p_149879_3_, int p_149879_4_, Random p_149879_5_) { + public void func_149879_c(World p_149879_1_, int p_149879_2_, int p_149879_3_, int p_149879_4_, + Random p_149879_5_) { int l = p_149879_1_.getBlockMetadata(p_149879_2_, p_149879_3_, p_149879_4_); if ((l & 8) == 0) { @@ -203,18 +204,18 @@ public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List for (int i = 0; i < 8; i++) par3List.add(new ItemStack(par1, 1, i)); } - public boolean func_149851_a( - World p_149851_1_, int p_149851_2_, int p_149851_3_, int p_149851_4_, boolean p_149851_5_) { + public boolean func_149851_a(World p_149851_1_, int p_149851_2_, int p_149851_3_, int p_149851_4_, + boolean p_149851_5_) { return true; } - public boolean func_149852_a( - World p_149852_1_, Random p_149852_2_, int p_149852_3_, int p_149852_4_, int p_149852_5_) { + public boolean func_149852_a(World p_149852_1_, Random p_149852_2_, int p_149852_3_, int p_149852_4_, + int p_149852_5_) { return (double) p_149852_1_.rand.nextFloat() < 0.45D; } - public void func_149853_b( - World p_149853_1_, Random p_149853_2_, int p_149853_3_, int p_149853_4_, int p_149853_5_) { + public void func_149853_b(World p_149853_1_, Random p_149853_2_, int p_149853_3_, int p_149853_4_, + int p_149853_5_) { this.func_149879_c(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_, p_149853_2_); } } diff --git a/src/main/java/mods/natura/blocks/trees/OverworldLeaves.java b/src/main/java/mods/natura/blocks/trees/OverworldLeaves.java index d1704b3e..785478f6 100644 --- a/src/main/java/mods/natura/blocks/trees/OverworldLeaves.java +++ b/src/main/java/mods/natura/blocks/trees/OverworldLeaves.java @@ -1,10 +1,10 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -13,7 +13,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class OverworldLeaves extends NLeaves { + public OverworldLeaves() { super(); } @@ -21,7 +25,7 @@ public OverworldLeaves() { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister iconRegister) { - String[] textureNames = new String[] {"maple", "silverbell", "purpleheart", "tiger"}; + String[] textureNames = new String[] { "maple", "silverbell", "purpleheart", "tiger" }; this.fastIcons = new IIcon[textureNames.length]; this.fancyIcons = new IIcon[textureNames.length]; @@ -39,10 +43,9 @@ public int colorMultiplier(IBlockAccess world, int x, int y, int z) { return 0xcc5718; } - /*if (meta == 2) - { - return 0x451941; - }*/ + /* + * if (meta == 2) { return 0x451941; } + */ if (meta == 2) { int i1 = 0; diff --git a/src/main/java/mods/natura/blocks/trees/OverworldSapling.java b/src/main/java/mods/natura/blocks/trees/OverworldSapling.java index 97abbe2d..2ded4f5f 100644 --- a/src/main/java/mods/natura/blocks/trees/OverworldSapling.java +++ b/src/main/java/mods/natura/blocks/trees/OverworldSapling.java @@ -1,13 +1,13 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; import mods.natura.worldgen.RareTreeGen; import mods.natura.worldgen.WillowGen; + import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,9 +22,13 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class OverworldSapling extends BlockSapling { + public IIcon[] icons; - public String[] textureNames = new String[] {"maple", "silverbell", "purpleheart", "tiger", "willow"}; + public String[] textureNames = new String[] { "maple", "silverbell", "purpleheart", "tiger", "willow" }; public OverworldSapling() { super(); @@ -54,8 +58,7 @@ public boolean canPlaceBlockAt(World world, int x, int y, int z) { } public boolean canThisPlantGrowOnThisBlock(Block id) { - return id == Blocks.grass - || id == Blocks.dirt + return id == Blocks.grass || id == Blocks.dirt || id == Blocks.soul_sand || id == Blocks.netherrack || id == NContent.taintedSoil; @@ -72,15 +75,13 @@ public boolean canBlockStay(World world, int x, int y, int z) { Block soil = world.getBlock(x, y - 1, z); return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && (soil != null && soil.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this)); - /*case 4: - case 6: - int belowID = world.getBlockId(x, y - 1, z); - Block netherSoil = blocksList[belowID]; - return netherSoil != null && (netherSoil == Block.netherrack || netherSoil.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this)); - case 5: - int aboveID = world.getBlockId(x, y + 1, z); - Block nSoil = blocksList[aboveID]; - return nSoil != null && (nSoil == Block.netherrack || nSoil == Block.slowSand || nSoil == NContent.taintedSoil);*/ + /* + * case 4: case 6: int belowID = world.getBlockId(x, y - 1, z); Block netherSoil = blocksList[belowID]; + * return netherSoil != null && (netherSoil == Block.netherrack || netherSoil.canSustainPlant(world, x, y - + * 1, z, ForgeDirection.UP, this)); case 5: int aboveID = world.getBlockId(x, y + 1, z); Block nSoil = + * blocksList[aboveID]; return nSoil != null && (nSoil == Block.netherrack || nSoil == Block.slowSand || + * nSoil == NContent.taintedSoil); + */ default: return true; } @@ -88,11 +89,13 @@ public boolean canBlockStay(World world, int x, int y, int z) { @Override public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z) { - /*int meta = world.getBlockMetadata(x, y, z) % 8; - if (meta <= 3)*/ + /* + * int meta = world.getBlockMetadata(x, y, z) % 8; if (meta <= 3) + */ return EnumPlantType.Plains; - /*else - return EnumPlantType.Nether;*/ + /* + * else return EnumPlantType.Nether; + */ } @Override @@ -114,8 +117,8 @@ public IIcon getIcon(int side, int meta) { return icons[meta % 8 % icons.length]; } - public void func_149879_c( - World p_149879_1_, int p_149879_2_, int p_149879_3_, int p_149879_4_, Random p_149879_5_) { + public void func_149879_c(World p_149879_1_, int p_149879_2_, int p_149879_3_, int p_149879_4_, + Random p_149879_5_) { int l = p_149879_1_.getBlockMetadata(p_149879_2_, p_149879_3_, p_149879_4_); if ((l & 8) == 0) { @@ -153,18 +156,18 @@ public void getSubBlocks(Item id, CreativeTabs tab, List list) { } } - public boolean func_149851_a( - World p_149851_1_, int p_149851_2_, int p_149851_3_, int p_149851_4_, boolean p_149851_5_) { + public boolean func_149851_a(World p_149851_1_, int p_149851_2_, int p_149851_3_, int p_149851_4_, + boolean p_149851_5_) { return true; } - public boolean func_149852_a( - World p_149852_1_, Random p_149852_2_, int p_149852_3_, int p_149852_4_, int p_149852_5_) { + public boolean func_149852_a(World p_149852_1_, Random p_149852_2_, int p_149852_3_, int p_149852_4_, + int p_149852_5_) { return (double) p_149852_1_.rand.nextFloat() < 0.45D; } - public void func_149853_b( - World p_149853_1_, Random p_149853_2_, int p_149853_3_, int p_149853_4_, int p_149853_5_) { + public void func_149853_b(World p_149853_1_, Random p_149853_2_, int p_149853_3_, int p_149853_4_, + int p_149853_5_) { this.func_149879_c(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_, p_149853_2_); } } diff --git a/src/main/java/mods/natura/blocks/trees/OverworldTreeBlock.java b/src/main/java/mods/natura/blocks/trees/OverworldTreeBlock.java index 48dbd7b4..0b321ab7 100644 --- a/src/main/java/mods/natura/blocks/trees/OverworldTreeBlock.java +++ b/src/main/java/mods/natura/blocks/trees/OverworldTreeBlock.java @@ -1,11 +1,10 @@ package mods.natura.blocks.trees; -import com.google.common.collect.Lists; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,18 +14,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.google.common.collect.Lists; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class OverworldTreeBlock extends BlockLog { + public IIcon[] icons; - public String[] textureNames = new String[] { - "maple_bark", - "maple_heart", - "silverbell_bark", - "silverbell_heart", - "purpleheart_bark", - "purpleheart_heart", - "tiger_bark", - "tiger_heart" - }; + public String[] textureNames = new String[] { "maple_bark", "maple_heart", "silverbell_bark", "silverbell_heart", + "purpleheart_bark", "purpleheart_heart", "tiger_bark", "tiger_heart" }; public OverworldTreeBlock() { super(); @@ -81,15 +78,11 @@ public int damageDropped(int meta) { return meta % 4; } - /* public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) - { - return metadata % 4 != 2 ? blockFlammability[blockID] : 0; - } - - public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) - { - return metadata % 4 != 2 ? blockFireSpreadSpeed[blockID] : 0; - }*/ + /* + * public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { return + * metadata % 4 != 2 ? blockFlammability[blockID] : 0; } public int getFireSpreadSpeed(World world, int x, int y, + * int z, int metadata, ForgeDirection face) { return metadata % 4 != 2 ? blockFireSpreadSpeed[blockID] : 0; } + */ @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/mods/natura/blocks/trees/Planks.java b/src/main/java/mods/natura/blocks/trees/Planks.java index b671d35e..226e2d9a 100644 --- a/src/main/java/mods/natura/blocks/trees/Planks.java +++ b/src/main/java/mods/natura/blocks/trees/Planks.java @@ -1,9 +1,9 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,23 +16,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Planks extends Block { + public IIcon[] icons; - public static String[] textureNames = new String[] { - "eucalyptus", - "sakura", - "ghostwood", - "redwood", - "bloodwood", - "hopseed", - "maple", - "silverbell", - "purpleheart", - "tiger", - "willow", - "darkwood", - "fusewood" - }; + public static String[] textureNames = new String[] { "eucalyptus", "sakura", "ghostwood", "redwood", "bloodwood", + "hopseed", "maple", "silverbell", "purpleheart", "tiger", "willow", "darkwood", "fusewood" }; public Planks() { super(Material.wood); @@ -59,10 +50,9 @@ public void registerBlockIcons(IIconRegister iconRegister) { } } - /*public boolean renderAsNormalBlock() - { - return false; - }*/ + /* + * public boolean renderAsNormalBlock() { return false; } + */ public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) { if (metadata == 2 || metadata == 4 || metadata > 10) return 0; diff --git a/src/main/java/mods/natura/blocks/trees/SaguaroBlock.java b/src/main/java/mods/natura/blocks/trees/SaguaroBlock.java index e0c7ac81..a7b56ac4 100644 --- a/src/main/java/mods/natura/blocks/trees/SaguaroBlock.java +++ b/src/main/java/mods/natura/blocks/trees/SaguaroBlock.java @@ -1,12 +1,12 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import mods.natura.client.SaguaroRenderer; import mods.natura.common.NContent; import mods.natura.common.NaturaTab; import mods.natura.worldgen.SaguaroGen; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +22,9 @@ import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SaguaroBlock extends Block implements IPlantable { public SaguaroBlock() { @@ -35,8 +38,7 @@ public SaguaroBlock() { @Override public void updateTick(World world, int x, int y, int z, Random random) { int meta = world.getBlockMetadata(x, y, z); - if (meta == 0 - && world.getWorldInfo().isRaining() + if (meta == 0 && world.getWorldInfo().isRaining() && random.nextInt(20) == 0 && world.getBlock(x, y + 1, z) == Blocks.air) { switch (random.nextInt(4)) { @@ -70,29 +72,29 @@ public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, switch (meta) { case 0: offset = 0.125F; - return AxisAlignedBB.getBoundingBox( - x + offset, y, z + offset, x + 1 - offset, y + 1 - offset, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x + offset, y, z + offset, x + 1 - offset, y + 1 - offset, z + 1 - offset); case 1: case 2: offset = 0.325F; - return AxisAlignedBB.getBoundingBox( - x + offset, y, z + offset, x + 1 - offset, y + 1 - offset, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x + offset, y, z + offset, x + 1 - offset, y + 1 - offset, z + 1 - offset); case 3: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x + 0.625f, y + 0.1875, z + offset, x + 1.125f, y + 0.75, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x + 0.625f, y + 0.1875, z + offset, x + 1.125f, y + 0.75, z + 1 - offset); case 4: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x + offset, y + 0.1875, z + 0.625f, x + 1 - offset, y + 0.75, z + 1.125f); + return AxisAlignedBB + .getBoundingBox(x + offset, y + 0.1875, z + 0.625f, x + 1 - offset, y + 0.75, z + 1.125f); case 5: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x - 0.125f, y + 0.1875, z + offset, x + 0.375f, y + 0.75, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x - 0.125f, y + 0.1875, z + offset, x + 0.375f, y + 0.75, z + 1 - offset); case 6: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x + offset, y + 0.1875, z - 0.125f, x + 1 - offset, y + 0.75, z + 0.375f); + return AxisAlignedBB + .getBoundingBox(x + offset, y + 0.1875, z - 0.125f, x + 1 - offset, y + 0.75, z + 0.375f); default: return null; } @@ -111,28 +113,28 @@ public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, i Block block = world.getBlock(x, y - 1, z); if (!block.isOpaqueCube()) base = 0.125F; - return AxisAlignedBB.getBoundingBox( - x + offset, y, z + offset, x + 1 - offset, y + 1 - height, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x + offset, y, z + offset, x + 1 - offset, y + 1 - height, z + 1 - offset); case 1: case 2: offset = 0.325F; return AxisAlignedBB.getBoundingBox(x + offset, y, z + offset, x + 1 - offset, y + 0.5, z + 1 - offset); case 3: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x + 0.625f, y + 0.1875, z + offset, x + 1.125f, y + 0.75, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x + 0.625f, y + 0.1875, z + offset, x + 1.125f, y + 0.75, z + 1 - offset); case 4: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x + offset, y + 0.1875, z + 0.625f, x + 1 - offset, y + 0.75, z + 1.125f); + return AxisAlignedBB + .getBoundingBox(x + offset, y + 0.1875, z + 0.625f, x + 1 - offset, y + 0.75, z + 1.125f); case 5: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x - 0.125f, y + 0.1875, z + offset, x + 0.375f, y + 0.75, z + 1 - offset); + return AxisAlignedBB + .getBoundingBox(x - 0.125f, y + 0.1875, z + offset, x + 0.375f, y + 0.75, z + 1 - offset); case 6: offset = 0.25F; - return AxisAlignedBB.getBoundingBox( - x + offset, y + 0.1875, z - 0.125f, x + 1 - offset, y + 0.75, z + 0.375f); + return AxisAlignedBB + .getBoundingBox(x + offset, y + 0.1875, z - 0.125f, x + 1 - offset, y + 0.75, z + 0.375f); default: return null; } @@ -153,7 +155,7 @@ public Item getItemDropped(int meta, Random random, int fortune) { } public IIcon[] icons; - public String[] textureNames = new String[] {"saguaro_bottom", "saguaro_top", "saguaro_side", "saguaro_fruit"}; + public String[] textureNames = new String[] { "saguaro_bottom", "saguaro_top", "saguaro_side", "saguaro_fruit" }; @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/blocks/trees/SimpleLog.java b/src/main/java/mods/natura/blocks/trees/SimpleLog.java index 2ff4fd3f..6a986872 100644 --- a/src/main/java/mods/natura/blocks/trees/SimpleLog.java +++ b/src/main/java/mods/natura/blocks/trees/SimpleLog.java @@ -1,9 +1,9 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -13,8 +13,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SimpleLog extends Planks { - public String[] textureNames = new String[] {"redwood_bark", "redwood_heart", "redwood_root"}; + + public String[] textureNames = new String[] { "redwood_bark", "redwood_heart", "redwood_root" }; public SimpleLog() { super(); diff --git a/src/main/java/mods/natura/blocks/trees/TreeBlock.java b/src/main/java/mods/natura/blocks/trees/TreeBlock.java index 6bd627f8..4315224b 100644 --- a/src/main/java/mods/natura/blocks/trees/TreeBlock.java +++ b/src/main/java/mods/natura/blocks/trees/TreeBlock.java @@ -1,10 +1,10 @@ package mods.natura.blocks.trees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,18 +16,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class TreeBlock extends BlockLog { + public IIcon[] icons; - public String[] textureNames = new String[] { - "eucalyptus_bark", - "sakura_bark", - "ghostwood_bark", - "hopseed_bark", - "eucalyptus_heart", - "sakura_heart", - "ghostwood_heart", - "hopseed_heart" - }; + public String[] textureNames = new String[] { "eucalyptus_bark", "sakura_bark", "ghostwood_bark", "hopseed_bark", + "eucalyptus_heart", "sakura_heart", "ghostwood_heart", "hopseed_heart" }; public TreeBlock() { super(); diff --git a/src/main/java/mods/natura/blocks/trees/WillowBlock.java b/src/main/java/mods/natura/blocks/trees/WillowBlock.java index 78642681..272c4022 100644 --- a/src/main/java/mods/natura/blocks/trees/WillowBlock.java +++ b/src/main/java/mods/natura/blocks/trees/WillowBlock.java @@ -1,11 +1,10 @@ package mods.natura.blocks.trees; -import com.google.common.collect.Lists; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,9 +14,15 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.google.common.collect.Lists; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class WillowBlock extends BlockLog { + public IIcon[] icons; - public String[] textureNames = new String[] {"willow_bark", "willow_heart"}; + public String[] textureNames = new String[] { "willow_bark", "willow_heart" }; public WillowBlock() { super(); @@ -67,21 +72,12 @@ public ArrayList getDrops(World world, int x, int y, int z, int metad return i; } - /*@Override - public int damageDropped(int meta) - { - return meta % 4; - } - - public int getFlammability(IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face) - { - return metadata % 4 != 2 ? blockFlammability[blockID] : 0; - } - - public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) - { - return metadata % 4 != 2 ? blockFireSpreadSpeed[blockID] : 0; - }*/ + /* + * @Override public int damageDropped(int meta) { return meta % 4; } public int getFlammability(IBlockAccess world, + * int x, int y, int z, int metadata, ForgeDirection face) { return metadata % 4 != 2 ? blockFlammability[blockID] : + * 0; } public int getFireSpreadSpeed(World world, int x, int y, int z, int metadata, ForgeDirection face) { return + * metadata % 4 != 2 ? blockFireSpreadSpeed[blockID] : 0; } + */ @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/mods/natura/client/BerryRender.java b/src/main/java/mods/natura/client/BerryRender.java index 049f0c1b..e3ff1755 100644 --- a/src/main/java/mods/natura/client/BerryRender.java +++ b/src/main/java/mods/natura/client/BerryRender.java @@ -1,18 +1,20 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BerryRender implements ISimpleBlockRenderingHandler { + public static int berryModel = RenderingRegistry.getNextAvailableRenderId(); @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { if (modelId == berryModel) { int md = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/mods/natura/client/CropRender.java b/src/main/java/mods/natura/client/CropRender.java index 16917d6c..9b6ac38d 100644 --- a/src/main/java/mods/natura/client/CropRender.java +++ b/src/main/java/mods/natura/client/CropRender.java @@ -1,12 +1,14 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class CropRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -15,8 +17,8 @@ public void renderInventoryBlock(Block block, int metadata, int modelID, RenderB } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { if (modelId == CropRender.model) { int meta = world.getBlockMetadata(x, y, z); if (meta < 4) return renderer.renderBlockCrops(block, x, y, z); diff --git a/src/main/java/mods/natura/client/FenceRender.java b/src/main/java/mods/natura/client/FenceRender.java index 6d6c2ae1..f47008c5 100644 --- a/src/main/java/mods/natura/client/FenceRender.java +++ b/src/main/java/mods/natura/client/FenceRender.java @@ -1,20 +1,23 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class FenceRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { if (modelId == model) { return renderer.renderBlockFence((BlockFence) block, x, y, z); @@ -42,44 +45,78 @@ public void renderInventoryBlock(Block block, int metadata, int modelID, RenderB if (k == 2) { renderer.setRenderBounds( - 0.5F - f2, 1.0F - f2 * 3.0F, -f2 * 2.0F, 0.5F + f2, 1.0F - f2, 1.0F + f2 * 2.0F); + 0.5F - f2, + 1.0F - f2 * 3.0F, + -f2 * 2.0F, + 0.5F + f2, + 1.0F - f2, + 1.0F + f2 * 2.0F); } if (k == 3) { renderer.setRenderBounds( - 0.5F - f2, 0.5F - f2 * 3.0F, -f2 * 2.0F, 0.5F + f2, 0.5F - f2, 1.0F + f2 * 2.0F); + 0.5F - f2, + 0.5F - f2 * 3.0F, + -f2 * 2.0F, + 0.5F + f2, + 0.5F - f2, + 1.0F + f2 * 2.0F); } GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); renderer.renderFaceYNeg( - block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 0, metadata)); + block, + 0.0D, + 0.0D, + 0.0D, + renderer.getBlockIconFromSideAndMetadata(block, 0, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); renderer.renderFaceYPos( - block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 1, metadata)); + block, + 0.0D, + 0.0D, + 0.0D, + renderer.getBlockIconFromSideAndMetadata(block, 1, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); renderer.renderFaceZNeg( - block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 2, metadata)); + block, + 0.0D, + 0.0D, + 0.0D, + renderer.getBlockIconFromSideAndMetadata(block, 2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); renderer.renderFaceZPos( - block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 3, metadata)); + block, + 0.0D, + 0.0D, + 0.0D, + renderer.getBlockIconFromSideAndMetadata(block, 3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); renderer.renderFaceXNeg( - block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 4, metadata)); + block, + 0.0D, + 0.0D, + 0.0D, + renderer.getBlockIconFromSideAndMetadata(block, 4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); renderer.renderFaceXPos( - block, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); + block, + 0.0D, + 0.0D, + 0.0D, + renderer.getBlockIconFromSideAndMetadata(block, 5, metadata)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/mods/natura/client/GrassColorizerAlternate.java b/src/main/java/mods/natura/client/GrassColorizerAlternate.java index 2b687df2..58be699e 100644 --- a/src/main/java/mods/natura/client/GrassColorizerAlternate.java +++ b/src/main/java/mods/natura/client/GrassColorizerAlternate.java @@ -1,11 +1,12 @@ package mods.natura.client; +import mods.natura.Natura; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mods.natura.Natura; @SideOnly(Side.CLIENT) public class GrassColorizerAlternate { + /** Color buffer for grass */ private static int[] blueGrassBuffer = new int[65536]; diff --git a/src/main/java/mods/natura/client/HopperRender.java b/src/main/java/mods/natura/client/HopperRender.java index fab16aca..e10c9743 100644 --- a/src/main/java/mods/natura/client/HopperRender.java +++ b/src/main/java/mods/natura/client/HopperRender.java @@ -1,8 +1,7 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import mods.natura.blocks.tech.BlazeHopper; + import net.minecraft.block.Block; import net.minecraft.block.BlockHopper; import net.minecraft.client.renderer.EntityRenderer; @@ -11,12 +10,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class HopperRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { if (modelId == model) { return renderBlockHopper((BlazeHopper) block, x, y, z, renderer); } @@ -61,8 +64,8 @@ public boolean renderBlockHopper(BlazeHopper par1BlockHopper, int par2, int par3 renderer); } - public boolean renderBlockHopperMetadata( - BlazeHopper par1BlockHopper, int par2, int par3, int par4, int par5, boolean par6, RenderBlocks renderer) { + public boolean renderBlockHopperMetadata(BlazeHopper par1BlockHopper, int par2, int par3, int par4, int par5, + boolean par6, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; int i1 = BlockHopper.getDirectionFromMetadata(par5); double d0 = 0.625D; @@ -130,8 +133,8 @@ public boolean renderBlockHopperMetadata( float f; if (!par6) { - tessellator.setBrightness( - par1BlockHopper.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4)); + tessellator + .setBrightness(par1BlockHopper.getMixedBrightnessForBlock(renderer.blockAccess, par2, par3, par4)); float f1 = 1.0F; int j1 = par1BlockHopper.colorMultiplier(renderer.blockAccess, par2, par3, par4); f = (j1 >> 16 & 255) / 255.0F; diff --git a/src/main/java/mods/natura/client/LeverRender.java b/src/main/java/mods/natura/client/LeverRender.java index 87e0148e..49a2c662 100644 --- a/src/main/java/mods/natura/client/LeverRender.java +++ b/src/main/java/mods/natura/client/LeverRender.java @@ -1,7 +1,5 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -10,12 +8,16 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class LeverRender implements ISimpleBlockRenderingHandler { + public static int model = RenderingRegistry.getNextAvailableRenderId(); @Override - public boolean renderWorldBlock( - IBlockAccess world, int par2, int par3, int par4, Block par1Block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int par2, int par3, int par4, Block par1Block, int modelId, + RenderBlocks renderer) { if (modelId == model) { int l = renderer.blockAccess.getBlockMetadata(par2, par3, par4); int i1 = l & 7; diff --git a/src/main/java/mods/natura/client/NProxyClient.java b/src/main/java/mods/natura/client/NProxyClient.java index 36c16c38..7a207f9b 100644 --- a/src/main/java/mods/natura/client/NProxyClient.java +++ b/src/main/java/mods/natura/client/NProxyClient.java @@ -1,6 +1,5 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.RenderingRegistry; import mods.natura.client.entity.FlameSpiderBabyRender; import mods.natura.client.entity.FlameSpiderRender; import mods.natura.client.entity.FusewoodArrowRender; @@ -13,15 +12,20 @@ import mods.natura.entity.HeatscarSpider; import mods.natura.entity.ImpEntity; import mods.natura.entity.NitroCreeper; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class NProxyClient extends NProxyCommon { + @Override public void registerRenderer() { RenderingRegistry.registerBlockHandler(new BerryRender()); @@ -39,19 +43,21 @@ public void registerRenderer() { Minecraft mc = Minecraft.getMinecraft(); try { - GrassColorizerAlternate.setBlueGrassBiomeColorizer( - TextureUtil.readImageData(mc.getResourceManager(), bluegrass)); - GrassColorizerAlternate.setOrangeGrassBiomeColorizer( - TextureUtil.readImageData(mc.getResourceManager(), orangegrass)); + GrassColorizerAlternate + .setBlueGrassBiomeColorizer(TextureUtil.readImageData(mc.getResourceManager(), bluegrass)); + GrassColorizerAlternate + .setOrangeGrassBiomeColorizer(TextureUtil.readImageData(mc.getResourceManager(), orangegrass)); } catch (Exception e) { e.printStackTrace(); } } - private static final ResourceLocation bluegrass = - new ResourceLocation("natura", "textures/misc/bluegrasscolor.png"); - private static final ResourceLocation orangegrass = - new ResourceLocation("natura", "textures/misc/orangegrasscolor.png"); + private static final ResourceLocation bluegrass = new ResourceLocation( + "natura", + "textures/misc/bluegrasscolor.png"); + private static final ResourceLocation orangegrass = new ResourceLocation( + "natura", + "textures/misc/orangegrasscolor.png"); public static void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; diff --git a/src/main/java/mods/natura/client/SaguaroRenderer.java b/src/main/java/mods/natura/client/SaguaroRenderer.java index 5cb6a0c7..762b1d04 100644 --- a/src/main/java/mods/natura/client/SaguaroRenderer.java +++ b/src/main/java/mods/natura/client/SaguaroRenderer.java @@ -1,8 +1,7 @@ package mods.natura.client; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import mods.natura.blocks.trees.SaguaroBlock; + import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.client.renderer.RenderBlocks; @@ -11,6 +10,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class SaguaroRenderer implements ISimpleBlockRenderingHandler { public static int model = RenderingRegistry.getNextAvailableRenderId(); @@ -21,8 +23,8 @@ public void renderInventoryBlock(Block block, int metadata, int modelID, RenderB } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelID, + RenderBlocks renderer) { if (modelID == model) { int meta = world.getBlockMetadata(x, y, z); switch (meta) { @@ -50,8 +52,8 @@ public int getRenderId() { /* Render methods, used for saguaro */ - boolean renderCactus( - RenderBlocks renderblocks, IBlockAccess iblockaccess, int x, int y, int z, SaguaroBlock cactus) { + boolean renderCactus(RenderBlocks renderblocks, IBlockAccess iblockaccess, int x, int y, int z, + SaguaroBlock cactus) { float offset = 0.125F; float botX = offset; @@ -149,9 +151,9 @@ public boolean renderFruit(SaguaroBlock block, int x, int y, int z, IBlockAccess case 3: d8 = 18.0D - offsetX; d9 = 8.0D - offsetX / 2; - /*case 4: - d8 = 11.0D - (double)offsetX; - d9 = 8.0D - (double)(offsetX / 2);*/ + /* + * case 4: d8 = 11.0D - (double)offsetX; d9 = 8.0D - (double)(offsetX / 2); + */ } double d10 = x + d8 / 16.0D; @@ -233,31 +235,17 @@ public boolean renderFruit(SaguaroBlock block, int x, int y, int z, IBlockAccess d14 = z + d9 / 16.0D; d15 = z + (d9 + 4.0D) / 16.0D; - /*if (i1 != 2 && i1 != 0) - { - if (i1 == 1 || i1 == 3) - { - tessellator.addVertexWithUV(d11, d12, d14, d4, d7); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d11, d13, d14, d4, d6); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d11, d12, d14, d4, d7); - tessellator.addVertexWithUV(d11, d13, d14, d4, d6); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - } - } - else - { - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d12, d15, d4, d7); - tessellator.addVertexWithUV(d10, d13, d15, d4, d6); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d10, d12, d15, d4, d7); - tessellator.addVertexWithUV(d10, d12, d14, d5, d7); - tessellator.addVertexWithUV(d10, d13, d14, d5, d6); - tessellator.addVertexWithUV(d10, d13, d15, d4, d6); - }*/ + /* + * if (i1 != 2 && i1 != 0) { if (i1 == 1 || i1 == 3) { tessellator.addVertexWithUV(d11, d12, d14, d4, d7); + * tessellator.addVertexWithUV(d10, d12, d14, d5, d7); tessellator.addVertexWithUV(d10, d13, d14, d5, d6); + * tessellator.addVertexWithUV(d11, d13, d14, d4, d6); tessellator.addVertexWithUV(d10, d12, d14, d5, d7); + * tessellator.addVertexWithUV(d11, d12, d14, d4, d7); tessellator.addVertexWithUV(d11, d13, d14, d4, d6); + * tessellator.addVertexWithUV(d10, d13, d14, d5, d6); } } else { tessellator.addVertexWithUV(d10, d12, d14, d5, + * d7); tessellator.addVertexWithUV(d10, d12, d15, d4, d7); tessellator.addVertexWithUV(d10, d13, d15, d4, d6); + * tessellator.addVertexWithUV(d10, d13, d14, d5, d6); tessellator.addVertexWithUV(d10, d12, d15, d4, d7); + * tessellator.addVertexWithUV(d10, d12, d14, d5, d7); tessellator.addVertexWithUV(d10, d13, d14, d5, d6); + * tessellator.addVertexWithUV(d10, d13, d15, d4, d6); } + */ return true; } diff --git a/src/main/java/mods/natura/client/entity/FlameSpiderBabyRender.java b/src/main/java/mods/natura/client/entity/FlameSpiderBabyRender.java index be632165..14795808 100644 --- a/src/main/java/mods/natura/client/entity/FlameSpiderBabyRender.java +++ b/src/main/java/mods/natura/client/entity/FlameSpiderBabyRender.java @@ -1,10 +1,12 @@ package mods.natura.client.entity; import mods.natura.entity.BabyHeatscarSpider; + import net.minecraft.client.renderer.entity.RenderSpider; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; public class FlameSpiderBabyRender extends RenderSpider { diff --git a/src/main/java/mods/natura/client/entity/FlameSpiderRender.java b/src/main/java/mods/natura/client/entity/FlameSpiderRender.java index 2b8ed95c..6e1cfa68 100644 --- a/src/main/java/mods/natura/client/entity/FlameSpiderRender.java +++ b/src/main/java/mods/natura/client/entity/FlameSpiderRender.java @@ -1,10 +1,12 @@ package mods.natura.client.entity; import mods.natura.entity.HeatscarSpider; + import net.minecraft.client.renderer.entity.RenderSpider; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; public class FlameSpiderRender extends RenderSpider { diff --git a/src/main/java/mods/natura/client/entity/FusewoodArrowRender.java b/src/main/java/mods/natura/client/entity/FusewoodArrowRender.java index 298275e6..58b95fa6 100644 --- a/src/main/java/mods/natura/client/entity/FusewoodArrowRender.java +++ b/src/main/java/mods/natura/client/entity/FusewoodArrowRender.java @@ -1,28 +1,31 @@ package mods.natura.client.entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.entity.FusewoodArrow; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class FusewoodArrowRender extends Render { + private static final ResourceLocation field_110780_a = new ResourceLocation("textures/entity/arrow.png"); - public void renderArrow( - FusewoodArrow par1EntityArrow, double par2, double par4, double par6, float par8, float par9) { + public void renderArrow(FusewoodArrow par1EntityArrow, double par2, double par4, double par6, float par8, + float par9) { this.bindEntityTexture(par1EntityArrow); GL11.glPushMatrix(); GL11.glTranslatef((float) par2, (float) par4, (float) par6); GL11.glRotatef( - par1EntityArrow.prevRotationYaw - + (par1EntityArrow.rotationYaw - par1EntityArrow.prevRotationYaw) * par9 + par1EntityArrow.prevRotationYaw + (par1EntityArrow.rotationYaw - par1EntityArrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, diff --git a/src/main/java/mods/natura/client/entity/ImpModel.java b/src/main/java/mods/natura/client/entity/ImpModel.java index 64536181..4bc3ce36 100644 --- a/src/main/java/mods/natura/client/entity/ImpModel.java +++ b/src/main/java/mods/natura/client/entity/ImpModel.java @@ -6,6 +6,7 @@ import net.minecraft.util.MathHelper; public class ImpModel extends ModelBase { + public ModelRenderer impParts[]; public ImpModel() { diff --git a/src/main/java/mods/natura/common/NContent.java b/src/main/java/mods/natura/common/NContent.java index d27301d5..87467d1c 100644 --- a/src/main/java/mods/natura/common/NContent.java +++ b/src/main/java/mods/natura/common/NContent.java @@ -1,12 +1,9 @@ package mods.natura.common; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.ArrayList; import java.util.HashMap; import java.util.List; + import mods.natura.Natura; import mods.natura.blocks.CloudBlock; import mods.natura.blocks.GrassBlock; @@ -112,6 +109,7 @@ import mods.natura.items.tools.NaturaShovel; import mods.natura.items.tools.NaturaSword; import mods.natura.util.DispenserBehaviorSpawnEgg; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockPressurePlate.Sensitivity; @@ -137,7 +135,12 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + import tconstruct.library.crafting.PatternBuilder; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; public class NContent implements IFuelHandler { @@ -146,8 +149,10 @@ public void preInit() { Blocks.netherrack.setResistance(4f); // Nether blocks - /*infernalStone = new NBlock(PHNatura.infernalStone, Material.rock, 1.5f, new String[] { "infernal_stone" }).setBlockName("infernalStone"); - GameRegistry.registerBlock(infernalStone, "infernalStone");*/ + /* + * infernalStone = new NBlock(PHNatura.infernalStone, Material.rock, 1.5f, new String[] { "infernal_stone" + * }).setBlockName("infernalStone"); GameRegistry.registerBlock(infernalStone, "infernalStone"); + */ taintedSoil = new TaintedSoil().setBlockName("TaintedSoil"); taintedSoil.setHarvestLevel("shovel", 0); GameRegistry.registerBlock(taintedSoil, "soil.tainted"); @@ -155,88 +160,63 @@ public void preInit() { heatSand.setHarvestLevel("shovel", 0); GameRegistry.registerBlock(heatSand, "heatsand"); if (PHNatura.enableNetherFurnaces) { - netherrackFurnace = new NetherrackFurnaceBlock() - .setHardness(3.5F) - .setCreativeTab(NaturaTab.tab) + netherrackFurnace = new NetherrackFurnaceBlock().setHardness(3.5F).setCreativeTab(NaturaTab.tab) .setBlockName("furnace.netherrack"); GameRegistry.registerBlock(netherrackFurnace, "NetherFurnace"); GameRegistry.registerTileEntity(NetherrackFurnaceLogic.class, "netherrackFurnace"); } if (PHNatura.enableObelisks) { - respawnObelisk = new RespawnObelisk(Material.wood) - .setHardness(1.0F) - .setResistance(1000000F) - .setCreativeTab(NaturaTab.tab) - .setBlockName("nether.obelisk"); + respawnObelisk = new RespawnObelisk(Material.wood).setHardness(1.0F).setResistance(1000000F) + .setCreativeTab(NaturaTab.tab).setBlockName("nether.obelisk"); GameRegistry.registerBlock(respawnObelisk, "Obelisk"); } if (PHNatura.enableNetherGlass) { - netherGlass = (NetherGlass) new NetherGlass() - .setHardness(1.0F) - .setResistance(3000F) - .setStepSound(Block.soundTypeGlass) - .setCreativeTab(NaturaTab.tab) - .setBlockName("nether.glass"); + netherGlass = (NetherGlass) new NetherGlass().setHardness(1.0F).setResistance(3000F) + .setStepSound(Block.soundTypeGlass).setCreativeTab(NaturaTab.tab).setBlockName("nether.glass"); GameRegistry.registerBlock(netherGlass, NetherGlassItem.class, "NetherGlass"); } // Blaze Rails if (PHNatura.enableBlazeRails) { - brailPowered = new BlazeRailPowered(false) - .setHardness(0.7F) - .setBlockName("blazerail.powered") + brailPowered = new BlazeRailPowered(false).setHardness(0.7F).setBlockName("blazerail.powered") .setBlockTextureName("natura:brail_golden"); GameRegistry.registerBlock(brailPowered, "BrailPowered"); - brailDetector = new BlazeRailDetector() - .setHardness(0.7F) - .setBlockName("blazerail.detector") + brailDetector = new BlazeRailDetector().setHardness(0.7F).setBlockName("blazerail.detector") .setBlockTextureName("natura:brail_detector"); GameRegistry.registerBlock(brailDetector, "BrailDetector"); - brail = new BlazeRail() - .setHardness(0.7F) - .setBlockName("blazerail") + brail = new BlazeRail().setHardness(0.7F).setBlockName("blazerail") .setBlockTextureName("natura:brail_normal"); GameRegistry.registerBlock(brail, "Blazerail"); - brailActivator = new BlazeRailPowered(true) - .setHardness(0.7F) - .setBlockName("blazerail.activator") + brailActivator = new BlazeRailPowered(true).setHardness(0.7F).setBlockName("blazerail.activator") .setBlockTextureName("natura:brail_activator"); GameRegistry.registerBlock(brailActivator, "BrailActivator"); } - /*piston = (NetherPistonBase) new NetherPistonBase(PHNatura.piston, false).setBlockName("nether.piston"); - GameRegistry.registerBlock(piston, "natura.piston"); - pistonSticky = (NetherPistonBase) new NetherPistonBase(PHNatura.pistonSticky, true).setBlockName("nether.piston.sticky"); - GameRegistry.registerBlock(pistonSticky, "natura.piston.sticky"); - pistonExtension = new NetherPistonExtension(PHNatura.pistonExtension); - GameRegistry.registerBlock(pistonExtension, "natura.piston.extension");*/ + /* + * piston = (NetherPistonBase) new NetherPistonBase(PHNatura.piston, false).setBlockName("nether.piston"); + * GameRegistry.registerBlock(piston, "natura.piston"); pistonSticky = (NetherPistonBase) new + * NetherPistonBase(PHNatura.pistonSticky, true).setBlockName("nether.piston.sticky"); + * GameRegistry.registerBlock(pistonSticky, "natura.piston.sticky"); pistonExtension = new + * NetherPistonExtension(PHNatura.pistonExtension); GameRegistry.registerBlock(pistonExtension, + * "natura.piston.extension"); + */ if (PHNatura.enableBlazeHoppers) { - netherHopper = (BlazeHopper) new BlazeHopper() - .setHardness(3.0F) - .setResistance(8.0F) - .setCreativeTab(NaturaTab.tab) - .setBlockName("nether.hopper"); + netherHopper = (BlazeHopper) new BlazeHopper().setHardness(3.0F).setResistance(8.0F) + .setCreativeTab(NaturaTab.tab).setBlockName("nether.hopper"); GameRegistry.registerBlock(netherHopper, "NetherHopper"); } if (PHNatura.enableNetherPressurePlates) { netherPressurePlate = new AlternatePressurePlate("netherrack", Material.rock, Sensitivity.mobs) - .setHardness(0.5F) - .setStepSound(Block.soundTypeStone) - .setBlockName("pressurePlate"); + .setHardness(0.5F).setStepSound(Block.soundTypeStone).setBlockName("pressurePlate"); GameRegistry.registerBlock(netherPressurePlate, "NetherPressurePlate"); } if (PHNatura.enableNetherButtons) { - netherButton = new NetherrackButton() - .setHardness(0.5F) - .setStepSound(Block.soundTypeStone) + netherButton = new NetherrackButton().setHardness(0.5F).setStepSound(Block.soundTypeStone) .setBlockName("button"); GameRegistry.registerBlock(netherButton, "NetherButton"); } if (PHNatura.enableNetherLevers) { - netherLever = new NetherLever() - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) - .setBlockName("lever") + netherLever = new NetherLever().setHardness(0.5F).setStepSound(Block.soundTypeWood).setBlockName("lever") .setBlockTextureName("natura:nlever"); GameRegistry.registerBlock(netherLever, "NetherLever"); } @@ -246,16 +226,13 @@ public void preInit() { GameRegistry.registerBlock(thornVines, "Thornvines"); glowshroom = (Glowshroom) new Glowshroom().setBlockName("Glowshroom").setLightLevel(0.625f); GameRegistry.registerBlock(glowshroom, GlowshroomItem.class, "Glowshroom"); - glowshroomGreen = new LargeGlowshroom(Material.wood, "green") - .setBlockName("greenGlowshroom") + glowshroomGreen = new LargeGlowshroom(Material.wood, "green").setBlockName("greenGlowshroom") .setLightLevel(0.5f); GameRegistry.registerBlock(glowshroomGreen, "greenGlowshroom"); - glowshroomPurple = new LargeGlowshroom(Material.wood, "purple") - .setBlockName("purpleGlowshroom") + glowshroomPurple = new LargeGlowshroom(Material.wood, "purple").setBlockName("purpleGlowshroom") .setLightLevel(0.5f); GameRegistry.registerBlock(glowshroomPurple, "purpleGlowshroom"); - glowshroomBlue = new LargeGlowshroom(Material.wood, "blue") - .setBlockName("blueGlowshroom") + glowshroomBlue = new LargeGlowshroom(Material.wood, "blue").setBlockName("blueGlowshroom") .setLightLevel(0.625f); GameRegistry.registerBlock(glowshroomBlue, "blueGlowshroom"); @@ -332,21 +309,15 @@ public void preInit() { // Wooden Workbenches if (PHNatura.enableWoodenWorkbenches) { - alternateWorkbench = new AlternateWorkbench() - .setHardness(2.5F) - .setStepSound(Block.soundTypeWood) - .setBlockName("workbench") - .setCreativeTab(NaturaTab.tab); + alternateWorkbench = new AlternateWorkbench().setHardness(2.5F).setStepSound(Block.soundTypeWood) + .setBlockName("workbench").setCreativeTab(NaturaTab.tab); GameRegistry.registerBlock(alternateWorkbench, NAlternateItem.class, "Natura.workbench"); } // Wooden Bookshelves if (PHNatura.enableWoodenBookshelves) { - alternateBookshelf = new AlternateBookshelf() - .setHardness(1.5F) - .setStepSound(Block.soundTypeWood) - .setBlockName("bookshelf") - .setCreativeTab(NaturaTab.tab); + alternateBookshelf = new AlternateBookshelf().setHardness(1.5F).setStepSound(Block.soundTypeWood) + .setBlockName("bookshelf").setCreativeTab(NaturaTab.tab); GameRegistry.registerBlock(alternateBookshelf, NAlternateItem.class, "Natura.bookshelf"); } @@ -408,12 +379,10 @@ public void preInit() { // Wooden Slabs if (PHNatura.enableWoodenSlabs) { - plankSlab1 = - new NSlabBase(Material.wood, planks, 0, 8).setHardness(2.0f).setBlockName("plankSlab1"); + plankSlab1 = new NSlabBase(Material.wood, planks, 0, 8).setHardness(2.0f).setBlockName("plankSlab1"); plankSlab1.stepSound = Block.soundTypeWood; GameRegistry.registerBlock(plankSlab1, PlankSlab1Item.class, "plankSlab1"); - plankSlab2 = - new NSlabBase(Material.wood, planks, 8, 5).setHardness(2.0f).setBlockName("plankSlab2"); + plankSlab2 = new NSlabBase(Material.wood, planks, 8, 5).setHardness(2.0f).setBlockName("plankSlab2"); plankSlab2.stepSound = Block.soundTypeWood; GameRegistry.registerBlock(plankSlab2, PlankSlab2Item.class, "plankSlab2"); } @@ -422,10 +391,7 @@ public void preInit() { if (PHNatura.enableWoodenTrapdoors) { // Eucalyptus trapdoorEucalyptus = new NTrapdoor(Material.wood, "eucalyptus_trapdoor"); - trapdoorEucalyptus - .setHardness(3.0F) - .setStepSound(Block.soundTypeWood) - .setBlockName("trapdoor.eucalyptus"); + trapdoorEucalyptus.setHardness(3.0F).setStepSound(Block.soundTypeWood).setBlockName("trapdoor.eucalyptus"); GameRegistry.registerBlock(trapdoorEucalyptus, "trapdoor.eucalyptus"); // Sakura trapdoorSakura = new NTrapdoor(Material.wood, "sakura_trapdoor"); @@ -433,10 +399,7 @@ public void preInit() { GameRegistry.registerBlock(trapdoorSakura, "trapdoor.sakura"); // Ghostwood trapdoorGhostwood = new NTrapdoor(Material.wood, "ghostwood_trapdoor"); - trapdoorGhostwood - .setHardness(3.0F) - .setStepSound(Block.soundTypeWood) - .setBlockName("trapdoor.ghostwood"); + trapdoorGhostwood.setHardness(3.0F).setStepSound(Block.soundTypeWood).setBlockName("trapdoor.ghostwood"); GameRegistry.registerBlock(trapdoorGhostwood, "trapdoor.ghostwood"); // Redwood trapdoorRedwood = new NTrapdoor(Material.wood, "redwood_trapdoor"); @@ -444,10 +407,7 @@ public void preInit() { GameRegistry.registerBlock(trapdoorRedwood, "trapdoor.redwood"); // Bloodwood trapdoorBloodwood = new NTrapdoor(Material.wood, "bloodwood_trapdoor"); - trapdoorBloodwood - .setHardness(3.0F) - .setStepSound(Block.soundTypeWood) - .setBlockName("trapdoor.bloodwood"); + trapdoorBloodwood.setHardness(3.0F).setStepSound(Block.soundTypeWood).setBlockName("trapdoor.bloodwood"); GameRegistry.registerBlock(trapdoorBloodwood, "trapdoor.bloodwood"); // Hopseed trapdoorHopseed = new NTrapdoor(Material.wood, "hopseed_trapdoor"); @@ -463,10 +423,7 @@ public void preInit() { GameRegistry.registerBlock(trapdoorAmaranth, "trapdoor.amaranth"); // Silverbell trapdoorSilverbell = new NTrapdoor(Material.wood, "silverbell_trapdoor"); - trapdoorSilverbell - .setHardness(3.0F) - .setStepSound(Block.soundTypeWood) - .setBlockName("trapdoor.silverbell"); + trapdoorSilverbell.setHardness(3.0F).setStepSound(Block.soundTypeWood).setBlockName("trapdoor.silverbell"); GameRegistry.registerBlock(trapdoorSilverbell, "trapdoor.silverbell"); // Tigerwood trapdoorTiger = new NTrapdoor(Material.wood, "tiger_trapdoor"); @@ -488,12 +445,8 @@ public void preInit() { // Wooden Fences if (PHNatura.enableWoodenFences) { - alternateFence = new AlternateFence(Material.wood) - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) - .setBlockName("fence") - .setCreativeTab(NaturaTab.tab); + alternateFence = new AlternateFence(Material.wood).setHardness(2.0F).setResistance(5.0F) + .setStepSound(Block.soundTypeWood).setBlockName("fence").setCreativeTab(NaturaTab.tab); GameRegistry.registerBlock(alternateFence, FenceItem.class, "Natura.fence"); } @@ -501,106 +454,67 @@ public void preInit() { if (PHNatura.enableWoodenFenceGates) { // Eucalyptus fenceGateEucalyptus = new NFenceGate(planks, 0); - fenceGateEucalyptus - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateEucalyptus.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.eucalyptus"); GameRegistry.registerBlock(fenceGateEucalyptus, "fenceGate.eucalyptus"); // Sakura fenceGateSakura = new NFenceGate(planks, 1); - fenceGateSakura - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateSakura.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.sakura"); GameRegistry.registerBlock(fenceGateSakura, "fenceGate.sakura"); // Ghostwood fenceGateGhostwood = new NFenceGate(planks, 2); - fenceGateGhostwood - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateGhostwood.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.ghostwood"); GameRegistry.registerBlock(fenceGateGhostwood, "fenceGate.ghostwood"); // Redwood fenceGateRedwood = new NFenceGate(planks, 3); - fenceGateRedwood - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateRedwood.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.redwood"); GameRegistry.registerBlock(fenceGateRedwood, "fenceGate.redwood"); // Bloodwood fenceGateBloodwood = new NFenceGate(planks, 4); - fenceGateBloodwood - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateBloodwood.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.bloodwood"); GameRegistry.registerBlock(fenceGateBloodwood, "fenceGate.bloodwood"); // Hopseed fenceGateHopseed = new NFenceGate(planks, 5); - fenceGateHopseed - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateHopseed.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.hopseed"); GameRegistry.registerBlock(fenceGateHopseed, "fenceGate.hopseed"); // Maple fenceGateMaple = new NFenceGate(planks, 6); - fenceGateMaple - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateMaple.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.maple"); GameRegistry.registerBlock(fenceGateMaple, "fenceGate.maple"); // Amaranth fenceGateAmaranth = new NFenceGate(planks, 8); - fenceGateAmaranth - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateAmaranth.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.amaranth"); GameRegistry.registerBlock(fenceGateAmaranth, "fenceGate.amaranth"); // Silverbell fenceGateSilverbell = new NFenceGate(planks, 7); - fenceGateSilverbell - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateSilverbell.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.silverbell"); GameRegistry.registerBlock(fenceGateSilverbell, "fenceGate.silverbell"); // Tigerwood fenceGateTiger = new NFenceGate(planks, 9); - fenceGateTiger - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateTiger.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.tiger"); GameRegistry.registerBlock(fenceGateTiger, "fenceGate.tiger"); // Willow fenceGateWillow = new NFenceGate(planks, 10); - fenceGateWillow - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateWillow.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.willow"); GameRegistry.registerBlock(fenceGateWillow, "fenceGate.willow"); // Darkwood fenceGateDarkwood = new NFenceGate(planks, 11); - fenceGateDarkwood - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateDarkwood.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.darkwood"); GameRegistry.registerBlock(fenceGateDarkwood, "fenceGate.darkwood"); // Fusewood fenceGateFusewood = new NFenceGate(planks, 12); - fenceGateFusewood - .setHardness(2.0F) - .setResistance(5.0F) - .setStepSound(Block.soundTypeWood) + fenceGateFusewood.setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood) .setBlockName("fenceGate.fusewood"); GameRegistry.registerBlock(fenceGateFusewood, "fenceGate.fusewood"); } @@ -609,93 +523,65 @@ public void preInit() { if (PHNatura.enableWoodenPressurePlates) { // Eucalyptus pressurePlateEucalyptus = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 0); - pressurePlateEucalyptus - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateEucalyptus.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.eucalyptus"); GameRegistry.registerBlock(pressurePlateEucalyptus, "pressureplate.eucalyptus"); // Sakura pressurePlateSakura = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 1); - pressurePlateSakura - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateSakura.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.sakura"); GameRegistry.registerBlock(pressurePlateSakura, "pressureplate.sakura"); // Ghostwood pressurePlateGhostwood = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 2); - pressurePlateGhostwood - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateGhostwood.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.ghostwood"); GameRegistry.registerBlock(pressurePlateGhostwood, "pressureplate.ghostwood"); // Redwood pressurePlateRedwood = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 3); - pressurePlateRedwood - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateRedwood.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.redwood"); GameRegistry.registerBlock(pressurePlateRedwood, "pressureplate.redwood"); // Bloodwood pressurePlateBloodwood = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 4); - pressurePlateBloodwood - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateBloodwood.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.bloodwood"); GameRegistry.registerBlock(pressurePlateBloodwood, "pressureplate.bloodwood"); // Hopseed pressurePlateHopseed = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 5); - pressurePlateHopseed - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateHopseed.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.hopseed"); GameRegistry.registerBlock(pressurePlateHopseed, "pressureplate.hopseed"); // Maple pressurePlateMaple = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 6); - pressurePlateMaple - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) - .setBlockName("pressureplate.maple"); + pressurePlateMaple.setHardness(0.5F).setStepSound(Block.soundTypeWood).setBlockName("pressureplate.maple"); GameRegistry.registerBlock(pressurePlateMaple, "pressureplate.maple"); // Amaranth pressurePlateAmaranth = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 8); - pressurePlateAmaranth - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateAmaranth.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.amaranth"); GameRegistry.registerBlock(pressurePlateAmaranth, "pressureplate.amaranth"); // Silverbell pressurePlateSilverbell = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 7); - pressurePlateSilverbell - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateSilverbell.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.silverbell"); GameRegistry.registerBlock(pressurePlateSilverbell, "pressureplate.silverbell"); // Tigerwood pressurePlateTiger = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 9); - pressurePlateTiger - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) - .setBlockName("pressureplate.tiger"); + pressurePlateTiger.setHardness(0.5F).setStepSound(Block.soundTypeWood).setBlockName("pressureplate.tiger"); GameRegistry.registerBlock(pressurePlateTiger, "pressureplate.tiger"); // Willow pressurePlateWillow = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 10); - pressurePlateWillow - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateWillow.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.willow"); GameRegistry.registerBlock(pressurePlateWillow, "pressureplate.willow"); // Darkwood pressurePlateDarkwood = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 11); - pressurePlateDarkwood - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateDarkwood.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.darkwood"); GameRegistry.registerBlock(pressurePlateDarkwood, "pressureplate.darkwood"); // Fusewood pressurePlateFusewood = new NPressurePlate(Material.wood, Sensitivity.everything, planks, 12); - pressurePlateFusewood - .setHardness(0.5F) - .setStepSound(Block.soundTypeWood) + pressurePlateFusewood.setHardness(0.5F).setStepSound(Block.soundTypeWood) .setBlockName("pressureplate.fusewood"); GameRegistry.registerBlock(pressurePlateFusewood, "pressureplate.fusewood"); } @@ -852,8 +738,8 @@ public void preInit() { bowlEmpty = new BowlEmpty().setUnlocalizedName("natura.emptybowl"); GameRegistry.registerItem(bowlEmpty, "natura.emptybowl"); if (PHNatura.enableFlintAndBlaze) { - flintAndBlaze = - new FlintAndBlaze().setUnlocalizedName("flintandblaze").setTextureName("natura:flint_and_blaze"); + flintAndBlaze = new FlintAndBlaze().setUnlocalizedName("flintandblaze") + .setTextureName("natura:flint_and_blaze"); GameRegistry.registerItem(flintAndBlaze, "natura.flintandblaze"); } @@ -864,33 +750,32 @@ public void preInit() { GameRegistry.registerCustomItemStack("rawImphide", new ItemStack(impMeat, 1, 0)); GameRegistry.registerCustomItemStack("cookedImphide", new ItemStack(impMeat, 1, 1)); - ArmorMaterial Imp = EnumHelper.addArmorMaterial("Imp", 33, new int[] {1, 3, 2, 1}, 15); + ArmorMaterial Imp = EnumHelper.addArmorMaterial("Imp", 33, new int[] { 1, 3, 2, 1 }, 15); impHelmet = new NaturaArmor(Imp, 1, 0, "imp_helmet", "imp").setUnlocalizedName("natura.armor.imphelmet"); GameRegistry.registerItem(impHelmet, "natura.armor.imphelmet"); impJerkin = new NaturaArmor(Imp, 1, 1, "imp_body", "imp").setUnlocalizedName("natura.armor.impjerkin"); GameRegistry.registerItem(impJerkin, "natura.armor.impjerkin"); - impLeggings = - new NaturaArmor(Imp, 1, 2, "imp_leggings", "imp").setUnlocalizedName("natura.armor.impleggings"); + impLeggings = new NaturaArmor(Imp, 1, 2, "imp_leggings", "imp") + .setUnlocalizedName("natura.armor.impleggings"); GameRegistry.registerItem(impLeggings, "natura.armor.impleggings"); impBoots = new NaturaArmor(Imp, 1, 3, "imp_boots", "imp").setUnlocalizedName("natura.armor.impboots"); GameRegistry.registerItem(impBoots, "natura.armor.impboots"); } // Wooden Sticks - stickItem = - (new StickItem()).setFull3D().setUnlocalizedName("natura.stick").setCreativeTab(NaturaTab.tab); + stickItem = (new StickItem()).setFull3D().setUnlocalizedName("natura.stick").setCreativeTab(NaturaTab.tab); GameRegistry.registerItem(stickItem, "natura.stick"); // Nether Tools if (PHNatura.enableNetherWoodTools) { - ghostwoodSword = - new NaturaSword(ToolMaterial.WOOD, "ghostwood").setUnlocalizedName("natura.sword.ghostwood"); + ghostwoodSword = new NaturaSword(ToolMaterial.WOOD, "ghostwood") + .setUnlocalizedName("natura.sword.ghostwood"); GameRegistry.registerItem(ghostwoodSword, "natura.sword.ghostwood"); - ghostwoodPickaxe = - new NaturaPickaxe(ToolMaterial.WOOD, "ghostwood").setUnlocalizedName("natura.pickaxe.ghostwood"); + ghostwoodPickaxe = new NaturaPickaxe(ToolMaterial.WOOD, "ghostwood") + .setUnlocalizedName("natura.pickaxe.ghostwood"); GameRegistry.registerItem(ghostwoodPickaxe, "natura.pickaxe.ghostwood"); - ghostwoodShovel = - new NaturaShovel(ToolMaterial.WOOD, "ghostwood").setUnlocalizedName("natura.shovel.ghostwood"); + ghostwoodShovel = new NaturaShovel(ToolMaterial.WOOD, "ghostwood") + .setUnlocalizedName("natura.shovel.ghostwood"); GameRegistry.registerItem(ghostwoodShovel, "natura.shovel.ghostwood"); ghostwoodAxe = new NaturaHatchet(ToolMaterial.WOOD, "ghostwood").setUnlocalizedName("natura.axe.ghostwood"); GameRegistry.registerItem(ghostwoodAxe, "natura.axe.ghostwood"); @@ -921,11 +806,11 @@ public void preInit() { darkwoodSword = new NaturaSword(ToolMaterial.STONE, "darkwood").setUnlocalizedName("natura.sword.darkwood"); GameRegistry.registerItem(darkwoodSword, "natura.sword.darkwood"); - darkwoodPickaxe = - new NaturaPickaxe(ToolMaterial.STONE, "darkwood").setUnlocalizedName("natura.pickaxe.darkwood"); + darkwoodPickaxe = new NaturaPickaxe(ToolMaterial.STONE, "darkwood") + .setUnlocalizedName("natura.pickaxe.darkwood"); GameRegistry.registerItem(darkwoodPickaxe, "natura.pickaxe.darkwood"); - darkwoodShovel = - new NaturaShovel(ToolMaterial.STONE, "darkwood").setUnlocalizedName("natura.shovel.darkwood"); + darkwoodShovel = new NaturaShovel(ToolMaterial.STONE, "darkwood") + .setUnlocalizedName("natura.shovel.darkwood"); GameRegistry.registerItem(darkwoodShovel, "natura.shovel.darkwood"); darkwoodAxe = new NaturaHatchet(ToolMaterial.STONE, "darkwood").setUnlocalizedName("natura.axe.darkwood"); GameRegistry.registerItem(darkwoodAxe, "natura.axe.darkwood"); @@ -939,11 +824,11 @@ public void preInit() { fusewoodSword = new NaturaSword(ToolMaterial.IRON, "fusewood").setUnlocalizedName("natura.sword.fusewood"); GameRegistry.registerItem(fusewoodSword, "natura.sword.fusewood"); - fusewoodPickaxe = - new NaturaPickaxe(ToolMaterial.IRON, "fusewood").setUnlocalizedName("natura.pickaxe.fusewood"); + fusewoodPickaxe = new NaturaPickaxe(ToolMaterial.IRON, "fusewood") + .setUnlocalizedName("natura.pickaxe.fusewood"); GameRegistry.registerItem(fusewoodPickaxe, "natura.pickaxe.fusewood"); - fusewoodShovel = - new NaturaShovel(ToolMaterial.IRON, "fusewood").setUnlocalizedName("natura.shovel.fusewood"); + fusewoodShovel = new NaturaShovel(ToolMaterial.IRON, "fusewood") + .setUnlocalizedName("natura.shovel.fusewood"); GameRegistry.registerItem(fusewoodShovel, "natura.shovel.fusewood"); fusewoodAxe = new NaturaHatchet(ToolMaterial.IRON, "fusewood").setUnlocalizedName("natura.axe.fusewood"); GameRegistry.registerItem(fusewoodAxe, "natura.axe.fusewood"); @@ -957,8 +842,8 @@ public void preInit() { } if (PHNatura.enableQuartzTools) { - netherquartzSword = - new NaturaSword(ToolMaterial.STONE, "netherquartz").setUnlocalizedName("natura.sword.netherquartz"); + netherquartzSword = new NaturaSword(ToolMaterial.STONE, "netherquartz") + .setUnlocalizedName("natura.sword.netherquartz"); GameRegistry.registerItem(netherquartzSword, "natura.sword.netherquartz"); netherquartzPickaxe = new NaturaPickaxe(ToolMaterial.STONE, "netherquartz") .setUnlocalizedName("natura.pickaxe.netherquartz"); @@ -966,11 +851,11 @@ public void preInit() { netherquartzShovel = new NaturaShovel(ToolMaterial.STONE, "netherquartz") .setUnlocalizedName("natura.shovel.netherquartz"); GameRegistry.registerItem(netherquartzShovel, "natura.shovel.netherquartz"); - netherquartzAxe = - new NaturaHatchet(ToolMaterial.STONE, "netherquartz").setUnlocalizedName("natura.axe.netherquartz"); + netherquartzAxe = new NaturaHatchet(ToolMaterial.STONE, "netherquartz") + .setUnlocalizedName("natura.axe.netherquartz"); GameRegistry.registerItem(netherquartzAxe, "natura.axe.netherquartz"); - netherquartzKama = - new NaturaKama(ToolMaterial.STONE, "netherquartz").setUnlocalizedName("natura.kama.netherquartz"); + netherquartzKama = new NaturaKama(ToolMaterial.STONE, "netherquartz") + .setUnlocalizedName("natura.kama.netherquartz"); GameRegistry.registerItem(netherquartzKama, "natura.kama.netherquartz"); netherquartzPickaxe.setHarvestLevel("pickaxe", 1); netherquartzShovel.setHarvestLevel("shovel", 1); @@ -1012,67 +897,80 @@ public void addRecipes() { // Blaze Rails if (PHNatura.enableBlazeRails) { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(brailPowered, 6), - "X X", - "X#X", - "XRX", - 'X', - Items.blaze_rod, - 'R', - "dustRedstone", - '#', - new ItemStack(darkTree, 1, 1))); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(brailActivator, 6), - "XSX", - "X#X", - "XSX", - 'X', - Items.blaze_rod, - '#', - Blocks.redstone_torch, - 'S', - "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(brail, 16), "X X", "X#X", "X X", 'X', Items.blaze_rod, '#', "stickWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(brailPowered, 6), + "X X", + "X#X", + "XRX", + 'X', + Items.blaze_rod, + 'R', + "dustRedstone", + '#', + new ItemStack(darkTree, 1, 1))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(brailActivator, 6), + "XSX", + "X#X", + "XSX", + 'X', + Items.blaze_rod, + '#', + Blocks.redstone_torch, + 'S', + "stickWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(brail, 16), + "X X", + "X#X", + "X X", + 'X', + Items.blaze_rod, + '#', + "stickWood")); if (PHNatura.enableNetherPressurePlates) { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(brailDetector, 6), - "X X", - "X#X", - "XRX", - 'X', - Items.blaze_rod, - 'R', - "dustRedstone", - '#', - netherPressurePlate)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(brailDetector, 6), + "X X", + "X#X", + "XRX", + 'X', + Items.blaze_rod, + 'R', + "dustRedstone", + '#', + netherPressurePlate)); } else { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(brailDetector, 6), - "X X", - "X#X", - "XRX", - 'X', - Items.blaze_rod, - 'R', - "dustRedstone", - '#', - Blocks.stone_pressure_plate)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(brailDetector, 6), + "X X", + "X#X", + "XRX", + 'X', + Items.blaze_rod, + 'R', + "dustRedstone", + '#', + Blocks.stone_pressure_plate)); } } if (PHNatura.enableBlazeHoppers) { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(netherHopper), - "# #", - "#C#", - " # ", - '#', - new ItemStack(Items.blaze_rod), - 'C', - "chestWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(netherHopper), + "# #", + "#C#", + " # ", + '#', + new ItemStack(Items.blaze_rod), + 'C', + "chestWood")); } if (PHNatura.enableFlintAndBlaze) { GameRegistry.addShapelessRecipe(new ItemStack(flintAndBlaze), Items.flint, Items.blaze_rod); @@ -1084,8 +982,15 @@ public void addRecipes() { GameRegistry.addRecipe(new ItemStack(netherButton), "#", '#', stackSingleNetherrack); } if (PHNatura.enableNetherLevers) { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(netherLever), "S", "#", '#', stackSingleNetherrack, 'S', "stickWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(netherLever), + "S", + "#", + '#', + stackSingleNetherrack, + 'S', + "stickWood")); } // Overworld plants @@ -1130,7 +1035,10 @@ public void addRecipes() { GameRegistry.addRecipe(new ItemStack(planks, 4, 2), "w", 'w', new ItemStack(tree, 1, 2)); GameRegistry.addRecipe(new ItemStack(planks, 4, 3), "w", 'w', new ItemStack(redwood, 1, 1)); GameRegistry.addRecipe( - new ItemStack(planks, 4, 4), "w", 'w', new ItemStack(bloodwood, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(planks, 4, 4), + "w", + 'w', + new ItemStack(bloodwood, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addRecipe(new ItemStack(planks, 4, 5), "w", 'w', new ItemStack(tree, 1, 3)); GameRegistry.addRecipe(new ItemStack(planks, 4, 6), "w", 'w', new ItemStack(rareTree, 1, 0)); GameRegistry.addRecipe(new ItemStack(planks, 4, 7), "w", 'w', new ItemStack(rareTree, 1, 1)); @@ -1144,7 +1052,12 @@ public void addRecipes() { if (PHNatura.enableWoodenWorkbenches) { for (int i = 0; i < woodTextureNames.length; i++) { addShapedRecipeFirst( - recipes, new ItemStack(alternateWorkbench, 1, i), "##", "##", '#', new ItemStack(planks, 1, i)); + recipes, + new ItemStack(alternateWorkbench, 1, i), + "##", + "##", + '#', + new ItemStack(planks, 1, i)); } } @@ -1166,24 +1079,18 @@ public void addRecipes() { // Wooden Stairs if (PHNatura.enableWoodenStairs) { - Block[] stairs = new Block[] { - stairEucalyptus, - stairSakura, - stairGhostwood, - stairRedwood, - stairBloodwood, - stairHopseed, - stairMaple, - stairSilverbell, - stairAmaranth, - stairTiger, - stairWillow, - stairDarkwood, - stairFusewood - }; + Block[] stairs = new Block[] { stairEucalyptus, stairSakura, stairGhostwood, stairRedwood, stairBloodwood, + stairHopseed, stairMaple, stairSilverbell, stairAmaranth, stairTiger, stairWillow, stairDarkwood, + stairFusewood }; for (int i = 0; i < 13; i++) { addShapedRecipeFirst( - recipes, new ItemStack(stairs[i], 4), "# ", "## ", "###", '#', new ItemStack(planks, 1, i)); + recipes, + new ItemStack(stairs[i], 4), + "# ", + "## ", + "###", + '#', + new ItemStack(planks, 1, i)); } } @@ -1191,31 +1098,27 @@ public void addRecipes() { if (PHNatura.enableWoodenSlabs) { for (int i = 0; i < 8; i++) addShapedRecipeFirst(recipes, new ItemStack(plankSlab1, 6, i), "###", '#', new ItemStack(planks, 1, i)); - for (int i = 0; i < 5; i++) - addShapedRecipeFirst( - recipes, new ItemStack(plankSlab2, 6, i), "###", '#', new ItemStack(planks, 1, 8 + i)); + for (int i = 0; i < 5; i++) addShapedRecipeFirst( + recipes, + new ItemStack(plankSlab2, 6, i), + "###", + '#', + new ItemStack(planks, 1, 8 + i)); } // Wooden Trapdoors if (PHNatura.enableWoodenTrapdoors) { - Block[] trapdoors = new Block[] { - trapdoorEucalyptus, - trapdoorSakura, - trapdoorGhostwood, - trapdoorRedwood, - trapdoorBloodwood, - trapdoorHopseed, - trapdoorMaple, - trapdoorSilverbell, - trapdoorAmaranth, - trapdoorTiger, - trapdoorWillow, - trapdoorDarkwood, - trapdoorFusewood - }; + Block[] trapdoors = new Block[] { trapdoorEucalyptus, trapdoorSakura, trapdoorGhostwood, trapdoorRedwood, + trapdoorBloodwood, trapdoorHopseed, trapdoorMaple, trapdoorSilverbell, trapdoorAmaranth, + trapdoorTiger, trapdoorWillow, trapdoorDarkwood, trapdoorFusewood }; for (int i = 0; i < 13; i++) { addShapedRecipeFirst( - recipes, new ItemStack(trapdoors[i], 2), "###", "###", '#', new ItemStack(planks, 1, i)); + recipes, + new ItemStack(trapdoors[i], 2), + "###", + "###", + '#', + new ItemStack(planks, 1, i)); } } @@ -1235,21 +1138,9 @@ public void addRecipes() { // Wooden Fence Gates if (PHNatura.enableWoodenFenceGates) { - Block[] fenceGates = new Block[] { - fenceGateEucalyptus, - fenceGateSakura, - fenceGateGhostwood, - fenceGateRedwood, - fenceGateBloodwood, - fenceGateHopseed, - fenceGateMaple, - fenceGateSilverbell, - fenceGateAmaranth, - fenceGateTiger, - fenceGateWillow, - fenceGateDarkwood, - fenceGateFusewood - }; + Block[] fenceGates = new Block[] { fenceGateEucalyptus, fenceGateSakura, fenceGateGhostwood, + fenceGateRedwood, fenceGateBloodwood, fenceGateHopseed, fenceGateMaple, fenceGateSilverbell, + fenceGateAmaranth, fenceGateTiger, fenceGateWillow, fenceGateDarkwood, fenceGateFusewood }; for (int i = 0; i < 13; i++) { addShapedRecipeFirst( recipes, @@ -1265,44 +1156,25 @@ public void addRecipes() { // Wooden Pressure Plates if (PHNatura.enableWoodenPressurePlates) { - Block[] pressurePlates = new Block[] { - pressurePlateEucalyptus, - pressurePlateSakura, - pressurePlateGhostwood, - pressurePlateRedwood, - pressurePlateBloodwood, - pressurePlateHopseed, - pressurePlateMaple, - pressurePlateSilverbell, - pressurePlateAmaranth, - pressurePlateTiger, - pressurePlateWillow, - pressurePlateDarkwood, - pressurePlateFusewood - }; + Block[] pressurePlates = new Block[] { pressurePlateEucalyptus, pressurePlateSakura, pressurePlateGhostwood, + pressurePlateRedwood, pressurePlateBloodwood, pressurePlateHopseed, pressurePlateMaple, + pressurePlateSilverbell, pressurePlateAmaranth, pressurePlateTiger, pressurePlateWillow, + pressurePlateDarkwood, pressurePlateFusewood }; for (int i = 0; i < 13; i++) { addShapedRecipeFirst( - recipes, new ItemStack(pressurePlates[i], 1), "##", '#', new ItemStack(planks, 1, i)); + recipes, + new ItemStack(pressurePlates[i], 1), + "##", + '#', + new ItemStack(planks, 1, i)); } } // Wooden Buttons if (PHNatura.enableWoodenButtons) { - Block[] buttons = new Block[] { - buttonEucalyptus, - buttonSakura, - buttonGhostwood, - buttonRedwood, - buttonBloodwood, - buttonHopseed, - buttonMaple, - buttonSilverbell, - buttonAmaranth, - buttonTiger, - buttonWillow, - buttonDarkwood, - buttonFusewood - }; + Block[] buttons = new Block[] { buttonEucalyptus, buttonSakura, buttonGhostwood, buttonRedwood, + buttonBloodwood, buttonHopseed, buttonMaple, buttonSilverbell, buttonAmaranth, buttonTiger, + buttonWillow, buttonDarkwood, buttonFusewood }; for (int i = 0; i < 13; i++) { addShapedRecipeFirst(recipes, new ItemStack(buttons[i], 1), "#", '#', new ItemStack(planks, 1, i)); } @@ -1310,39 +1182,89 @@ public void addRecipes() { if (PHNatura.enableWoodenDoors) { addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 0), "##", "##", "##", '#', new ItemStack(planks, 1, 3)); + recipes, + new ItemStack(doorItem, 1, 0), + "##", + "##", + "##", + '#', + new ItemStack(planks, 1, 3)); addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 1), "##", "##", "##", '#', new ItemStack(planks, 1, 0)); + recipes, + new ItemStack(doorItem, 1, 1), + "##", + "##", + "##", + '#', + new ItemStack(planks, 1, 0)); addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 2), "##", "##", "##", '#', new ItemStack(planks, 1, 5)); + recipes, + new ItemStack(doorItem, 1, 2), + "##", + "##", + "##", + '#', + new ItemStack(planks, 1, 5)); addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 3), "##", "##", "##", '#', new ItemStack(planks, 1, 1)); + recipes, + new ItemStack(doorItem, 1, 3), + "##", + "##", + "##", + '#', + new ItemStack(planks, 1, 1)); addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 4), "##", "##", "##", '#', new ItemStack(planks, 1, 2)); + recipes, + new ItemStack(doorItem, 1, 4), + "##", + "##", + "##", + '#', + new ItemStack(planks, 1, 2)); addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 5), "##", "##", "##", '#', new ItemStack(planks, 1, 4)); + recipes, + new ItemStack(doorItem, 1, 5), + "##", + "##", + "##", + '#', + new ItemStack(planks, 1, 4)); addShapedRecipeFirst( - recipes, new ItemStack(doorItem, 1, 6), "##", "##", "##", '#', new ItemStack(redwood, 1, 0)); + recipes, + new ItemStack(doorItem, 1, 6), + "##", + "##", + "##", + '#', + new ItemStack(redwood, 1, 0)); } // Other items GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.glass_bottle, 3), "# #", " # ", '#', "glass")); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Blocks.daylight_detector), - "GGG", - "QQQ", - "WWW", - 'G', - "glass", - 'Q', - "gemQuartz", - 'W', - "slabWood")); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Blocks.daylight_detector), + "GGG", + "QQQ", + "WWW", + 'G', + "glass", + 'Q', + "gemQuartz", + 'W', + "slabWood")); if (PHNatura.enableCactusJuice) { GameRegistry.addRecipe(new ItemStack(waterDrop, 1), "X", 'X', Blocks.cactus); GameRegistry.addRecipe( - new ItemStack(Items.water_bucket, 1), "www", "wBw", "www", 'w', waterDrop, 'B', Items.bucket); + new ItemStack(Items.water_bucket, 1), + "www", + "wBw", + "www", + 'w', + waterDrop, + 'B', + Items.bucket); } GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.string), "sss", 's', "cropCotton")); @@ -1393,21 +1315,25 @@ public void addRecipes() { new ItemStack(plantItem, 1, 5), 'f', Items.flint); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(Items.arrow, 4, 0), - " f ", - "#s#", - " # ", - 's', - "stickWood", - '#', - new ItemStack(plantItem, 1, 5), - 'f', - Items.flint)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(Items.arrow, 4, 0), + " f ", + "#s#", + " # ", + 's', + "stickWood", + '#', + new ItemStack(plantItem, 1, 5), + 'f', + Items.flint)); - /*GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); - GameRegistry.addShapelessRecipe(new ItemStack(plantItem, 1, 2), new ItemStack(plantItem, 1, 1), Item.bucketWater ); - GameRegistry.addShapelessRecipe(new ItemStack(plantItem, 2, 2), new ItemStack(plantItem, 1, 1), Item.egg );*/ + /* + * GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new + * ItemStack(blankPattern, 1, 0), 'w', "logWood")); GameRegistry.addShapelessRecipe(new ItemStack(plantItem, 1, + * 2), new ItemStack(plantItem, 1, 1), Item.bucketWater ); GameRegistry.addShapelessRecipe(new + * ItemStack(plantItem, 2, 2), new ItemStack(plantItem, 1, 1), Item.egg ); + */ // Seed Bags if (PHNatura.enableSeedBags) { @@ -1431,45 +1357,52 @@ public void addRecipes() { GameRegistry.addRecipe(new ItemStack(Items.nether_wart, 9, 0), "s", 's', netherWartBag); } if (PHNatura.enableBonemealBags) { - GameRegistry.addRecipe( - new ItemStack(boneBag, 1, 0), "sss", "sss", "sss", 's', new ItemStack(Items.dye, 1, 15)); + GameRegistry + .addRecipe(new ItemStack(boneBag, 1, 0), "sss", "sss", "sss", 's', new ItemStack(Items.dye, 1, 15)); GameRegistry.addRecipe(new ItemStack(Items.dye, 9, 15), "s", 's', boneBag); } // Berries if (PHNatura.enableBerryBushes) { - String[] berryTypes = new String[] { - "cropRaspberry", "cropBlueberry", "cropBlackberry", "cropMaloberry", "cropStrawberry", "cropCranberry" - }; + String[] berryTypes = new String[] { "cropRaspberry", "cropBlueberry", "cropBlackberry", "cropMaloberry", + "cropStrawberry", "cropCranberry" }; for (int iter1 = 0; iter1 < berryTypes.length - 2; iter1++) for (int iter2 = iter1 + 1; iter2 < berryTypes.length - 1; iter2++) - for (int iter3 = iter2 + 1; iter3 < berryTypes.length; iter3++) - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(berryMedley, 1, 0), - "bowlWood", - berryTypes[iter1], - berryTypes[iter2], - berryTypes[iter3])); - - for (int iter1 = 0; iter1 < berryTypes.length - 3; iter1++) - for (int iter2 = iter1 + 1; iter2 < berryTypes.length - 2; iter2++) - for (int iter3 = iter2 + 1; iter3 < berryTypes.length - 1; iter3++) - for (int iter4 = iter3 + 1; iter4 < berryTypes.length; iter4++) - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(berryMedley, 2, 0), - "bowlWood", + for (int iter3 = iter2 + 1; iter3 < berryTypes.length; iter3++) GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(berryMedley, 1, 0), "bowlWood", berryTypes[iter1], berryTypes[iter2], - berryTypes[iter3], - berryTypes[iter4])); + berryTypes[iter3])); - /*GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 0), new ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 2), new ItemStack(Item.bowlEmpty)); - GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 0), new ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty)); - GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 0), new ItemStack(berryItem, 1, 2), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty)); - GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 2), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty)); - GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 2), new ItemStack(berryItem, 1, 0), new ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 2), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty), new ItemStack(Item.bowlEmpty));*/ + for (int iter1 = 0; iter1 < berryTypes.length - 3; iter1++) + for (int iter2 = iter1 + 1; iter2 < berryTypes.length - 2; iter2++) + for (int iter3 = iter2 + 1; iter3 < berryTypes.length - 1; iter3++) + for (int iter4 = iter3 + 1; iter4 < berryTypes.length; iter4++) GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(berryMedley, 2, 0), + "bowlWood", + "bowlWood", + berryTypes[iter1], + berryTypes[iter2], + berryTypes[iter3], + berryTypes[iter4])); + + /* + * GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 0), new + * ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 2), new ItemStack(Item.bowlEmpty)); + * GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 0), new + * ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty)); + * GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 0), new + * ItemStack(berryItem, 1, 2), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty)); + * GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 1), new ItemStack(berryItem, 1, 1), new + * ItemStack(berryItem, 1, 2), new ItemStack(berryItem, 1, 3), new ItemStack(Item.bowlEmpty)); + * GameRegistry.addShapelessRecipe(new ItemStack(berryMedley, 2), new ItemStack(berryItem, 1, 0), new + * ItemStack(berryItem, 1, 1), new ItemStack(berryItem, 1, 2), new ItemStack(berryItem, 1, 3), new + * ItemStack(Item.bowlEmpty), new ItemStack(Item.bowlEmpty)); + */ } // Nether items @@ -1479,35 +1412,45 @@ public void addRecipes() { new ItemStack(Blocks.brown_mushroom), new ItemStack(Blocks.red_mushroom), new ItemStack(Items.bowl)); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(bowlStew, 1, 14), - new ItemStack(glowshroom, 1, 0), - new ItemStack(glowshroom, 1, 1), - new ItemStack(glowshroom, 1, 2), - "bowlWood")); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(bowlStew, 1, 14), + new ItemStack(glowshroom, 1, 0), + new ItemStack(glowshroom, 1, 1), + new ItemStack(glowshroom, 1, 2), + "bowlWood")); for (int i = 0; i < BowlEmpty.textureNames.length; i++) { if (!(BowlEmpty.textureNames[i].equals(""))) { - if (FluidRegistry.isFluidRegistered("mushroomsoup")) - FluidContainerRegistry.registerFluidContainer( - FluidRegistry.getFluid("mushroomsoup"), new ItemStack(this.bowlStew, 1, i)); + if (FluidRegistry.isFluidRegistered("mushroomsoup")) FluidContainerRegistry.registerFluidContainer( + FluidRegistry.getFluid("mushroomsoup"), + new ItemStack(this.bowlStew, 1, i)); addShapedRecipeFirst( - recipes, new ItemStack(bowlEmpty, 4, i), "# #", " # ", '#', new ItemStack(planks, 1, i)); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(bowlStew, 1, i + 1), - "bowlWood", - new ItemStack(Blocks.brown_mushroom), - new ItemStack(Blocks.red_mushroom_block))); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(bowlStew, 1, i + 15), - "bowlWood", - new ItemStack(glowshroom, 1, 0), - new ItemStack(glowshroom, 1, 1), - new ItemStack(glowshroom, 1, 2))); + recipes, + new ItemStack(bowlEmpty, 4, i), + "# #", + " # ", + '#', + new ItemStack(planks, 1, i)); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(bowlStew, 1, i + 1), + "bowlWood", + new ItemStack(Blocks.brown_mushroom), + new ItemStack(Blocks.red_mushroom_block))); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(bowlStew, 1, i + 15), + "bowlWood", + new ItemStack(glowshroom, 1, 0), + new ItemStack(glowshroom, 1, 1), + new ItemStack(glowshroom, 1, 2))); } } - /*bowlEmpty = new BowlEmpty(PHNatura.bowlEmpty).setUnlocalizedName("natura.emptybowl"); - bowlStew = new BowlStew(PHNatura.bowlStew).setUnlocalizedName("natura.stewbowl");*/ + /* + * bowlEmpty = new BowlEmpty(PHNatura.bowlEmpty).setUnlocalizedName("natura.emptybowl"); bowlStew = new + * BowlStew(PHNatura.bowlStew).setUnlocalizedName("natura.stewbowl"); + */ // Imp items if (PHNatura.enableImps) { @@ -1542,19 +1485,23 @@ public void addRecipes() { if (PHNatura.enableWoodenFences) { for (int i = 0; i < woodTextureNames.length; i++) { addShapedRecipeFirst( - recipes, new ItemStack(stickItem, 4, i), "#", "#", '#', new ItemStack(planks, 1, i)); + recipes, + new ItemStack(stickItem, 4, i), + "#", + "#", + '#', + new ItemStack(planks, 1, i)); } } // Nether Tools if (PHNatura.enableNetherWoodTools) { - int[] toolMeta = {2, 4, 11, 12}; + int[] toolMeta = { 2, 4, 11, 12 }; Item[][] tools = { - {ghostwoodSword, ghostwoodPickaxe, ghostwoodShovel, ghostwoodAxe, ghostwoodKama, ghostwoodBow}, - {bloodwoodSword, bloodwoodPickaxe, bloodwoodShovel, bloodwoodAxe, bloodwoodKama, bloodwoodBow}, - {darkwoodSword, darkwoodPickaxe, darkwoodShovel, darkwoodAxe, darkwoodKama, darkwoodBow}, - {fusewoodSword, fusewoodPickaxe, fusewoodShovel, fusewoodAxe, fusewoodKama, fusewoodBow} - }; + { ghostwoodSword, ghostwoodPickaxe, ghostwoodShovel, ghostwoodAxe, ghostwoodKama, ghostwoodBow }, + { bloodwoodSword, bloodwoodPickaxe, bloodwoodShovel, bloodwoodAxe, bloodwoodKama, bloodwoodBow }, + { darkwoodSword, darkwoodPickaxe, darkwoodShovel, darkwoodAxe, darkwoodKama, darkwoodBow }, + { fusewoodSword, fusewoodPickaxe, fusewoodShovel, fusewoodAxe, fusewoodKama, fusewoodBow } }; for (int i = 0; i < toolMeta.length; i++) { addShapedRecipeFirst( @@ -1750,9 +1697,10 @@ public void addShapelessRecipeFirst(List recipeList, ItemStack par1ItemStack, Ob recipeList.add(0, new ShapelessRecipes(par1ItemStack, arraylist)); } - /*public void addLoot () { - //ChestGenHooks.getInfo(ChestGenHooks.BONUS_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(VanityBlocksStorage.StorageBlock,0,0),3,5,6)); - }*/ + /* + * public void addLoot () { //ChestGenHooks.getInfo(ChestGenHooks.BONUS_CHEST).addItem(new + * WeightedRandomChestContent(new ItemStack(VanityBlocksStorage.StorageBlock,0,0),3,5,6)); } + */ public void addOredictSupport() { // Vanilla @@ -1790,16 +1738,17 @@ public void addOredictSupport() { // Wooden Workbenches if (PHNatura.enableWoodenWorkbenches) { + OreDictionary + .registerOre("crafterWood", new ItemStack(alternateWorkbench, 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre( - "crafterWood", new ItemStack(alternateWorkbench, 1, OreDictionary.WILDCARD_VALUE)); - OreDictionary.registerOre( - "craftingTableWood", new ItemStack(alternateWorkbench, 1, OreDictionary.WILDCARD_VALUE)); + "craftingTableWood", + new ItemStack(alternateWorkbench, 1, OreDictionary.WILDCARD_VALUE)); } // Wooden Bookshelves if (PHNatura.enableWoodenBookshelves) { - OreDictionary.registerOre( - "bookshelfWood", new ItemStack(alternateBookshelf, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary + .registerOre("bookshelfWood", new ItemStack(alternateBookshelf, 1, OreDictionary.WILDCARD_VALUE)); } // Wooden Stairs @@ -1967,7 +1916,13 @@ public void createEntities() { if (PHNatura.enableHeatscarSpiders) { EntityRegistry.registerModEntity(HeatscarSpider.class, "FlameSpider", 1, Natura.instance, 32, 5, true); EntityRegistry.registerModEntity( - BabyHeatscarSpider.class, "FlameSpiderBaby", 4, Natura.instance, 32, 5, true); + BabyHeatscarSpider.class, + "FlameSpiderBaby", + 4, + Natura.instance, + 32, + 5, + true); EntityRegistry.addSpawn(HeatscarSpider.class, 10, 4, 4, EnumCreatureType.monster, nether); EntityRegistry.addSpawn(BabyHeatscarSpider.class, 7, 4, 4, EnumCreatureType.monster, nether); } @@ -1987,8 +1942,7 @@ public void modIntegration() { Class.forName("tconstruct.TConstruct"); PatternBuilder pb = PatternBuilder.instance; pb.registerMaterial(new ItemStack(saguaro), 2, "Cactus"); - } catch (Exception e) { - } + } catch (Exception e) {} } public static Item spawnEgg; @@ -1996,25 +1950,13 @@ public void modIntegration() { @Override public int getBurnTime(ItemStack fuel) { if (fuel.getItem() == new ItemStack(floraSapling).getItem() - || fuel.getItem() == new ItemStack(rareSapling).getItem()) return 100; + || fuel.getItem() == new ItemStack(rareSapling).getItem()) + return 100; return 0; } - public static final String woodTextureNames[] = { - "eucalyptus", - "sakura", - "ghostwood", - "redwood", - "bloodwood", - "hopseed", - "maple", - "silverbell", - "purpleheart", - "tiger", - "willow", - "darkwood", - "fusewood" - }; + public static final String woodTextureNames[] = { "eucalyptus", "sakura", "ghostwood", "redwood", "bloodwood", + "hopseed", "maple", "silverbell", "purpleheart", "tiger", "willow", "darkwood", "fusewood" }; // Nether blocks // public static Block infernalStone; diff --git a/src/main/java/mods/natura/common/NCraftingItem.java b/src/main/java/mods/natura/common/NCraftingItem.java index f29f40b8..270dc3d1 100644 --- a/src/main/java/mods/natura/common/NCraftingItem.java +++ b/src/main/java/mods/natura/common/NCraftingItem.java @@ -1,8 +1,7 @@ package mods.natura.common; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -10,7 +9,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NCraftingItem extends Item { + public String[] textureNames; public String[] unlocalizedNames; public IIcon[] icons; diff --git a/src/main/java/mods/natura/common/NProxyCommon.java b/src/main/java/mods/natura/common/NProxyCommon.java index 72f65579..2d25618b 100644 --- a/src/main/java/mods/natura/common/NProxyCommon.java +++ b/src/main/java/mods/natura/common/NProxyCommon.java @@ -1,5 +1,6 @@ package mods.natura.common; public class NProxyCommon { + public void registerRenderer() {} } diff --git a/src/main/java/mods/natura/common/NaturaTab.java b/src/main/java/mods/natura/common/NaturaTab.java index 59768ebb..28f55b48 100644 --- a/src/main/java/mods/natura/common/NaturaTab.java +++ b/src/main/java/mods/natura/common/NaturaTab.java @@ -3,5 +3,6 @@ import mantle.lib.TabTools; public class NaturaTab { + public static TabTools tab; } diff --git a/src/main/java/mods/natura/common/PHNatura.java b/src/main/java/mods/natura/common/PHNatura.java index c2b49e27..9bbc1546 100644 --- a/src/main/java/mods/natura/common/PHNatura.java +++ b/src/main/java/mods/natura/common/PHNatura.java @@ -1,10 +1,13 @@ package mods.natura.common; -import cpw.mods.fml.common.Loader; import java.io.File; + import mods.natura.Natura; + import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.common.Loader; + public class PHNatura { public static void initProps(File confFile) { @@ -23,160 +26,107 @@ public static void initProps(File confFile) { /* Load the configuration file */ config.load(); - Natura.retrogen = - config.get("Retrogen", "Retroactive Generation", false).getBoolean(false); + Natura.retrogen = config.get("Retrogen", "Retroactive Generation", false).getBoolean(false); boolean BoP = false; if (Loader.isModLoaded("BiomesOPlenty")) { BoP = true; } - babyHeatscarMinimum = config.get(catMobChanges, "Minimum Baby Heatscar Spiders on Spider Death", 2) - .getInt(2); + babyHeatscarMinimum = config.get(catMobChanges, "Minimum Baby Heatscar Spiders on Spider Death", 2).getInt(2); if (babyHeatscarMinimum < 0) babyHeatscarMinimum = 0; - babyHeatscarMaximum = config.get(catMobChanges, "Maximum Baby Heatscar Spiders on Spider Death", 4) - .getInt(4); + babyHeatscarMaximum = config.get(catMobChanges, "Maximum Baby Heatscar Spiders on Spider Death", 4).getInt(4); if (babyHeatscarMaximum < 0) babyHeatscarMaximum = 0; overrideNether = config.get(catDisabler, "Override Nether", !BoP).getBoolean(!BoP); canRespawnInNether = config.get(catDisabler, "Obelisks let players respawn in the Nether", true) .getBoolean(true); - generateRedwood = - config.get(catDisabler, "Generate Redwood Trees", true).getBoolean(true); + generateRedwood = config.get(catDisabler, "Generate Redwood Trees", true).getBoolean(true); generateSakura = config.get(catDisabler, "Generate Sakura Trees", true).getBoolean(true); - generateSmallEucalyptus = - config.get(catDisabler, "Generate Small Eucalyptus Trees", true).getBoolean(true); + generateSmallEucalyptus = config.get(catDisabler, "Generate Small Eucalyptus Trees", true).getBoolean(true); generateBush = config.get(catDisabler, "Generate Hopseed Trees", true).getBoolean(true); - generateBloodwood = - config.get(catDisabler, "Generate Bloodwood Trees", true).getBoolean(true); + generateBloodwood = config.get(catDisabler, "Generate Bloodwood Trees", true).getBoolean(true); generateGhost = config.get(catDisabler, "Generate Ghost Trees", true).getBoolean(true); - generateSaguaro = - config.get(catDisabler, "Generate Saguaro Cactus", true).getBoolean(true); + generateSaguaro = config.get(catDisabler, "Generate Saguaro Cactus", true).getBoolean(true); - generateOverworldClouds = - config.get(catDisabler, "Generate Overworld Clouds", true).getBoolean(true); - generateSulfurClouds = - config.get(catDisabler, "Generate Sulfur Clouds", true).getBoolean(true); + generateOverworldClouds = config.get(catDisabler, "Generate Overworld Clouds", true).getBoolean(true); + generateSulfurClouds = config.get(catDisabler, "Generate Sulfur Clouds", true).getBoolean(true); generateAshClouds = config.get(catDisabler, "Generate Ash Clouds", true).getBoolean(true); - generateDarkClouds = - config.get(catDisabler, "Generate Dark Clouds", true).getBoolean(true); + generateDarkClouds = config.get(catDisabler, "Generate Dark Clouds", true).getBoolean(true); - generatePurpleheart = - config.get(catDisabler, "Generate Amaranth Trees", true).getBoolean(true); + generatePurpleheart = config.get(catDisabler, "Generate Amaranth Trees", true).getBoolean(true); generateWillow = config.get(catDisabler, "Generate Willow Trees", true).getBoolean(true); - generateTiger = - config.get(catDisabler, "Generate Tigerwood Trees", true).getBoolean(true); - generateSilverbell = - config.get(catDisabler, "Generate Silverbell Trees", true).getBoolean(true); + generateTiger = config.get(catDisabler, "Generate Tigerwood Trees", true).getBoolean(true); + generateSilverbell = config.get(catDisabler, "Generate Silverbell Trees", true).getBoolean(true); generateMaple = config.get(catDisabler, "Generate Maple Trees", true).getBoolean(true); - generateDarkwood = - config.get(catDisabler, "Generate Darkwood Trees", true).getBoolean(true); - generateFusewood = - config.get(catDisabler, "Generate Fusewood Trees", true).getBoolean(true); - generateThornvines = - config.get(catDisabler, "Generate Thornvines", true).getBoolean(true); + generateDarkwood = config.get(catDisabler, "Generate Darkwood Trees", true).getBoolean(true); + generateFusewood = config.get(catDisabler, "Generate Fusewood Trees", true).getBoolean(true); + generateThornvines = config.get(catDisabler, "Generate Thornvines", true).getBoolean(true); generateBarley = config.get(catDisabler, "Generate Barley Crops", true).getBoolean(true); generateCotton = config.get(catDisabler, "Generate Cotton Crops", true).getBoolean(true); - generateBluebells = - config.get(catDisabler, "Generate Bluebell Flowers", true).getBoolean(true); - - generateBlueberries = - config.get(catDisabler, "Generate Blueberry Bushes", true).getBoolean(true); - generateBlackberries = - config.get(catDisabler, "Generate Blackberry Bushes", true).getBoolean(true); - generateRaspberries = - config.get(catDisabler, "Generate Raspberry Bushes", true).getBoolean(true); - generateMaloberries = - config.get(catDisabler, "Generate Maloberry Bushes", true).getBoolean(true); - - generateBlightberries = - config.get(catDisabler, "Generate Blightberry Bushes", true).getBoolean(true); - generateDuskberries = - config.get(catDisabler, "Generate Duskberry Bushes", true).getBoolean(true); - generateSkyberries = - config.get(catDisabler, "Generate Skyberry Bushes", true).getBoolean(true); - generateStingberries = - config.get(catDisabler, "Generate Stingberry Bushes", true).getBoolean(true); - - generateGreenglowshroom = - config.get(catDisabler, "Generate Green Glowshroom", true).getBoolean(true); - generatePurpleglowshroom = - config.get(catDisabler, "Generate Purple Glowshroom", true).getBoolean(true); - generateBlueglowshroom = - config.get(catDisabler, "Generate Blue Glowshroom", true).getBoolean(true); - generateGlowshroomtree = - config.get(catDisabler, "Generate Glowshroom Trees", true).getBoolean(true); - dropCotton = - config.get(catDisabler, "Drop cotton seeds from grass", true).getBoolean(true); - dropBarley = - config.get(catDisabler, "Drop barley seeds from grass", true).getBoolean(true); - - enableNitroCreepers = - config.get(catDisabler, "Enable Nitro Creepers", true).getBoolean(true); + generateBluebells = config.get(catDisabler, "Generate Bluebell Flowers", true).getBoolean(true); + + generateBlueberries = config.get(catDisabler, "Generate Blueberry Bushes", true).getBoolean(true); + generateBlackberries = config.get(catDisabler, "Generate Blackberry Bushes", true).getBoolean(true); + generateRaspberries = config.get(catDisabler, "Generate Raspberry Bushes", true).getBoolean(true); + generateMaloberries = config.get(catDisabler, "Generate Maloberry Bushes", true).getBoolean(true); + + generateBlightberries = config.get(catDisabler, "Generate Blightberry Bushes", true).getBoolean(true); + generateDuskberries = config.get(catDisabler, "Generate Duskberry Bushes", true).getBoolean(true); + generateSkyberries = config.get(catDisabler, "Generate Skyberry Bushes", true).getBoolean(true); + generateStingberries = config.get(catDisabler, "Generate Stingberry Bushes", true).getBoolean(true); + + generateGreenglowshroom = config.get(catDisabler, "Generate Green Glowshroom", true).getBoolean(true); + generatePurpleglowshroom = config.get(catDisabler, "Generate Purple Glowshroom", true).getBoolean(true); + generateBlueglowshroom = config.get(catDisabler, "Generate Blue Glowshroom", true).getBoolean(true); + generateGlowshroomtree = config.get(catDisabler, "Generate Glowshroom Trees", true).getBoolean(true); + dropCotton = config.get(catDisabler, "Drop cotton seeds from grass", true).getBoolean(true); + dropBarley = config.get(catDisabler, "Drop barley seeds from grass", true).getBoolean(true); + + enableNitroCreepers = config.get(catDisabler, "Enable Nitro Creepers", true).getBoolean(true); enableImps = config.get(catDisabler, "Enable Imps", true).getBoolean(true); - enableHeatscarSpiders = - config.get(catDisabler, "Enable Heatscar Spiders", true).getBoolean(true); + enableHeatscarSpiders = config.get(catDisabler, "Enable Heatscar Spiders", true).getBoolean(true); if (enableNitroCreepers | enableImps | enableHeatscarSpiders) anyMobsEnabled = true; try { Class.forName("chococraft.common.ModChocoCraft"); - enableWheatRecipe = config.get(catDisabler, "Enable wheat to flour recipe", false) - .getBoolean(false); + enableWheatRecipe = config.get(catDisabler, "Enable wheat to flour recipe", false).getBoolean(false); } catch (Exception e) { - enableWheatRecipe = config.get(catDisabler, "Enable wheat to flour recipe", true) - .getBoolean(true); + enableWheatRecipe = config.get(catDisabler, "Enable wheat to flour recipe", true).getBoolean(true); } - redwoodSpawnRarity = - config.get(catWorldgen, "Redwood Tree Spawn Rarity", 150).getInt(150); - bloodSpawnRarity = - config.get(catWorldgen, "Blood Tree Spawn Rarity", 14).getInt(14); - eucalyptusShortSpawnRarity = config.get(catWorldgen, "Small Eucalyptus Tree Spawn Rarity", 25) - .getInt(25); - eucalyptusShortSpawnRange = - config.get(catWorldgen, "Small Eucalyptus Tree Spawn Range", 32).getInt(32); - sakuraSpawnRarity = - config.get(catWorldgen, "Sakura Tree Spawn Rarity", 10).getInt(10); - sakuraSpawnRange = - config.get(catWorldgen, "Sakura Tree Spawn Range", 32).getInt(32); - ghostSpawnRarity = - config.get(catWorldgen, "Ghostwood Tree Spawn Rarity", 10).getInt(10); + redwoodSpawnRarity = config.get(catWorldgen, "Redwood Tree Spawn Rarity", 150).getInt(150); + bloodSpawnRarity = config.get(catWorldgen, "Blood Tree Spawn Rarity", 14).getInt(14); + eucalyptusShortSpawnRarity = config.get(catWorldgen, "Small Eucalyptus Tree Spawn Rarity", 25).getInt(25); + eucalyptusShortSpawnRange = config.get(catWorldgen, "Small Eucalyptus Tree Spawn Range", 32).getInt(32); + sakuraSpawnRarity = config.get(catWorldgen, "Sakura Tree Spawn Rarity", 10).getInt(10); + sakuraSpawnRange = config.get(catWorldgen, "Sakura Tree Spawn Range", 32).getInt(32); + ghostSpawnRarity = config.get(catWorldgen, "Ghostwood Tree Spawn Rarity", 10).getInt(10); bushSpawnRarity = config.get(catWorldgen, "Bush Tree Spawn Rarity", 10).getInt(10); bushSpawnRange = config.get(catWorldgen, "Bush Tree Spawn Range", 20).getInt(20); willowRarity = config.get(catWorldgen, "Willow Tree Spawn Rarity", 10).getInt(10); - purpleheartRarity = - config.get(catWorldgen, "Amaranth Tree Spawn Rarity", 1).getInt(1); + purpleheartRarity = config.get(catWorldgen, "Amaranth Tree Spawn Rarity", 1).getInt(1); mapleRarity = config.get(catWorldgen, "Maple Tree Spawn Rarity", 34).getInt(34); tigerRarity = config.get(catWorldgen, "Tigerwood Tree Spawn Rarity", 30).getInt(30); - silverbellRarity = - config.get(catWorldgen, "Silverbell Tree Spawn Rarity", 70).getInt(70); + silverbellRarity = config.get(catWorldgen, "Silverbell Tree Spawn Rarity", 70).getInt(70); - darkSpawnRarity = - config.get(catWorldgen, "Darkwood Tree Spawn Rarity", 10).getInt(10); - fuseSpawnRarity = - config.get(catWorldgen, "Fusewood Tree Spawn Rarity", 50).getInt(50); + darkSpawnRarity = config.get(catWorldgen, "Darkwood Tree Spawn Rarity", 10).getInt(10); + fuseSpawnRarity = config.get(catWorldgen, "Fusewood Tree Spawn Rarity", 50).getInt(50); - saguaroSpawnRarity = - config.get(catWorldgen, "Saguaro Cactus Spawn Rarity", 5).getInt(5); + saguaroSpawnRarity = config.get(catWorldgen, "Saguaro Cactus Spawn Rarity", 5).getInt(5); cloudSpawnRarity = config.get(catWorldgen, "Cloud Spawn Rarity", 10).getInt(10); cloudSpawnHeight = config.get(catWorldgen, "Cloud Spawn Height", 192).getInt(192); cloudSpawnRange = config.get(catWorldgen, "Cloud Spawn Range", 48).getInt(48); - darkCloudSpawnRarity = - config.get(catWorldgen, "Dark Cloud Spawn Density", 10).getInt(10); - darkCloudSpawnHeight = - config.get(catWorldgen, "Dark Cloud Spawn MinX", 0).getInt(64); - darkCloudSpawnRange = - config.get(catWorldgen, "Dark Cloud Spawn Range", 256).getInt(256); - sulfurSpawnRarity = - config.get(catWorldgen, "Sulfur Cloud Spawn Rarity", 8).getInt(8); - sulfurSpawnHeight = - config.get(catWorldgen, "Sulfur Cloud Spawn Height", 40).getInt(40); - sulfurSpawnRange = - config.get(catWorldgen, "Sulfur Cloud Spawn Range", 78).getInt(78); + darkCloudSpawnRarity = config.get(catWorldgen, "Dark Cloud Spawn Density", 10).getInt(10); + darkCloudSpawnHeight = config.get(catWorldgen, "Dark Cloud Spawn MinX", 0).getInt(64); + darkCloudSpawnRange = config.get(catWorldgen, "Dark Cloud Spawn Range", 256).getInt(256); + sulfurSpawnRarity = config.get(catWorldgen, "Sulfur Cloud Spawn Rarity", 8).getInt(8); + sulfurSpawnHeight = config.get(catWorldgen, "Sulfur Cloud Spawn Height", 40).getInt(40); + sulfurSpawnRange = config.get(catWorldgen, "Sulfur Cloud Spawn Range", 78).getInt(78); ashSpawnRarity = config.get(catWorldgen, "Ash Cloud Spawn Rarity", 8).getInt(8); ashSpawnHeight = config.get(catWorldgen, "Ash Cloud Spawn Height", 40).getInt(40); ashSpawnRange = config.get(catWorldgen, "Ash Cloud Spawn Range", 78).getInt(78); @@ -185,88 +135,57 @@ public static void initProps(File confFile) { raspSpawnRange = config.get(catWorldgen, "Raspberry Spawn Range", 64).getInt(64); blueSpawnRarity = config.get(catWorldgen, "Blueberry Spawn Rarity", 34).getInt(34); blueSpawnRange = config.get(catWorldgen, "Blueberry Spawn Range", 64).getInt(64); - blackSpawnRarity = - config.get(catWorldgen, "Blackberry Spawn Rarity", 48).getInt(48); + blackSpawnRarity = config.get(catWorldgen, "Blackberry Spawn Rarity", 48).getInt(48); blackSpawnRange = config.get(catWorldgen, "Blackberry Spawn Range", 64).getInt(64); geoSpawnRarity = config.get(catWorldgen, "Maloberry Spawn Rarity", 40).getInt(40); geoSpawnRange = config.get(catWorldgen, "Maloberry Spawn Range", 64).getInt(64); - blightSpawnRarity = - config.get(catWorldgen, "Blightberry Spawn Rarity", 18).getInt(18); - blightSpawnRange = - config.get(catWorldgen, "Blightberry Spawn Range", 100).getInt(100); + blightSpawnRarity = config.get(catWorldgen, "Blightberry Spawn Rarity", 18).getInt(18); + blightSpawnRange = config.get(catWorldgen, "Blightberry Spawn Range", 100).getInt(100); duskSpawnRarity = config.get(catWorldgen, "Duskberry Spawn Rarity", 18).getInt(18); duskSpawnRange = config.get(catWorldgen, "Duskberry Spawn Range", 100).getInt(100); skySpawnRarity = config.get(catWorldgen, "Skyberry Spawn Rarity", 18).getInt(18); skySpawnRange = config.get(catWorldgen, "Skyberry Spawn Range", 100).getInt(100); - stingSpawnRarity = - config.get(catWorldgen, "Stingberry Spawn Rarity", 18).getInt(18); + stingSpawnRarity = config.get(catWorldgen, "Stingberry Spawn Rarity", 18).getInt(18); stingSpawnRange = config.get(catWorldgen, "Stingberry Spawn Range", 100).getInt(100); - thornSpawnRarity = - config.get(catWorldgen, "Thornvines Spawn Rarity", 40).getInt(40); - darkCloudBlacklist = config.get(catWorldgen, "dimension blacklist(dark clouds)", new int[] {}) - .getIntList(); - cloudBlacklist = config.get(catWorldgen, "dimension blacklist(clouds)", new int[] {}) - .getIntList(); - sulfurCloudBlacklist = config.get(catWorldgen, "dimension blacklist(sulfur clouds)", new int[] {}) - .getIntList(); - - enableWoodenBookshelves = - config.get(catWoodProducts, "Enable Wooden Bookshevles", true).getBoolean(true); - enableWoodenButtons = - config.get(catWoodProducts, "Enable Wooden Buttons", true).getBoolean(true); - enableWoodenDoors = - config.get(catWoodProducts, "Enable Wooden Doors", true).getBoolean(true); - enableWoodenFenceGates = - config.get(catWoodProducts, "Enable Wooden Fence Gates", true).getBoolean(true); - enableWoodenFences = - config.get(catWoodProducts, "Enable Wooden Fences", true).getBoolean(true); + thornSpawnRarity = config.get(catWorldgen, "Thornvines Spawn Rarity", 40).getInt(40); + darkCloudBlacklist = config.get(catWorldgen, "dimension blacklist(dark clouds)", new int[] {}).getIntList(); + cloudBlacklist = config.get(catWorldgen, "dimension blacklist(clouds)", new int[] {}).getIntList(); + sulfurCloudBlacklist = config.get(catWorldgen, "dimension blacklist(sulfur clouds)", new int[] {}).getIntList(); + + enableWoodenBookshelves = config.get(catWoodProducts, "Enable Wooden Bookshevles", true).getBoolean(true); + enableWoodenButtons = config.get(catWoodProducts, "Enable Wooden Buttons", true).getBoolean(true); + enableWoodenDoors = config.get(catWoodProducts, "Enable Wooden Doors", true).getBoolean(true); + enableWoodenFenceGates = config.get(catWoodProducts, "Enable Wooden Fence Gates", true).getBoolean(true); + enableWoodenFences = config.get(catWoodProducts, "Enable Wooden Fences", true).getBoolean(true); enableWoodenPressurePlates = config.get(catWoodProducts, "Enable Wooden Pressure Plates", true) .getBoolean(true); - enableWoodenSlabs = - config.get(catWoodProducts, "Enable Wooden Slabs", true).getBoolean(true); - enableWoodenStairs = - config.get(catWoodProducts, "Enable Wooden Stairs", true).getBoolean(true); - enableWoodenTrapdoors = - config.get(catWoodProducts, "Enable Wooden Trapdoors", true).getBoolean(true); - enableWoodenWorkbenches = - config.get(catWoodProducts, "Enable Wooden Workbenches", true).getBoolean(true); - - enableBerryBushes = config.get(catOverworldProducts, "Enable Berries and Berry Bushes", true) - .getBoolean(true); - enableBonemealBags = - config.get(catOverworldProducts, "Enable Bonemeal Bags", true).getBoolean(true); - enableCactusJuice = - config.get(catOverworldProducts, "Enable Cactus Juice", true).getBoolean(true); - enableSeedBags = - config.get(catOverworldProducts, "Enable Seed Bags", true).getBoolean(true); - - enableBlazeHoppers = - config.get(catNetherProducts, "Enable Blaze Hoppers", true).getBoolean(true); - enableBlazeRails = - config.get(catNetherProducts, "Enable Blaze Rails", true).getBoolean(true); - enableFlintAndBlaze = - config.get(catNetherProducts, "Enable Flint And Blaze", true).getBoolean(true); + enableWoodenSlabs = config.get(catWoodProducts, "Enable Wooden Slabs", true).getBoolean(true); + enableWoodenStairs = config.get(catWoodProducts, "Enable Wooden Stairs", true).getBoolean(true); + enableWoodenTrapdoors = config.get(catWoodProducts, "Enable Wooden Trapdoors", true).getBoolean(true); + enableWoodenWorkbenches = config.get(catWoodProducts, "Enable Wooden Workbenches", true).getBoolean(true); + + enableBerryBushes = config.get(catOverworldProducts, "Enable Berries and Berry Bushes", true).getBoolean(true); + enableBonemealBags = config.get(catOverworldProducts, "Enable Bonemeal Bags", true).getBoolean(true); + enableCactusJuice = config.get(catOverworldProducts, "Enable Cactus Juice", true).getBoolean(true); + enableSeedBags = config.get(catOverworldProducts, "Enable Seed Bags", true).getBoolean(true); + + enableBlazeHoppers = config.get(catNetherProducts, "Enable Blaze Hoppers", true).getBoolean(true); + enableBlazeRails = config.get(catNetherProducts, "Enable Blaze Rails", true).getBoolean(true); + enableFlintAndBlaze = config.get(catNetherProducts, "Enable Flint And Blaze", true).getBoolean(true); enableNetherBerryBushes = config.get(catNetherProducts, "Enable Nether Berries and Berry Bushes", true) .getBoolean(true); - enableNetherButtons = - config.get(catNetherProducts, "Enable Netherack Buttons", true).getBoolean(true); - enableNetherFurnaces = - config.get(catNetherProducts, "Enable Netherack Furnaces", true).getBoolean(true); - enableNetherGlass = - config.get(catNetherProducts, "Enable Nether Glass", true).getBoolean(true); - enableNetherWoodTools = - config.get(catNetherProducts, "Enable Nether Wood Tools", true).getBoolean(true); - enableNetherLevers = - config.get(catNetherProducts, "Enable Netherack Levers", true).getBoolean(true); + enableNetherButtons = config.get(catNetherProducts, "Enable Netherack Buttons", true).getBoolean(true); + enableNetherFurnaces = config.get(catNetherProducts, "Enable Netherack Furnaces", true).getBoolean(true); + enableNetherGlass = config.get(catNetherProducts, "Enable Nether Glass", true).getBoolean(true); + enableNetherWoodTools = config.get(catNetherProducts, "Enable Nether Wood Tools", true).getBoolean(true); + enableNetherLevers = config.get(catNetherProducts, "Enable Netherack Levers", true).getBoolean(true); enableNetherPressurePlates = config.get(catNetherProducts, "Enable Netherack Pressure Plates", true) .getBoolean(true); - enableNetherWartBags = - config.get(catNetherProducts, "Enable Nether Wart Bags", true).getBoolean(true); + enableNetherWartBags = config.get(catNetherProducts, "Enable Nether Wart Bags", true).getBoolean(true); enableObelisks = config.get(catNetherProducts, "Enable Obelisks", true).getBoolean(true); - enableQuartzTools = - config.get(catNetherProducts, "Enable Quartz Tools", true).getBoolean(true); + enableQuartzTools = config.get(catNetherProducts, "Enable Quartz Tools", true).getBoolean(true); seaLevel = config.get(catGeneral, "Sea level", 64).getInt(64); diff --git a/src/main/java/mods/natura/dimension/FireGen.java b/src/main/java/mods/natura/dimension/FireGen.java index 6f618d25..5d60c1c8 100644 --- a/src/main/java/mods/natura/dimension/FireGen.java +++ b/src/main/java/mods/natura/dimension/FireGen.java @@ -1,13 +1,16 @@ package mods.natura.dimension; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class FireGen extends WorldGenerator { + @Override public boolean generate(World world, Random random, int x, int y, int z) { for (int l = 0; l < 64; ++l) { diff --git a/src/main/java/mods/natura/dimension/NetheriteChunk.java b/src/main/java/mods/natura/dimension/NetheriteChunk.java index 626fd387..cef9e3b7 100644 --- a/src/main/java/mods/natura/dimension/NetheriteChunk.java +++ b/src/main/java/mods/natura/dimension/NetheriteChunk.java @@ -31,22 +31,11 @@ public NetheriteChunk(World world, Block[] lowerIDs, int chunkX, int chunkZ) { } } - /*for (int x = 0; x < 16; ++x) { - for (int z = 0; z < 16; ++z) { - for (int y = 0; y < height; ++y) { - int id = upperIDs[x << 11 | z << 7 | y] & 0xFF; - - if (id != 0) { - int k1 = (y >> 4) + 8; - - if (storage[k1] == null) { - storage[k1] = new ExtendedBlockStorage(k1 << 4, !world.provider.hasNoSky); - } - - storage[k1].setExtBlockID(x, y & 15, z, id); - } - } - } - }*/ + /* + * for (int x = 0; x < 16; ++x) { for (int z = 0; z < 16; ++z) { for (int y = 0; y < height; ++y) { int id = + * upperIDs[x << 11 | z << 7 | y] & 0xFF; if (id != 0) { int k1 = (y >> 4) + 8; if (storage[k1] == null) { + * storage[k1] = new ExtendedBlockStorage(k1 << 4, !world.provider.hasNoSky); } storage[k1].setExtBlockID(x, y & + * 15, z, id); } } } } + */ } } diff --git a/src/main/java/mods/natura/dimension/NetheriteChunkManager.java b/src/main/java/mods/natura/dimension/NetheriteChunkManager.java index 4e8fd023..c50b3b85 100644 --- a/src/main/java/mods/natura/dimension/NetheriteChunkManager.java +++ b/src/main/java/mods/natura/dimension/NetheriteChunkManager.java @@ -3,11 +3,13 @@ import java.util.Arrays; import java.util.List; import java.util.Random; + import net.minecraft.world.ChunkPosition; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; public class NetheriteChunkManager extends WorldChunkManager { + /** The biome generator object. */ private BiomeGenBase biomeGenerator; @@ -34,8 +36,8 @@ public BiomeGenBase getBiomeGenAt(int par1, int par2) { * Returns an array of biomes for the location input. */ @Override - public BiomeGenBase[] getBiomesForGeneration( - BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5) { + public BiomeGenBase[] getBiomesForGeneration(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, + int par5) { if (par1ArrayOfBiomeGenBase == null || par1ArrayOfBiomeGenBase.length < par4 * par5) { par1ArrayOfBiomeGenBase = new BiomeGenBase[par4 * par5]; } @@ -45,7 +47,7 @@ public BiomeGenBase[] getBiomesForGeneration( } /** - * Returns a list of temperatures to use for the specified blocks. Args: listToReuse, x, y, width, length + * Returns a list of temperatures to use for the specified blocks. Args: listToReuse, x, y, width, length */ public float[] getTemperatures(float[] par1ArrayOfFloat, int par2, int par3, int par4, int par5) { if (par1ArrayOfFloat == null || par1ArrayOfFloat.length < par4 * par5) { @@ -74,8 +76,8 @@ public float[] getRainfall(float[] par1ArrayOfFloat, int par2, int par3, int par * WorldChunkManager Args: oldBiomeList, x, z, width, depth */ @Override - public BiomeGenBase[] loadBlockGeneratorData( - BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5) { + public BiomeGenBase[] loadBlockGeneratorData(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, + int par5) { if (par1ArrayOfBiomeGenBase == null || par1ArrayOfBiomeGenBase.length < par4 * par5) { par1ArrayOfBiomeGenBase = new BiomeGenBase[par4 * par5]; } @@ -89,8 +91,8 @@ public BiomeGenBase[] loadBlockGeneratorData( * don't check biomeCache to avoid infinite loop in BiomeCacheBlock) */ @Override - public BiomeGenBase[] getBiomeGenAt( - BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5, boolean par6) { + public BiomeGenBase[] getBiomeGenAt(BiomeGenBase[] par1ArrayOfBiomeGenBase, int par2, int par3, int par4, int par5, + boolean par6) { return this.loadBlockGeneratorData(par1ArrayOfBiomeGenBase, par2, par3, par4, par5); } diff --git a/src/main/java/mods/natura/dimension/NetheriteChunkProvider.java b/src/main/java/mods/natura/dimension/NetheriteChunkProvider.java index 4e02bcec..6bc99977 100644 --- a/src/main/java/mods/natura/dimension/NetheriteChunkProvider.java +++ b/src/main/java/mods/natura/dimension/NetheriteChunkProvider.java @@ -7,12 +7,13 @@ import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.GLOWSTONE; import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.NETHER_LAVA; -import cpw.mods.fml.common.eventhandler.Event.Result; import java.util.List; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; import mods.natura.worldgen.FlowerGen; + import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.entity.EnumCreatureType; @@ -38,7 +39,10 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; +import cpw.mods.fml.common.eventhandler.Event.Result; + public class NetheriteChunkProvider implements IChunkProvider { + private Random hellRNG; /** A NoiseGeneratorOctaves used in generating nether terrain */ @@ -107,15 +111,8 @@ public NetheriteChunkProvider(World par1World, long par2) { this.netherNoiseGen5 = new NoiseGeneratorOctaves(this.hellRNG, 16); // TODO 1.7 check these casts somehow - NoiseGenerator[] noiseGens = { - netherNoiseGen1, - netherNoiseGen2, - netherNoiseGen3, - slowsandGravelNoiseGen, - netherrackExculsivityNoiseGen, - netherNoiseGen4, - netherNoiseGen5 - }; + NoiseGenerator[] noiseGens = { netherNoiseGen1, netherNoiseGen2, netherNoiseGen3, slowsandGravelNoiseGen, + netherrackExculsivityNoiseGen, netherNoiseGen4, netherNoiseGen5 }; noiseGens = TerrainGen.getModdedNoiseGenerators(par1World, this.hellRNG, noiseGens); this.netherNoiseGen1 = (NoiseGeneratorOctaves) noiseGens[0]; this.netherNoiseGen2 = (NoiseGeneratorOctaves) noiseGens[1]; @@ -135,8 +132,8 @@ public void generateNetherTerrain(int chunkX, int chunkZ, Block[] lowerIDs) { int k = noiseInit + 1; byte b2 = 17; int l = noiseInit + 1; - this.noiseField = - this.initializeNoiseField(this.noiseField, chunkX * noiseInit, 0, chunkZ * noiseInit, k, b2, l); + this.noiseField = this + .initializeNoiseField(this.noiseField, chunkX * noiseInit, 0, chunkZ * noiseInit, k, b2, l); for (int iterX = 0; iterX < noiseInit; ++iterX) { for (int iterZ = 0; iterZ < noiseInit; ++iterZ) { @@ -205,19 +202,27 @@ public void replaceBlocksForBiome(int par1, int par2, Block[] blocks, Block[] lo // Lower nether byte seaLevel = 64; double d0 = 0.03125D; - this.slowsandNoise = this.slowsandGravelNoiseGen.generateNoiseOctaves( - this.slowsandNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, d0, d0, 1.0D); - this.gravelNoise = this.slowsandGravelNoiseGen.generateNoiseOctaves( - this.gravelNoise, par1 * 16, 109, par2 * 16, 16, 1, 16, d0, 1.0D, d0); + this.slowsandNoise = this.slowsandGravelNoiseGen + .generateNoiseOctaves(this.slowsandNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, d0, d0, 1.0D); + this.gravelNoise = this.slowsandGravelNoiseGen + .generateNoiseOctaves(this.gravelNoise, par1 * 16, 109, par2 * 16, 16, 1, 16, d0, 1.0D, d0); this.netherrackExclusivityNoise = this.netherrackExculsivityNoiseGen.generateNoiseOctaves( - this.netherrackExclusivityNoise, par1 * 16, par2 * 16, 0, 16, 16, 1, d0 * 2.0D, d0 * 2.0D, d0 * 2.0D); + this.netherrackExclusivityNoise, + par1 * 16, + par2 * 16, + 0, + 16, + 16, + 1, + d0 * 2.0D, + d0 * 2.0D, + d0 * 2.0D); for (int iterX = 0; iterX < 16; ++iterX) { for (int iterZ = 0; iterZ < 16; ++iterZ) { boolean flag = this.slowsandNoise[iterX + iterZ * 16] + this.hellRNG.nextDouble() * 0.2D > 0.0D; boolean flag1 = this.gravelNoise[iterX + iterZ * 16] + this.hellRNG.nextDouble() * 0.2D > 0.0D; - int i1 = (int) (this.netherrackExclusivityNoise[iterX + iterZ * 16] / 3.0D - + 3.0D + int i1 = (int) (this.netherrackExclusivityNoise[iterX + iterZ * 16] / 3.0D + 3.0D + this.hellRNG.nextDouble() * 0.25D); int j1 = -1; Block b1 = Blocks.netherrack; @@ -304,8 +309,7 @@ public Chunk provideChunk(int chunkX, int chunkZ) { this.netherCaveGenerator.func_151539_a(this, this.worldObj, chunkX, chunkZ, aBlock); this.genNetherBridge.func_151539_a(this, this.worldObj, chunkX, chunkZ, aBlock); Chunk chunk = new NetheriteChunk(this.worldObj, lowerArray, chunkX, chunkZ); - BiomeGenBase[] abiomegenbase = this.worldObj - .getWorldChunkManager() + BiomeGenBase[] abiomegenbase = this.worldObj.getWorldChunkManager() .loadBlockGeneratorData((BiomeGenBase[]) null, chunkX * 16, chunkZ * 16, 16, 16); byte[] abyte1 = chunk.getBiomeArray(); @@ -321,10 +325,17 @@ public Chunk provideChunk(int chunkX, int chunkZ) { * generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the * size. */ - private double[] initializeNoiseField( - double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, int par7) { - ChunkProviderEvent.InitNoiseField event = - new ChunkProviderEvent.InitNoiseField(this, par1ArrayOfDouble, par2, par3, par4, par5, par6, par7); + private double[] initializeNoiseField(double[] par1ArrayOfDouble, int par2, int par3, int par4, int par5, int par6, + int par7) { + ChunkProviderEvent.InitNoiseField event = new ChunkProviderEvent.InitNoiseField( + this, + par1ArrayOfDouble, + par2, + par3, + par4, + par5, + par6, + par7); MinecraftForge.EVENT_BUS.post(event); event.getResult(); if (event.getResult() == Result.DENY) return event.noisefield; @@ -334,16 +345,25 @@ private double[] initializeNoiseField( double d0 = 684.412D; double d1 = 2053.236D; - this.noiseData4 = this.netherNoiseGen4.generateNoiseOctaves( - this.noiseData4, par2, par3, par4, par5, 1, par7, 1.0D, 0.0D, 1.0D); - this.noiseData5 = this.netherNoiseGen5.generateNoiseOctaves( - this.noiseData5, par2, par3, par4, par5, 1, par7, 100.0D, 0.0D, 100.0D); + this.noiseData4 = this.netherNoiseGen4 + .generateNoiseOctaves(this.noiseData4, par2, par3, par4, par5, 1, par7, 1.0D, 0.0D, 1.0D); + this.noiseData5 = this.netherNoiseGen5 + .generateNoiseOctaves(this.noiseData5, par2, par3, par4, par5, 1, par7, 100.0D, 0.0D, 100.0D); this.noiseData1 = this.netherNoiseGen3.generateNoiseOctaves( - this.noiseData1, par2, par3, par4, par5, par6, par7, d0 / 80.0D, d1 / 60.0D, d0 / 80.0D); - this.noiseData2 = this.netherNoiseGen1.generateNoiseOctaves( - this.noiseData2, par2, par3, par4, par5, par6, par7, d0, d1, d0); - this.noiseData3 = this.netherNoiseGen2.generateNoiseOctaves( - this.noiseData3, par2, par3, par4, par5, par6, par7, d0, d1, d0); + this.noiseData1, + par2, + par3, + par4, + par5, + par6, + par7, + d0 / 80.0D, + d1 / 60.0D, + d0 / 80.0D); + this.noiseData2 = this.netherNoiseGen1 + .generateNoiseOctaves(this.noiseData2, par2, par3, par4, par5, par6, par7, d0, d1, d0); + this.noiseData3 = this.netherNoiseGen2 + .generateNoiseOctaves(this.noiseData3, par2, par3, par4, par5, par6, par7, d0, d1, d0); int k1 = 0; int l1 = 0; double[] adouble1 = new double[par6]; @@ -463,8 +483,8 @@ public boolean chunkExists(int par1, int par2) { public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) { BlockFalling.fallInstantly = true; - MinecraftForge.EVENT_BUS.post( - new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); + MinecraftForge.EVENT_BUS + .post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); int blockX = par2 * 16; int blockZ = par3 * 16; @@ -529,21 +549,14 @@ public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) { MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Pre(worldObj, hellRNG, blockX, blockZ)); doGen = TerrainGen.decorate(worldObj, hellRNG, blockX, blockZ, SHROOM); - /*if (doGen && this.hellRNG.nextInt(1) == 0) - { - xPos = blockX + this.hellRNG.nextInt(16) + 8; - yPos = this.hellRNG.nextInt(128); - zPos = blockZ + this.hellRNG.nextInt(16) + 8; - (new WorldGenFlowers(Block.mushroomBrown.blockID)).generate(this.worldObj, this.hellRNG, xPos, yPos, zPos); - } - - if (doGen && this.hellRNG.nextInt(1) == 0) - { - xPos = blockX + this.hellRNG.nextInt(16) + 8; - yPos = this.hellRNG.nextInt(128); - zPos = blockZ + this.hellRNG.nextInt(16) + 8; - (new WorldGenFlowers(Block.mushroomRed.blockID)).generate(this.worldObj, this.hellRNG, xPos, yPos, zPos); - }*/ + /* + * if (doGen && this.hellRNG.nextInt(1) == 0) { xPos = blockX + this.hellRNG.nextInt(16) + 8; yPos = + * this.hellRNG.nextInt(128); zPos = blockZ + this.hellRNG.nextInt(16) + 8; (new + * WorldGenFlowers(Block.mushroomBrown.blockID)).generate(this.worldObj, this.hellRNG, xPos, yPos, zPos); } if + * (doGen && this.hellRNG.nextInt(1) == 0) { xPos = blockX + this.hellRNG.nextInt(16) + 8; yPos = + * this.hellRNG.nextInt(128); zPos = blockZ + this.hellRNG.nextInt(16) + 8; (new + * WorldGenFlowers(Block.mushroomRed.blockID)).generate(this.worldObj, this.hellRNG, xPos, yPos, zPos); } + */ if (PHNatura.generateGreenglowshroom && doGen && hellRNG.nextInt(7) == 0) { int l2 = blockX + hellRNG.nextInt(16) + 8; @@ -565,15 +578,15 @@ public void populate(IChunkProvider par1IChunkProvider, int par2, int par3) { } MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(worldObj, hellRNG, blockX, blockZ)); - MinecraftForge.EVENT_BUS.post( - new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); + MinecraftForge.EVENT_BUS + .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, hellRNG, par2, par3, false)); BlockFalling.fallInstantly = false; } /** - * Two modes of operation: if passed true, save all Chunks in one go. If passed false, save up to two chunks. - * Return true if all chunks have been saved. + * Two modes of operation: if passed true, save all Chunks in one go. If passed false, save up to two chunks. Return + * true if all chunks have been saved. */ @Override public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate) { diff --git a/src/main/java/mods/natura/dimension/NetheriteWorldProvider.java b/src/main/java/mods/natura/dimension/NetheriteWorldProvider.java index bdc06873..4ad1bbb9 100644 --- a/src/main/java/mods/natura/dimension/NetheriteWorldProvider.java +++ b/src/main/java/mods/natura/dimension/NetheriteWorldProvider.java @@ -1,6 +1,7 @@ package mods.natura.dimension; import mods.natura.common.PHNatura; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.WorldProviderHell; @@ -8,6 +9,7 @@ import net.minecraft.world.chunk.IChunkProvider; public class NetheriteWorldProvider extends WorldProviderHell { + /** * creates a new world chunk manager for WorldProvider */ diff --git a/src/main/java/mods/natura/entity/BabyHeatscarSpider.java b/src/main/java/mods/natura/entity/BabyHeatscarSpider.java index 111b074c..7ec5eef0 100644 --- a/src/main/java/mods/natura/entity/BabyHeatscarSpider.java +++ b/src/main/java/mods/natura/entity/BabyHeatscarSpider.java @@ -1,6 +1,7 @@ package mods.natura.entity; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.Block.SoundType; import net.minecraft.entity.Entity; @@ -17,6 +18,7 @@ import net.minecraftforge.common.ForgeHooks; public class BabyHeatscarSpider extends EntitySpider { + public BabyHeatscarSpider(World par1World) { super(par1World); this.setSize(1.2F, 0.8F); @@ -152,9 +154,7 @@ protected void dropFewItems(boolean par1, int par2) { public boolean getCanSpawnHere() { return this.worldObj.difficultySetting != EnumDifficulty.PEACEFUL && this.worldObj.checkNoEntityCollision(this.boundingBox) - && this.worldObj - .getCollidingBoundingBoxes(this, this.boundingBox) - .isEmpty() + && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); } } diff --git a/src/main/java/mods/natura/entity/FusewoodArrow.java b/src/main/java/mods/natura/entity/FusewoodArrow.java index 5e4f75c3..0c8f5804 100644 --- a/src/main/java/mods/natura/entity/FusewoodArrow.java +++ b/src/main/java/mods/natura/entity/FusewoodArrow.java @@ -1,8 +1,7 @@ package mods.natura.entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; @@ -22,7 +21,11 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class FusewoodArrow extends EntityArrow { + private int xTile = -1; private int yTile = -1; private int zTile = -1; @@ -60,12 +63,8 @@ public FusewoodArrow(World par1World, double par2, double par4, double par6) { this.yOffset = 0.0F; } - public FusewoodArrow( - World par1World, - EntityLivingBase par2EntityLiving, - EntityLivingBase par3EntityLiving, - float par4, - float par5) { + public FusewoodArrow(World par1World, EntityLivingBase par2EntityLiving, EntityLivingBase par3EntityLiving, + float par4, float par5) { super(par1World); this.renderDistanceWeight = 10.0D; this.shootingEntity = par2EntityLiving; @@ -191,8 +190,8 @@ public void onUpdate() { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = - this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D + / Math.PI); this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); } @@ -200,8 +199,8 @@ public void onUpdate() { if (i != null) { i.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); - AxisAlignedBB axisalignedbb = - i.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); + AxisAlignedBB axisalignedbb = i + .getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); if (axisalignedbb != null && axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ))) { @@ -234,13 +233,13 @@ public void onUpdate() { } else { ++this.ticksInAir; Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 vec31 = Vec3.createVectorHelper( - this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 vec31 = Vec3 + .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); // TODO 1.7 May need to call overload with extra params MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31, false); vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - vec31 = Vec3.createVectorHelper( - this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + vec31 = Vec3 + .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { vec31 = Vec3.createVectorHelper( @@ -252,9 +251,7 @@ public void onUpdate() { Entity entity = null; List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( this, - this.boundingBox - .addCoord(this.motionX, this.motionY, this.motionZ) - .expand(1.0D, 1.0D, 1.0D)); + this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; int l; float f1; @@ -282,14 +279,12 @@ public void onUpdate() { movingobjectposition = new MovingObjectPosition(entity); } - if (movingobjectposition != null - && movingobjectposition.entityHit != null + if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; - if (entityplayer.capabilities.disableDamage - || this.shootingEntity instanceof EntityPlayer - && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer + && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { movingobjectposition = null; } } @@ -301,9 +296,9 @@ public void onUpdate() { if (movingobjectposition.entityHit != null) // && movingobjectposition.entityHit != shootingEntity) { if (movingobjectposition.entityHit != shootingEntity) { - f2 = MathHelper.sqrt_double(this.motionX * this.motionX - + this.motionY * this.motionY - + this.motionZ * this.motionZ); + f2 = MathHelper.sqrt_double( + this.motionX * this.motionX + this.motionY * this.motionY + + this.motionZ * this.motionZ); int i1 = MathHelper.ceiling_double_int(f2 * this.damage); if (this.getIsCritical()) { @@ -320,8 +315,14 @@ public void onUpdate() { damagesource = DamageSource.setExplosionSource( this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 1.5f, true)); } else { - damagesource = DamageSource.setExplosionSource(this.worldObj.createExplosion( - this.shootingEntity, this.posX, this.posY, this.posZ, 1.5f, true)); + damagesource = DamageSource.setExplosionSource( + this.worldObj.createExplosion( + this.shootingEntity, + this.posX, + this.posY, + this.posZ, + 1.5f, + true)); } // this.kill(); @@ -331,14 +332,13 @@ public void onUpdate() { Entity entityliving = movingobjectposition.entityHit; if (!this.worldObj.isRemote) { - ((EntityLivingBase) entityliving) - .setArrowCountInEntity( - ((EntityLivingBase) entityliving).getArrowCountInEntity() + 1); + ((EntityLivingBase) entityliving).setArrowCountInEntity( + ((EntityLivingBase) entityliving).getArrowCountInEntity() + 1); } if (this.knockbackStrength > 0) { - f3 = MathHelper.sqrt_double( - this.motionX * this.motionX + this.motionZ * this.motionZ); + f3 = MathHelper + .sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); if (f3 > 0.0F) { movingobjectposition.entityHit.addVelocity( @@ -350,12 +350,11 @@ public void onUpdate() { if (this.shootingEntity != null) { // TODO 1.7 last arg is level of enchant (I think), confirm this is correct - Enchantment.thorns.func_151367_b( - (EntityLivingBase) this.shootingEntity, entityliving, 1); + Enchantment.thorns + .func_151367_b((EntityLivingBase) this.shootingEntity, entityliving, 1); } - if (this.shootingEntity != null - && movingobjectposition.entityHit != this.shootingEntity + if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { // TODO 1.7 What is Packet70 now? ((EntityPlayerMP) @@ -422,9 +421,8 @@ public void onUpdate() { f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float) (Math.atan2(this.motionY, f2) * 180.0D / Math.PI); - this.rotationPitch - this.prevRotationPitch < -180.0F; - this.prevRotationPitch -= 360.0F) { + for (this.rotationPitch = (float) (Math.atan2(this.motionY, f2) * 180.0D / Math.PI); this.rotationPitch + - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -516,8 +514,8 @@ public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { @Override public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) { if (!this.worldObj.isRemote && this.inGround && this.arrowShake <= 0) { - boolean flag = - this.canBePickedUp == 1 || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; + boolean flag = this.canBePickedUp == 1 + || this.canBePickedUp == 2 && par1EntityPlayer.capabilities.isCreativeMode; if (this.canBePickedUp == 1 && !par1EntityPlayer.inventory.addItemStackToInventory(new ItemStack(Items.arrow, 1))) { @@ -526,7 +524,9 @@ public void onCollideWithPlayer(EntityPlayer par1EntityPlayer) { if (flag) { this.playSound( - "random.pop", 0.2F, ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + "random.pop", + 0.2F, + ((this.rand.nextFloat() - this.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); par1EntityPlayer.onItemPickup(this, 1); this.setDead(); } diff --git a/src/main/java/mods/natura/entity/HeatscarSpider.java b/src/main/java/mods/natura/entity/HeatscarSpider.java index a6ad9b21..f4520a63 100644 --- a/src/main/java/mods/natura/entity/HeatscarSpider.java +++ b/src/main/java/mods/natura/entity/HeatscarSpider.java @@ -1,9 +1,8 @@ package mods.natura.entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.block.Block.SoundType; import net.minecraft.entity.Entity; @@ -20,7 +19,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class HeatscarSpider extends EntitySpider { + public HeatscarSpider(World par1World) { super(par1World); this.setSize(2.7F, 1.9F); @@ -166,9 +169,7 @@ protected void dropFewItems(boolean par1, int par2) { public boolean getCanSpawnHere() { return this.worldObj.difficultySetting != EnumDifficulty.PEACEFUL && this.worldObj.checkNoEntityCollision(this.boundingBox) - && this.worldObj - .getCollidingBoundingBoxes(this, this.boundingBox) - .isEmpty() + && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); } @@ -187,7 +188,11 @@ public void setDead() { double f1 = rand.nextDouble() * 2; BabyHeatscarSpider babyspider = this.createBabyInstance(); babyspider.setLocationAndAngles( - this.posX + f, this.posY + 0.5D, this.posZ + f1, this.rand.nextFloat() * 360.0F, 0.0F); + this.posX + f, + this.posY + 0.5D, + this.posZ + f1, + this.rand.nextFloat() * 360.0F, + 0.0F); this.worldObj.spawnEntityInWorld(babyspider); } } diff --git a/src/main/java/mods/natura/entity/ImpEntity.java b/src/main/java/mods/natura/entity/ImpEntity.java index 5bc67f51..3d835b2d 100644 --- a/src/main/java/mods/natura/entity/ImpEntity.java +++ b/src/main/java/mods/natura/entity/ImpEntity.java @@ -1,6 +1,7 @@ package mods.natura.entity; import mods.natura.common.NContent; + import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIAvoidEntity; @@ -20,6 +21,7 @@ import net.minecraft.world.WorldProviderHell; public class ImpEntity extends EntityAnimal { + public ImpEntity(World par1World) { super(par1World); // this.texture = "/mods/natura/textures/mob/imp.png"; @@ -127,8 +129,7 @@ public ImpEntity spawnBabyAnimal(EntityAgeable par1EntityAgeable) { */ @Override public boolean isBreedingItem(ItemStack par1ItemStack) { - return par1ItemStack != null - && par1ItemStack.getItem() == NContent.bowlStew + return par1ItemStack != null && par1ItemStack.getItem() == NContent.bowlStew && par1ItemStack.getItemDamage() >= 13; } @@ -142,9 +143,7 @@ public boolean getCanSpawnHere() { // return true; return this.worldObj.provider instanceof WorldProviderHell && this.worldObj.checkNoEntityCollision(this.boundingBox) - && this.worldObj - .getCollidingBoundingBoxes(this, this.boundingBox) - .isEmpty() + && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox); } } diff --git a/src/main/java/mods/natura/entity/NitroCreeper.java b/src/main/java/mods/natura/entity/NitroCreeper.java index 58873bab..74f87db8 100644 --- a/src/main/java/mods/natura/entity/NitroCreeper.java +++ b/src/main/java/mods/natura/entity/NitroCreeper.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; public class NitroCreeper extends EntityCreeper { + protected int fuseTime = 12; protected int timeSinceIgnited; protected int lastActiveTime; @@ -22,17 +23,14 @@ public NitroCreeper(World world) { this.isImmuneToFire = true; } - /*@Override - public void initCreature () - { - //if (this.rand.nextInt(100) == 0) - this.dataWatcher.updateObject(17, Byte.valueOf((byte)1)); - }*/ + /* + * @Override public void initCreature () { //if (this.rand.nextInt(100) == 0) this.dataWatcher.updateObject(17, + * Byte.valueOf((byte)1)); } + */ - /*public int getMaxHealth () - { - return 20; - }*/ + /* + * public int getMaxHealth () { return 20; } + */ @Override protected void fall(float distance) { @@ -140,18 +138,10 @@ protected void dropFewItems(boolean hitByPlayer, int lootingLevel) { } } - /*j = Block.tnt.blockID; - int k = this.rand.nextInt(5) + 2; - - if (par2 > 0) - { - k += this.rand.nextInt(par2*3 + 1); - } - - for (int l = 0; l < k; ++l) - { - this.dropItem(j, 1); - }*/ + /* + * j = Block.tnt.blockID; int k = this.rand.nextInt(5) + 2; if (par2 > 0) { k += this.rand.nextInt(par2*3 + + * 1); } for (int l = 0; l < k; ++l) { this.dropItem(j, 1); } + */ } } @@ -163,11 +153,11 @@ public boolean attackEntityFrom(DamageSource source, int damage) { return super.attackEntityFrom(source, damage); } - /*public boolean getCanSpawnHere() - { - int i = MathHelper.floor_double(this.posX); - int j = MathHelper.floor_double(this.boundingBox.minY); - int k = MathHelper.floor_double(this.posZ); - return this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox) && this.getBlockPathWeight(i, j, k) >= 0.0F; - }*/ + /* + * public boolean getCanSpawnHere() { int i = MathHelper.floor_double(this.posX); int j = + * MathHelper.floor_double(this.boundingBox.minY); int k = MathHelper.floor_double(this.posZ); return + * this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, + * this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox) && this.getBlockPathWeight(i, j, k) + * >= 0.0F; } + */ } diff --git a/src/main/java/mods/natura/gui/FurnaceContainer.java b/src/main/java/mods/natura/gui/FurnaceContainer.java index 5abc718f..08530dd2 100644 --- a/src/main/java/mods/natura/gui/FurnaceContainer.java +++ b/src/main/java/mods/natura/gui/FurnaceContainer.java @@ -1,8 +1,7 @@ package mods.natura.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.blocks.tech.NetherrackFurnaceLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -13,7 +12,11 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class FurnaceContainer extends Container { + private NetherrackFurnaceLogic furnace; private int lastCookTime; private int lastBurnTime; diff --git a/src/main/java/mods/natura/gui/FurnaceGui.java b/src/main/java/mods/natura/gui/FurnaceGui.java index a073ec9c..bdfab929 100644 --- a/src/main/java/mods/natura/gui/FurnaceGui.java +++ b/src/main/java/mods/natura/gui/FurnaceGui.java @@ -1,19 +1,23 @@ package mods.natura.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.blocks.tech.NetherrackFurnaceLogic; + import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerFurnace; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class FurnaceGui extends GuiContainer { - private static final ResourceLocation furnaceGuiTextures = - new ResourceLocation("textures/gui/container/furnace.png"); + + private static final ResourceLocation furnaceGuiTextures = new ResourceLocation( + "textures/gui/container/furnace.png"); private NetherrackFurnaceLogic logic; public FurnaceGui(InventoryPlayer par1InventoryPlayer, NetherrackFurnaceLogic par2TileEntityFurnace) { diff --git a/src/main/java/mods/natura/gui/NGuiHandler.java b/src/main/java/mods/natura/gui/NGuiHandler.java index 2cefc6f8..f0b58e99 100644 --- a/src/main/java/mods/natura/gui/NGuiHandler.java +++ b/src/main/java/mods/natura/gui/NGuiHandler.java @@ -1,11 +1,14 @@ package mods.natura.gui; -import cpw.mods.fml.common.network.IGuiHandler; import mods.natura.blocks.tech.NetherrackFurnaceLogic; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + public class NGuiHandler implements IGuiHandler { + public static final int craftingGui = 1; public static final int furnaceGui = 2; diff --git a/src/main/java/mods/natura/gui/WorkbenchContainer.java b/src/main/java/mods/natura/gui/WorkbenchContainer.java index fe276a32..099cb9ca 100644 --- a/src/main/java/mods/natura/gui/WorkbenchContainer.java +++ b/src/main/java/mods/natura/gui/WorkbenchContainer.java @@ -13,6 +13,7 @@ import net.minecraft.world.World; public class WorkbenchContainer extends Container { + public InventoryCrafting craftMatrix; public IInventory craftResult; private World worldObj; @@ -44,8 +45,8 @@ public WorkbenchContainer(InventoryPlayer inventoryplayer, World world) { @Override public void onCraftMatrixChanged(IInventory iinventory) { - craftResult.setInventorySlotContents( - 0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj)); + craftResult + .setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftMatrix, worldObj)); } @Override diff --git a/src/main/java/mods/natura/gui/WorkbenchGui.java b/src/main/java/mods/natura/gui/WorkbenchGui.java index 005056d1..1e8f1d62 100644 --- a/src/main/java/mods/natura/gui/WorkbenchGui.java +++ b/src/main/java/mods/natura/gui/WorkbenchGui.java @@ -5,31 +5,25 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; public class WorkbenchGui extends GuiContainer { + public WorkbenchGui(InventoryPlayer inventoryplayer, World world) { super(new WorkbenchContainer(inventoryplayer, world)); } - /*@Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { - fontRenderer.drawString("Crafting", 28, 6, 0x404040); - fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040); - } + /* + * @Override protected void drawGuiContainerForegroundLayer (int par1, int par2) { + * fontRenderer.drawString("Crafting", 28, 6, 0x404040); fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, + * 0x404040); } protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, + * 1.0F, 1.0F); mc.renderEngine.bindTexture("/gui/crafting.png"); int l = (width - xSize) / 2; int i1 = (height - + * ySize) / 2; drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); } + */ - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture("/gui/crafting.png"); - int l = (width - xSize) / 2; - int i1 = (height - ySize) / 2; - drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); - }*/ - - private static final ResourceLocation field_110422_t = - new ResourceLocation("textures/gui/container/crafting_table.png"); + private static final ResourceLocation field_110422_t = new ResourceLocation( + "textures/gui/container/crafting_table.png"); @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { diff --git a/src/main/java/mods/natura/items/BerryItem.java b/src/main/java/mods/natura/items/BerryItem.java index a5ca320e..b8bbe4dc 100644 --- a/src/main/java/mods/natura/items/BerryItem.java +++ b/src/main/java/mods/natura/items/BerryItem.java @@ -1,9 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,9 +14,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BerryItem extends ItemFood { + public IIcon[] icons; - public String[] textureNames = new String[] {"rasp", "blue", "black", "geo"}; + public String[] textureNames = new String[] { "rasp", "blue", "black", "geo" }; public BerryItem(int healAmount) { super(healAmount, 0.4F, false); diff --git a/src/main/java/mods/natura/items/BerryMedley.java b/src/main/java/mods/natura/items/BerryMedley.java index 37a91f44..f0e3123c 100644 --- a/src/main/java/mods/natura/items/BerryMedley.java +++ b/src/main/java/mods/natura/items/BerryMedley.java @@ -1,9 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -12,6 +12,9 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BerryMedley extends ItemFood { public BerryMedley(int healAmount) { diff --git a/src/main/java/mods/natura/items/BoneBag.java b/src/main/java/mods/natura/items/BoneBag.java index 77ee5962..153b5dda 100644 --- a/src/main/java/mods/natura/items/BoneBag.java +++ b/src/main/java/mods/natura/items/BoneBag.java @@ -1,10 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.block.BlockCocoa; import net.minecraft.block.BlockCrops; @@ -22,7 +21,12 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.BonemealEvent; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BoneBag extends Item { + String textureName; public BoneBag(String texture) { @@ -32,17 +36,8 @@ public BoneBag(String texture) { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { if (side != 1) return false; boolean planted = false; @@ -66,8 +61,8 @@ public boolean onItemUse( return planted; } - public static boolean applyBonemeal( - ItemStack par0ItemStack, World par1World, int par2, int par3, int par4, EntityPlayer player) { + public static boolean applyBonemeal(ItemStack par0ItemStack, World par1World, int par2, int par3, int par4, + EntityPlayer player) { Block l = par1World.getBlock(par2, par3, par4); BonemealEvent event = new BonemealEvent(player, par1World, l, par2, par3, par4); @@ -77,10 +72,9 @@ public static boolean applyBonemeal( event.getResult(); if (event.getResult() == Result.ALLOW) { - /*if (!par1World.isRemote) - { - par0ItemStack.stackSize--; - }*/ + /* + * if (!par1World.isRemote) { par0ItemStack.stackSize--; } + */ return true; } @@ -88,7 +82,7 @@ public static boolean applyBonemeal( if (!par1World.isRemote) { if (par1World.rand.nextFloat() < 0.45D) { ((BlockSapling) Blocks.sapling) - .func_149879_c /*markOrGrowMarked*/(par1World, par2, par3, par4, par1World.rand); + .func_149879_c /* markOrGrowMarked */(par1World, par2, par3, par4, par1World.rand); } // --par0ItemStack.stackSize; @@ -102,7 +96,7 @@ public static boolean applyBonemeal( return false; } else { if (!par1World.isRemote) { - ((BlockCrops) l).func_149863_m /*fertilize*/(par1World, par2, par3, par4); + ((BlockCrops) l).func_149863_m /* fertilize */(par1World, par2, par3, par4); // --par0ItemStack.stackSize; } @@ -134,8 +128,7 @@ public static boolean applyBonemeal( } else { if (!par1World.isRemote) { --par0ItemStack.stackSize; - label102: - for (i1 = 0; i1 < 128; ++i1) { + label102: for (i1 = 0; i1 < 128; ++i1) { j1 = par2; k1 = par3 + 1; int l1 = par4; @@ -171,7 +164,7 @@ public static boolean applyBonemeal( return false; } else { if (!par1World.isRemote) { - ((BlockStem) l).func_149874_m /*fertilizeStem*/(par1World, par2, par3, par4); + ((BlockStem) l).func_149874_m /* fertilizeStem */(par1World, par2, par3, par4); // --par0ItemStack.stackSize; } @@ -181,7 +174,7 @@ public static boolean applyBonemeal( if (!par1World.isRemote) { if (par1World.rand.nextFloat() < 0.4D) { ((BlockMushroom) l) - .func_149884_c /*fertilizeMushroom*/(par1World, par2, par3, par4, par1World.rand); + .func_149884_c /* fertilizeMushroom */(par1World, par2, par3, par4, par1World.rand); } // --par0ItemStack.stackSize; diff --git a/src/main/java/mods/natura/items/BowlEmpty.java b/src/main/java/mods/natura/items/BowlEmpty.java index d35942f3..5feb0fc1 100644 --- a/src/main/java/mods/natura/items/BowlEmpty.java +++ b/src/main/java/mods/natura/items/BowlEmpty.java @@ -1,17 +1,19 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BowlEmpty extends Item { + IIcon[] icons; - public static String[] textureNames = - new String[] {"", "", "ghostwood", "", "bloodwood", "", "", "", "", "", "", "darkwood", "fusewood"}; + public static String[] textureNames = new String[] { "", "", "ghostwood", "", "bloodwood", "", "", "", "", "", "", + "darkwood", "fusewood" }; public BowlEmpty() { super(); @@ -37,7 +39,9 @@ public void registerIcons(IIconRegister iconRegister) { @Override public String getUnlocalizedName(ItemStack stack) { return Items.bowl.getUnlocalizedName(stack); - /*int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, textureNames.length); - return "item.bowl." +textureNames[arr];*/ + /* + * int arr = MathHelper.clamp_int(stack.getItemDamage(), 0, textureNames.length); return "item.bowl." + * +textureNames[arr]; + */ } } diff --git a/src/main/java/mods/natura/items/BowlStew.java b/src/main/java/mods/natura/items/BowlStew.java index bfda00eb..42c1249e 100644 --- a/src/main/java/mods/natura/items/BowlStew.java +++ b/src/main/java/mods/natura/items/BowlStew.java @@ -1,9 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NContent; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,9 +17,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BowlStew extends ItemFood { + IIcon[] icons; - public static String[] textureNames = new String[] {"mushroom", "glowshroom"}; + public static String[] textureNames = new String[] { "mushroom", "glowshroom" }; public BowlStew() { super(6, 0.6f, false); diff --git a/src/main/java/mods/natura/items/CactusJuice.java b/src/main/java/mods/natura/items/CactusJuice.java index 124cf7ce..6a0970cc 100644 --- a/src/main/java/mods/natura/items/CactusJuice.java +++ b/src/main/java/mods/natura/items/CactusJuice.java @@ -1,15 +1,18 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class CactusJuice extends ItemFood { public CactusJuice(boolean flag) { diff --git a/src/main/java/mods/natura/items/ImpMeat.java b/src/main/java/mods/natura/items/ImpMeat.java index 158e4bd1..dfffefbb 100644 --- a/src/main/java/mods/natura/items/ImpMeat.java +++ b/src/main/java/mods/natura/items/ImpMeat.java @@ -1,9 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.Natura; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -11,11 +11,17 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ImpMeat extends NSpecialFood { + public ImpMeat() { - super(new int[] {3, 8}, new float[] {0.2f, 0.6f}, new String[] {"raw", "cooked"}, new String[] { - "impmeat_raw", "impmeat_cooked" - }); + super( + new int[] { 3, 8 }, + new float[] { 0.2f, 0.6f }, + new String[] { "raw", "cooked" }, + new String[] { "impmeat_raw", "impmeat_cooked" }); } @Override diff --git a/src/main/java/mods/natura/items/NSpecialFood.java b/src/main/java/mods/natura/items/NSpecialFood.java index 2dd5210a..cf144e54 100644 --- a/src/main/java/mods/natura/items/NSpecialFood.java +++ b/src/main/java/mods/natura/items/NSpecialFood.java @@ -1,8 +1,7 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,7 +10,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NSpecialFood extends ItemFood { + int[] hunger; float[] saturation; String[] unlocalizedNames; diff --git a/src/main/java/mods/natura/items/NaturaSeeds.java b/src/main/java/mods/natura/items/NaturaSeeds.java index b5ecf65b..7eca078d 100644 --- a/src/main/java/mods/natura/items/NaturaSeeds.java +++ b/src/main/java/mods/natura/items/NaturaSeeds.java @@ -1,9 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -17,8 +17,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaSeeds extends ItemSeeds { - public String[] textureNames = new String[] {"barley", "cotton"}; + + public String[] textureNames = new String[] { "barley", "cotton" }; public IIcon[] icons; public Block blockType; @@ -52,35 +56,25 @@ public IIcon getIconFromDamage(int meta) { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int xPos, - int yPos, - int zPos, - int side, - float xClick, - float yClick, - float zClick) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int xPos, int yPos, int zPos, int side, + float xClick, float yClick, float zClick) { if (side != 1) { return false; } else if (player.canPlayerEdit(xPos, yPos, zPos, side, stack) && player.canPlayerEdit(xPos, yPos + 1, zPos, side, stack)) { - Block soil = world.getBlock(xPos, yPos, zPos); - - if (soil != null - && soil.canSustainPlant(world, xPos, yPos, zPos, ForgeDirection.UP, this) - && world.isAirBlock(xPos, yPos + 1, zPos)) { - world.setBlock(xPos, yPos + 1, zPos, this.blockType, stack.getItemDamage() * 4, 3); - --stack.stackSize; - return true; - } else { - return false; - } - } else { - return false; - } + Block soil = world.getBlock(xPos, yPos, zPos); + + if (soil != null && soil.canSustainPlant(world, xPos, yPos, zPos, ForgeDirection.UP, this) + && world.isAirBlock(xPos, yPos + 1, zPos)) { + world.setBlock(xPos, yPos + 1, zPos, this.blockType, stack.getItemDamage() * 4, 3); + --stack.stackSize; + return true; + } else { + return false; + } + } else { + return false; + } } @Override diff --git a/src/main/java/mods/natura/items/NetherBerryItem.java b/src/main/java/mods/natura/items/NetherBerryItem.java index 18b74655..2512cb4f 100644 --- a/src/main/java/mods/natura/items/NetherBerryItem.java +++ b/src/main/java/mods/natura/items/NetherBerryItem.java @@ -1,10 +1,10 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.Natura; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,9 +17,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherBerryItem extends ItemFood { + public IIcon[] icons; - public String[] textureNames = new String[] {"blight", "dusk", "sky", "sting"}; // , "haste" + public String[] textureNames = new String[] { "blight", "dusk", "sky", "sting" }; // , "haste" public NetherBerryItem(int healAmount) { super(healAmount, 0.4F, false); diff --git a/src/main/java/mods/natura/items/NetherFoodItem.java b/src/main/java/mods/natura/items/NetherFoodItem.java index 0dcd7530..244ef2b8 100644 --- a/src/main/java/mods/natura/items/NetherFoodItem.java +++ b/src/main/java/mods/natura/items/NetherFoodItem.java @@ -1,10 +1,10 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.Natura; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,9 +17,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherFoodItem extends ItemFood { + public IIcon[] icons; - public String[] textureNames = new String[] {"potashapple"}; // , "haste" + public String[] textureNames = new String[] { "potashapple" }; // , "haste" public NetherFoodItem() { super(4, 0.4F, false); @@ -29,15 +33,11 @@ public NetherFoodItem() { // this.setAlwaysEdible(); } - /*public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer player) - { - if (player.canEat(true) && player.foodStats.getSaturationLevel() < 20F) - { - player.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); - } - - return par1ItemStack; - }*/ + /* + * public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer player) { if + * (player.canEat(true) && player.foodStats.getSaturationLevel() < 20F) { player.setItemInUse(par1ItemStack, + * this.getMaxItemUseDuration(par1ItemStack)); } return par1ItemStack; } + */ @Override protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { @@ -57,11 +57,9 @@ protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { } } - /*@Override - public int getMaxItemUseDuration(ItemStack itemstack) - { - return 24; - }*/ + /* + * @Override public int getMaxItemUseDuration(ItemStack itemstack) { return 24; } + */ @SideOnly(Side.CLIENT) @Override @@ -83,29 +81,17 @@ public void registerIcons(IIconRegister iconRegister) { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add(StatCollector.translateToLocal("tooltip.netherfood")); - /*switch (stack.getItemDamage()) - { - case 0: - list.add("Killer healing"); - break; - case 1: - list.add("Visible night"); - break; - case 2: - list.add("Slow dive"); - break; - case 3: - list.add("Hit like a truck"); - break; - }*/ + /* + * switch (stack.getItemDamage()) { case 0: list.add("Killer healing"); break; case 1: + * list.add("Visible night"); break; case 2: list.add("Slow dive"); break; case 3: list.add("Hit like a truck"); + * break; } + */ } /* Name override */ @Override public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()) - .append("item.food.nether.") - .append(textureNames[itemstack.getItemDamage()]) + return (new StringBuilder()).append("item.food.nether.").append(textureNames[itemstack.getItemDamage()]) .toString(); } @@ -120,8 +106,7 @@ public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) } } - /*public boolean isPotionIngredient() - { - return true; - }*/ + /* + * public boolean isPotionIngredient() { return true; } + */ } diff --git a/src/main/java/mods/natura/items/PlantItem.java b/src/main/java/mods/natura/items/PlantItem.java index 2e64a441..d5e0ed6a 100644 --- a/src/main/java/mods/natura/items/PlantItem.java +++ b/src/main/java/mods/natura/items/PlantItem.java @@ -1,53 +1,36 @@ package mods.natura.items; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NCraftingItem; import mods.natura.common.NaturaTab; import mods.natura.common.PHNatura; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class PlantItem extends NCraftingItem { + public PlantItem() { super( - new String[] { - "barley.plant", - "barley.flour", - "wheat.flour", - "cotton.plant", - "powder.sulfur", - "fletching.ghostwood", - "leather.imp", - "string.flame", - "dye.blue" - }, - new String[] { - "barley_plant", - "barley_flour", - "wheat_flour", - "cotton_plant", - "sulfur", - "ghostwood_fletching", - "leather_imp", - "flamestring", - "dye_blue" - }); + new String[] { "barley.plant", "barley.flour", "wheat.flour", "cotton.plant", "powder.sulfur", + "fletching.ghostwood", "leather.imp", "string.flame", "dye.blue" }, + new String[] { "barley_plant", "barley_flour", "wheat_flour", "cotton_plant", "sulfur", + "ghostwood_fletching", "leather_imp", "flamestring", "dye_blue" }); this.setCreativeTab(NaturaTab.tab); this.setHasSubtypes(true); } @Override public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()) - .append("item.") - .append(unlocalizedNames[itemstack.getItemDamage()]) - .toString(); + return (new StringBuilder()).append("item.").append(unlocalizedNames[itemstack.getItemDamage()]).toString(); } @Override diff --git a/src/main/java/mods/natura/items/SeedBag.java b/src/main/java/mods/natura/items/SeedBag.java index 9eeee900..71326f3b 100644 --- a/src/main/java/mods/natura/items/SeedBag.java +++ b/src/main/java/mods/natura/items/SeedBag.java @@ -1,9 +1,9 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +14,11 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SeedBag extends Item { + Block crop; int cropMetadata; String textureName; @@ -28,17 +32,8 @@ public SeedBag(Block block, int cMD, String texture) { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { if (side != 1) return false; boolean planted = false; diff --git a/src/main/java/mods/natura/items/SeedFood.java b/src/main/java/mods/natura/items/SeedFood.java index 0f4a704d..254ccab7 100644 --- a/src/main/java/mods/natura/items/SeedFood.java +++ b/src/main/java/mods/natura/items/SeedFood.java @@ -1,10 +1,10 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,7 +16,11 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SeedFood extends ItemSeedFood { + public Block crop; public SeedFood(int hunger, float saturation, Block cropID) { @@ -27,24 +31,14 @@ public SeedFood(int hunger, float saturation, Block cropID) { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { if (side != 1) { return false; } else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block soil = world.getBlock(x, y, z); - if (soil != null - && soil.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) NContent.saguaro) + if (soil != null && soil.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) NContent.saguaro) && world.isAirBlock(x, y + 1, z)) { world.setBlock(x, y + 1, z, this.crop, 1, 3); --stack.stackSize; diff --git a/src/main/java/mods/natura/items/SpawnEgg.java b/src/main/java/mods/natura/items/SpawnEgg.java index 27cc97bc..ba8d0f40 100644 --- a/src/main/java/mods/natura/items/SpawnEgg.java +++ b/src/main/java/mods/natura/items/SpawnEgg.java @@ -1,13 +1,13 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.PHNatura; import mods.natura.entity.BabyHeatscarSpider; import mods.natura.entity.HeatscarSpider; import mods.natura.entity.ImpEntity; import mods.natura.entity.NitroCreeper; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -21,10 +21,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SpawnEgg extends Item { - int[] primaryColor = {0xF29735, 0xE64D10, 0xF73E6C, 0xE64D10}; - int[] secondaryColor = {0x2E1F10, 0x57B1BD, 0x9B5004, 0x57B1BD}; - String[] mobNames = {"Natura.Imp", "Natura.FlameSpider", "Natura.NitroCreeper", "Natura.FlameSpiderBaby"}; + + int[] primaryColor = { 0xF29735, 0xE64D10, 0xF73E6C, 0xE64D10 }; + int[] secondaryColor = { 0x2E1F10, 0x57B1BD, 0x9B5004, 0x57B1BD }; + String[] mobNames = { "Natura.Imp", "Natura.FlameSpider", "Natura.NitroCreeper", "Natura.FlameSpiderBaby" }; public SpawnEgg() { super(); @@ -75,17 +79,8 @@ public int getColorFromItemStack(ItemStack stack, int pass) { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int posX, - int posY, - int posZ, - int par7, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int posX, int posY, int posZ, int par7, + float par8, float par9, float par10) { if (!world.isRemote) { activateSpawnEgg(stack, world, posX, posY, posZ, par7); if (!player.capabilities.isCreativeMode) { @@ -95,8 +90,8 @@ public boolean onItemUse( return true; } - public static EntityLiving activateSpawnEgg( - ItemStack stack, World world, double posX, double posY, double posZ, int par7) { + public static EntityLiving activateSpawnEgg(ItemStack stack, World world, double posX, double posY, double posZ, + int par7) { Block i1 = world.getBlock((int) posX, (int) posY, (int) posZ); posX += Facing.offsetsXForSide[par7]; posY += Facing.offsetsYForSide[par7]; diff --git a/src/main/java/mods/natura/items/StickItem.java b/src/main/java/mods/natura/items/StickItem.java index 1c0ad25c..44d63351 100644 --- a/src/main/java/mods/natura/items/StickItem.java +++ b/src/main/java/mods/natura/items/StickItem.java @@ -1,8 +1,7 @@ package mods.natura.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; @@ -10,22 +9,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class StickItem extends Item { - public static final String textureNames[] = { - "eucalyptus", - "sakura", - "ghostwood", - "redwood", - "bloodwood", - "hopseed", - "maple", - "silverbell", - "purpleheart", - "tiger", - "willow", - "darkwood", - "fusewood" - }; + + public static final String textureNames[] = { "eucalyptus", "sakura", "ghostwood", "redwood", "bloodwood", + "hopseed", "maple", "silverbell", "purpleheart", "tiger", "willow", "darkwood", "fusewood" }; public IIcon[] icons; public StickItem() { @@ -54,9 +44,8 @@ public void getSubItems(Item id, CreativeTabs tab, List list) { for (int i = 0; i < textureNames.length; i++) list.add(new ItemStack(id, 1, i)); } - /*public CreativeTabs[] getCreativeTabs () - { - return new CreativeTabs[] { getCreativeTab(), NaturaTab.tab }; - }*/ + /* + * public CreativeTabs[] getCreativeTabs () { return new CreativeTabs[] { getCreativeTab(), NaturaTab.tab }; } + */ } diff --git a/src/main/java/mods/natura/items/blocks/BerryBushItem.java b/src/main/java/mods/natura/items/blocks/BerryBushItem.java index 0688160a..09937eb3 100644 --- a/src/main/java/mods/natura/items/blocks/BerryBushItem.java +++ b/src/main/java/mods/natura/items/blocks/BerryBushItem.java @@ -1,10 +1,10 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,11 +12,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BerryBushItem extends MultiItemBlock { - public static final String blockType[] = { - "rasp", "blue", "black", "geo", "rasp", "blue", "black", "geo", "rasp", "blue", "black", "geo", "rasp", "blue", - "black", "geo" - }; + + public static final String blockType[] = { "rasp", "blue", "black", "geo", "rasp", "blue", "black", "geo", "rasp", + "blue", "black", "geo", "rasp", "blue", "black", "geo" }; public BerryBushItem(Block block) { super(block, "block", "berryBush", blockType); @@ -30,23 +32,13 @@ public int getMetadata(int meta) { /* Place bushes on dirt, grass, or other bushes only */ @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { if (side != 1) return false; else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = world.getBlock(x, y, z); - if (block != null - && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, NContent.berryBush) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, NContent.berryBush) && world.isAirBlock(x, y + 1, z)) { world.setBlock(x, y + 1, z, NContent.berryBush, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; @@ -57,11 +49,10 @@ else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y } /* Block name in inventory */ - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("block.").append(blockType[itemstack.getItemDamage()]).append("berryBush").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("block.").append(blockType[itemstack.getItemDamage()]).append("berryBush").toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/CloudItem.java b/src/main/java/mods/natura/items/blocks/CloudItem.java index 662abfe0..e1503375 100644 --- a/src/main/java/mods/natura/items/blocks/CloudItem.java +++ b/src/main/java/mods/natura/items/blocks/CloudItem.java @@ -1,16 +1,20 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class CloudItem extends MultiItemBlock { - public static final String blockType[] = {"normal", "dark", "ash", "sulfur"}; + + public static final String blockType[] = { "normal", "dark", "ash", "sulfur" }; public CloudItem(Block i) { super(i, "block", "cloud", blockType); @@ -18,11 +22,10 @@ public CloudItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("cloud").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("cloud").toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/DarkTreeItem.java b/src/main/java/mods/natura/items/blocks/DarkTreeItem.java index 310fe680..8dce36b4 100644 --- a/src/main/java/mods/natura/items/blocks/DarkTreeItem.java +++ b/src/main/java/mods/natura/items/blocks/DarkTreeItem.java @@ -1,16 +1,20 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class DarkTreeItem extends MultiItemBlock { - public static final String blockType[] = {"darkwood", "fusewood"}; + + public static final String blockType[] = { "darkwood", "fusewood" }; public DarkTreeItem(Block i) { super(i, "block.log", blockType); @@ -18,15 +22,11 @@ public DarkTreeItem(Block i) { setHasSubtypes(true); } - /*@Override - public String getUnlocalizedName (ItemStack itemstack) - { - if (itemstack.getItemDamage() < blockType.length) - { - return (new StringBuilder()).append("block.log.").append(blockType[itemstack.getItemDamage()]).toString(); - } - return null; - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { if (itemstack.getItemDamage() < + * blockType.length) { return (new + * StringBuilder()).append("block.log.").append(blockType[itemstack.getItemDamage()]).toString(); } return null; } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/FenceItem.java b/src/main/java/mods/natura/items/blocks/FenceItem.java index c5df9b42..a84040c6 100644 --- a/src/main/java/mods/natura/items/blocks/FenceItem.java +++ b/src/main/java/mods/natura/items/blocks/FenceItem.java @@ -1,13 +1,16 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class FenceItem extends MultiItemBlock { + public FenceItem(Block block) { super(block, block.getUnlocalizedName(), NContent.woodTextureNames); setMaxDamage(0); diff --git a/src/main/java/mods/natura/items/blocks/GlowshroomItem.java b/src/main/java/mods/natura/items/blocks/GlowshroomItem.java index b069d063..8d73132a 100644 --- a/src/main/java/mods/natura/items/blocks/GlowshroomItem.java +++ b/src/main/java/mods/natura/items/blocks/GlowshroomItem.java @@ -1,18 +1,22 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class GlowshroomItem extends MultiItemBlock { - public static final String blockType[] = {"green", "purple", "blue"}; + + public static final String blockType[] = { "green", "purple", "blue" }; public GlowshroomItem(Block i) { super(i, "block.glowshroom", blockType); @@ -25,11 +29,10 @@ public IIcon getIconFromDamage(int i) { return NContent.glowshroom.getIcon(0, i); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("block.glowshroom.").append(blockType[itemstack.getItemDamage()]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("block.glowshroom.").append(blockType[itemstack.getItemDamage()]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/GrassBlockItem.java b/src/main/java/mods/natura/items/blocks/GrassBlockItem.java index 7d4b94ec..f65f131f 100644 --- a/src/main/java/mods/natura/items/blocks/GrassBlockItem.java +++ b/src/main/java/mods/natura/items/blocks/GrassBlockItem.java @@ -1,10 +1,12 @@ package mods.natura.items.blocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class GrassBlockItem extends MultiItemBlock { - public static final String blockType[] = {"grass", "bluegrass", "autumngrass"}; + + public static final String blockType[] = { "grass", "bluegrass", "autumngrass" }; public GrassBlockItem(Block id) { super(id, "block.soil", blockType); @@ -12,10 +14,8 @@ public GrassBlockItem(Block id) { setHasSubtypes(true); } /* - @Override - public String getUnlocalizedName (ItemStack itemstack) - { - int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); - return (new StringBuilder()).append("block.soil.").append(blockType[pos]).toString(); - }*/ + * @Override public String getUnlocalizedName (ItemStack itemstack) { int pos = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); return (new + * StringBuilder()).append("block.soil.").append(blockType[pos]).toString(); } + */ } diff --git a/src/main/java/mods/natura/items/blocks/GrassSlabItem.java b/src/main/java/mods/natura/items/blocks/GrassSlabItem.java index 1b7cd907..b4e5781d 100644 --- a/src/main/java/mods/natura/items/blocks/GrassSlabItem.java +++ b/src/main/java/mods/natura/items/blocks/GrassSlabItem.java @@ -1,10 +1,12 @@ package mods.natura.items.blocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class GrassSlabItem extends MultiItemBlock { - public static final String blockType[] = {"grass", "bluegrass", "autumngrass"}; + + public static final String blockType[] = { "grass", "bluegrass", "autumngrass" }; public GrassSlabItem(Block id) { super(id, "block.soil", "slab", blockType); @@ -12,10 +14,9 @@ public GrassSlabItem(Block id) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); - return (new StringBuilder()).append("block.soil.").append(blockType[pos]).append(".slab").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int pos = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1); return (new + * StringBuilder()).append("block.soil.").append(blockType[pos]).append(".slab").toString(); } + */ } diff --git a/src/main/java/mods/natura/items/blocks/LogTwoxTwoItem.java b/src/main/java/mods/natura/items/blocks/LogTwoxTwoItem.java index d45c5aa9..6e94e4b8 100644 --- a/src/main/java/mods/natura/items/blocks/LogTwoxTwoItem.java +++ b/src/main/java/mods/natura/items/blocks/LogTwoxTwoItem.java @@ -1,15 +1,18 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class LogTwoxTwoItem extends ItemBlock { + public LogTwoxTwoItem(Block i) { super(i); setMaxDamage(0); diff --git a/src/main/java/mods/natura/items/blocks/NAlternateItem.java b/src/main/java/mods/natura/items/blocks/NAlternateItem.java index 87725b35..2504dc1c 100644 --- a/src/main/java/mods/natura/items/blocks/NAlternateItem.java +++ b/src/main/java/mods/natura/items/blocks/NAlternateItem.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemBlock; public class NAlternateItem extends ItemBlock { + public NAlternateItem(Block i) { super(i); setMaxDamage(0); diff --git a/src/main/java/mods/natura/items/blocks/NDoorItem.java b/src/main/java/mods/natura/items/blocks/NDoorItem.java index 14bdab56..f249540c 100644 --- a/src/main/java/mods/natura/items/blocks/NDoorItem.java +++ b/src/main/java/mods/natura/items/blocks/NDoorItem.java @@ -1,10 +1,10 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -17,10 +17,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NDoorItem extends Item { + public IIcon[] icons; - public String[] textureNames = - new String[] {"redwood", "eucalyptus", "hopseed", "sakura", "ghostwood", "bloodwood", "redwoodbark"}; + public String[] textureNames = new String[] { "redwood", "eucalyptus", "hopseed", "sakura", "ghostwood", + "bloodwood", "redwoodbark" }; public NDoorItem() { super(); @@ -29,30 +33,17 @@ public NDoorItem() { setHasSubtypes(true); } - public static final String unlocalizedNames[] = { - "redwood", "eucalyptus", "hopseed", "sakura", "ghost", "blood", "redwoodBark" - }; + public static final String unlocalizedNames[] = { "redwood", "eucalyptus", "hopseed", "sakura", "ghost", "blood", + "redwoodBark" }; @Override public String getUnlocalizedName(ItemStack itemstack) { - return (new StringBuilder()) - .append(unlocalizedNames[itemstack.getItemDamage()]) - .append("NDoor") - .toString(); + return (new StringBuilder()).append(unlocalizedNames[itemstack.getItemDamage()]).append("NDoor").toString(); } @Override - public boolean onItemUse( - ItemStack itemstack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float clickX, - float clickY, - float clickZ) { + public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, + float clickX, float clickY, float clickZ) { if (side != 1) { return false; } @@ -122,10 +113,10 @@ public static void placeDoorBlock(World world, int x, int y, int z, int rotate, + (world.getBlock(x - var6, y + 1, z - var7).isNormalCube() ? 1 : 0); int var9 = (world.getBlock(x + var6, y, z + var7).isNormalCube() ? 1 : 0) + (world.getBlock(x + var6, y + 1, z + var7).isNormalCube() ? 1 : 0); - boolean var10 = - world.getBlock(x - var6, y, z - var7) == block || world.getBlock(x - var6, y + 1, z - var7) == block; - boolean var11 = - world.getBlock(x + var6, y, z + var7) == block || world.getBlock(x + var6, y + 1, z + var7) == block; + boolean var10 = world.getBlock(x - var6, y, z - var7) == block + || world.getBlock(x - var6, y + 1, z - var7) == block; + boolean var11 = world.getBlock(x + var6, y, z + var7) == block + || world.getBlock(x + var6, y + 1, z + var7) == block; boolean var12 = false; if (var10 && !var11) { diff --git a/src/main/java/mods/natura/items/blocks/NLeavesDarkItem.java b/src/main/java/mods/natura/items/blocks/NLeavesDarkItem.java index f790204e..48d66408 100644 --- a/src/main/java/mods/natura/items/blocks/NLeavesDarkItem.java +++ b/src/main/java/mods/natura/items/blocks/NLeavesDarkItem.java @@ -1,34 +1,21 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NLeavesDarkItem extends MultiItemBlock { - public static final String blockType[] = { - "darkwood", - "darkwood.flowering", - "darkwood.fruit", - "fusewood", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - }; + + public static final String blockType[] = { "darkwood", "darkwood.flowering", "darkwood.fruit", "fusewood", "", "", + "", "", "", "", "", "", "", "", "", "", "" }; public NLeavesDarkItem(Block i) { super(i, "block.leaves", blockType); @@ -41,11 +28,10 @@ public int getMetadata(int md) { return md | 4; } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("block.leaves.").append(blockType[itemstack.getItemDamage()]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("block.leaves.").append(blockType[itemstack.getItemDamage()]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/NLeavesItem.java b/src/main/java/mods/natura/items/blocks/NLeavesItem.java index 1bdcd458..8a777377 100644 --- a/src/main/java/mods/natura/items/blocks/NLeavesItem.java +++ b/src/main/java/mods/natura/items/blocks/NLeavesItem.java @@ -1,18 +1,21 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NLeavesItem extends MultiItemBlock { - public static final String blockType[] = { - "redwood", "eucalyptus", "bush", "", "", "", "", "", "", "", "", "", "", "", "", "" - }; + + public static final String blockType[] = { "redwood", "eucalyptus", "bush", "", "", "", "", "", "", "", "", "", "", + "", "", "" }; public NLeavesItem(Block i) { super(i, "block", "NLeaves", blockType); @@ -25,11 +28,10 @@ public int getMetadata(int md) { return md | 4; } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("NLeaves").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("NLeaves").toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/NOverrideItem.java b/src/main/java/mods/natura/items/blocks/NOverrideItem.java index 81525b3b..eb9acfc7 100644 --- a/src/main/java/mods/natura/items/blocks/NOverrideItem.java +++ b/src/main/java/mods/natura/items/blocks/NOverrideItem.java @@ -1,11 +1,13 @@ package mods.natura.items.blocks; import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemBlock; public class NOverrideItem extends ItemBlock { + public NOverrideItem(Block i) { super(i); setMaxDamage(0); @@ -19,6 +21,6 @@ public int getMetadata(int meta) { @Override public CreativeTabs[] getCreativeTabs() { - return new CreativeTabs[] {getCreativeTab(), NaturaTab.tab}; + return new CreativeTabs[] { getCreativeTab(), NaturaTab.tab }; } } diff --git a/src/main/java/mods/natura/items/blocks/NSaplingItem.java b/src/main/java/mods/natura/items/blocks/NSaplingItem.java index e4e52ce3..eadd0e5c 100644 --- a/src/main/java/mods/natura/items/blocks/NSaplingItem.java +++ b/src/main/java/mods/natura/items/blocks/NSaplingItem.java @@ -1,10 +1,10 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -13,26 +13,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NSaplingItem extends MultiItemBlock { - public static final String blockType[] = { - "redwood", - "eucalyptus", - "bush", - "sakura", - "ghost", - "blood", - "darkwood", - "fusewood", - "", - "", - "", - "", - "", - "", - "", - "", - "" - }; + + public static final String blockType[] = { "redwood", "eucalyptus", "bush", "sakura", "ghost", "blood", "darkwood", + "fusewood", "", "", "", "", "", "", "", "", "" }; private Block bID; public NSaplingItem(Block block) { @@ -47,11 +34,10 @@ public IIcon getIconFromDamage(int i) { return NContent.floraSapling.getIcon(0, i); } - /*@Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("block.sapling.").append(blockType[itemstack.getItemDamage()]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("block.sapling.").append(blockType[itemstack.getItemDamage()]).toString(); } + */ @Override @SideOnly(Side.CLIENT) @@ -87,49 +73,39 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { Block blockID = world.getBlock(x, y, z); if (blockID == Blocks.snow && (world.getBlockMetadata(x, y, z) & 7) < 1) { side = 1; - } else if (blockID != Blocks.vine - && blockID != Blocks.tallgrass + } else if (blockID != Blocks.vine && blockID != Blocks.tallgrass && blockID != Blocks.deadbush && (blockID == null || !blockID.isReplaceable(world, x, y, z))) { - if (side == 0) { - --y; - } - - if (side == 1) { - ++y; - } - - if (side == 2) { - --z; - } - - if (side == 3) { - ++z; - } - - if (side == 4) { - --x; - } - - if (side == 5) { - ++x; - } - } + if (side == 0) { + --y; + } + + if (side == 1) { + ++y; + } + + if (side == 2) { + --z; + } + + if (side == 3) { + ++z; + } + + if (side == 4) { + --x; + } + + if (side == 5) { + ++x; + } + } if (stack.getItemDamage() == 5) { Block block = world.getBlock(x, y + 1, z); diff --git a/src/main/java/mods/natura/items/blocks/NetherBerryBushItem.java b/src/main/java/mods/natura/items/blocks/NetherBerryBushItem.java index c3045d2d..e161ff08 100644 --- a/src/main/java/mods/natura/items/blocks/NetherBerryBushItem.java +++ b/src/main/java/mods/natura/items/blocks/NetherBerryBushItem.java @@ -1,10 +1,10 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -13,12 +13,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherBerryBushItem extends MultiItemBlock { - public static final String blockType[] = { - "blight", "dusk", "sky", "sting", "blight", "dusk", "sky", "sting", "blight", "dusk", "sky", "sting", "blight", - "dusk", "sky", "sting" - }; + public static final String blockType[] = { "blight", "dusk", "sky", "sting", "blight", "dusk", "sky", "sting", + "blight", "dusk", "sky", "sting", "blight", "dusk", "sky", "sting" }; public NetherBerryBushItem(Block block) { super(block, "block.bush.berry", blockType); @@ -33,17 +34,8 @@ public int getMetadata(int meta) { /* Place bushes on dirt, grass, or other bushes only */ @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float par8, - float par9, - float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float par8, float par9, float par10) { if (side != 1) return false; else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { Block block = world.getBlock(x, y, z); @@ -61,11 +53,10 @@ else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y } /* Block name in inventory */ - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("block.bush.berry.").append(blockType[itemstack.getItemDamage()]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("block.bush.berry.").append(blockType[itemstack.getItemDamage()]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/NetherGlassItem.java b/src/main/java/mods/natura/items/blocks/NetherGlassItem.java index 2adf2688..130daa3b 100644 --- a/src/main/java/mods/natura/items/blocks/NetherGlassItem.java +++ b/src/main/java/mods/natura/items/blocks/NetherGlassItem.java @@ -1,18 +1,22 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NetherGlassItem extends MultiItemBlock { - public static final String blockType[] = {"soul", "heat"}; + + public static final String blockType[] = { "soul", "heat" }; public NetherGlassItem(Block block) { super(block, "tile.glass", blockType); @@ -20,11 +24,10 @@ public NetherGlassItem(Block block) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("tile.glass.").append(blockType[itemstack.getItemDamage()]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("tile.glass.").append(blockType[itemstack.getItemDamage()]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/NoColorLeavesItem.java b/src/main/java/mods/natura/items/blocks/NoColorLeavesItem.java index feaeae50..31cabe87 100644 --- a/src/main/java/mods/natura/items/blocks/NoColorLeavesItem.java +++ b/src/main/java/mods/natura/items/blocks/NoColorLeavesItem.java @@ -1,18 +1,21 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NoColorLeavesItem extends MultiItemBlock { - public static final String blockType[] = { - "sakura", "ghost", "blood", "willow", "", "", "", "", "", "", "", "", "", "", "", "", "" - }; + + public static final String blockType[] = { "sakura", "ghost", "blood", "willow", "", "", "", "", "", "", "", "", "", + "", "", "", "" }; public NoColorLeavesItem(Block i) { super(i, "block.leaves", blockType); @@ -25,11 +28,10 @@ public int getMetadata(int md) { return md | 4; } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append("block.leaves.").append(blockType[itemstack.getItemDamage()]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append("block.leaves.").append(blockType[itemstack.getItemDamage()]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/OmniShapeBlockItem.java b/src/main/java/mods/natura/items/blocks/OmniShapeBlockItem.java index 5f92dd1d..b1134270 100644 --- a/src/main/java/mods/natura/items/blocks/OmniShapeBlockItem.java +++ b/src/main/java/mods/natura/items/blocks/OmniShapeBlockItem.java @@ -1,13 +1,13 @@ package mods.natura.items.blocks; import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; public class OmniShapeBlockItem extends MultiItemBlock { - public static final String blockType[] = { - "stair", "stair", "stair", "stair", "stair", "stair", "stair", "stair", "slab", "slab", "slab", "slab", "slab", - "slab", "fence", "none" - }; + + public static final String blockType[] = { "stair", "stair", "stair", "stair", "stair", "stair", "stair", "stair", + "slab", "slab", "slab", "slab", "slab", "slab", "fence", "none" }; public OmniShapeBlockItem(Block i) { super(i, "", "omni", blockType); @@ -15,32 +15,17 @@ public OmniShapeBlockItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("omni").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("omni").toString(); } + */ // was commented out already when moving to mantle interfaces - /*@Override - @SideOnly(Side.CLIENT) - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - list.add("So light and fluffy!"); - switch (stack.getItemDamage() % 4) - { - case 0: - list.add("Saves you when you fall"); - break; - case 1: - list.add("Causes lightning strikes"); - break; - case 2: - list.add("3x3 Converts into charcoal"); - break; - case 3: - list.add("2x2 Converts into sulfur"); - break; - } - }*/ + /* + * @Override + * @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) + * { list.add("So light and fluffy!"); switch (stack.getItemDamage() % 4) { case 0: + * list.add("Saves you when you fall"); break; case 1: list.add("Causes lightning strikes"); break; case 2: + * list.add("3x3 Converts into charcoal"); break; case 3: list.add("2x2 Converts into sulfur"); break; } } + */ } diff --git a/src/main/java/mods/natura/items/blocks/OverworldLeavesItem.java b/src/main/java/mods/natura/items/blocks/OverworldLeavesItem.java index 52d4e4e0..8f594704 100644 --- a/src/main/java/mods/natura/items/blocks/OverworldLeavesItem.java +++ b/src/main/java/mods/natura/items/blocks/OverworldLeavesItem.java @@ -1,16 +1,20 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class OverworldLeavesItem extends MultiItemBlock { - public static final String blockType[] = {"maple", "silverbell", "purpleheart", "tiger"}; + + public static final String blockType[] = { "maple", "silverbell", "purpleheart", "tiger" }; public OverworldLeavesItem(Block i) { super(i, "block.leaves", blockType); @@ -18,12 +22,11 @@ public OverworldLeavesItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - int i = MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); - return (new StringBuilder()).append("block.leaves.").append(blockType[i]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int i = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); return (new + * StringBuilder()).append("block.leaves.").append(blockType[i]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/OverworldSaplingItem.java b/src/main/java/mods/natura/items/blocks/OverworldSaplingItem.java index bca170a1..82415c5e 100644 --- a/src/main/java/mods/natura/items/blocks/OverworldSaplingItem.java +++ b/src/main/java/mods/natura/items/blocks/OverworldSaplingItem.java @@ -1,18 +1,22 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class OverworldSaplingItem extends MultiItemBlock { - public static final String blockType[] = {"maple", "silverbell", "purpleheart", "tiger", "willow"}; + + public static final String blockType[] = { "maple", "silverbell", "purpleheart", "tiger", "willow" }; public OverworldSaplingItem(Block b) { super(b, "block.sapling", blockType); @@ -25,12 +29,11 @@ public IIcon getIconFromDamage(int i) { return NContent.rareSapling.getIcon(0, i); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - int i = MathHelper.clamp_int(itemstack.getItemDamage(), 0, 4); - return (new StringBuilder()).append("block.sapling.").append(blockType[i]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int i = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, 4); return (new + * StringBuilder()).append("block.sapling.").append(blockType[i]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/OverworldTreeItem.java b/src/main/java/mods/natura/items/blocks/OverworldTreeItem.java index 9148f3b0..41315e29 100644 --- a/src/main/java/mods/natura/items/blocks/OverworldTreeItem.java +++ b/src/main/java/mods/natura/items/blocks/OverworldTreeItem.java @@ -1,16 +1,20 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class OverworldTreeItem extends MultiItemBlock { - public static final String blockType[] = {"maple", "silverbell", "purpleheart", "tiger"}; + + public static final String blockType[] = { "maple", "silverbell", "purpleheart", "tiger" }; public OverworldTreeItem(Block i) { super(i, "block.log", blockType); @@ -18,12 +22,11 @@ public OverworldTreeItem(Block i) { setHasSubtypes(true); } - /*@Override - public String getUnlocalizedName (ItemStack itemstack) - { - int i = MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); - return (new StringBuilder()).append("block.log.").append(blockType[i]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int i = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); return (new + * StringBuilder()).append("block.log.").append(blockType[i]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/PlankSlab1Item.java b/src/main/java/mods/natura/items/blocks/PlankSlab1Item.java index dd3c232c..6f804fad 100644 --- a/src/main/java/mods/natura/items/blocks/PlankSlab1Item.java +++ b/src/main/java/mods/natura/items/blocks/PlankSlab1Item.java @@ -1,20 +1,23 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class PlankSlab1Item extends MultiItemBlock { - public static final String blockType[] = { - "eucalyptus", "sakura", "ghost", "redwood", "blood", "bush", "maple", "silverbell" - }; + + public static final String blockType[] = { "eucalyptus", "sakura", "ghost", "redwood", "blood", "bush", "maple", + "silverbell" }; Block block; public PlankSlab1Item(Block id) { @@ -24,21 +27,11 @@ public PlankSlab1Item(Block id) { setHasSubtypes(true); } - /*@Override - public String getUnlocalizedName (ItemStack itemstack) - { - int damage = itemstack.getItemDamage(); - if (damage >= blockType.length) - { - if (blockType.length == 0) - { - return ""; - } - damage %= blockType.length; - } - - return (new StringBuilder()).append("block.wood.").append(blockType[damage]).append(".slab").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int damage = itemstack.getItemDamage(); if + * (damage >= blockType.length) { if (blockType.length == 0) { return ""; } damage %= blockType.length; } return + * (new StringBuilder()).append("block.wood.").append(blockType[damage]).append(".slab").toString(); } + */ @Override @SideOnly(Side.CLIENT) @@ -72,17 +65,8 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { Block id = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; diff --git a/src/main/java/mods/natura/items/blocks/PlankSlab2Item.java b/src/main/java/mods/natura/items/blocks/PlankSlab2Item.java index c4516b41..39d75ced 100644 --- a/src/main/java/mods/natura/items/blocks/PlankSlab2Item.java +++ b/src/main/java/mods/natura/items/blocks/PlankSlab2Item.java @@ -1,18 +1,22 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class PlankSlab2Item extends MultiItemBlock { - public static final String blockType[] = {"purpleheart", "tiger", "willow", "darkwood", "fusewood", "", "", ""}; + + public static final String blockType[] = { "purpleheart", "tiger", "willow", "darkwood", "fusewood", "", "", "" }; Block block; public PlankSlab2Item(Block id) { @@ -32,11 +36,7 @@ public String getUnlocalizedName(ItemStack itemstack) { damage %= blockType.length; } - return (new StringBuilder()) - .append("block.wood.") - .append(blockType[damage]) - .append(".slab") - .toString(); + return (new StringBuilder()).append("block.wood.").append(blockType[damage]).append(".slab").toString(); } @Override @@ -63,17 +63,8 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { Block id = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; diff --git a/src/main/java/mods/natura/items/blocks/PlanksItem.java b/src/main/java/mods/natura/items/blocks/PlanksItem.java index cdd878dd..90e6949c 100644 --- a/src/main/java/mods/natura/items/blocks/PlanksItem.java +++ b/src/main/java/mods/natura/items/blocks/PlanksItem.java @@ -1,33 +1,21 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class PlanksItem extends MultiItemBlock { - public static final String blockType[] = { - "eucalyptus", - "sakura", - "ghost", - "redwood", - "blood", - "bush", - "maple", - "silverbell", - "purpleheart", - "tiger", - "willow", - "darkwood", - "fusewood", - "", - "", - "" - }; + + public static final String blockType[] = { "eucalyptus", "sakura", "ghost", "redwood", "blood", "bush", "maple", + "silverbell", "purpleheart", "tiger", "willow", "darkwood", "fusewood", "", "", "" }; public PlanksItem(Block i) { super(i, "block", "NPlanks", blockType); @@ -35,11 +23,10 @@ public PlanksItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("NPlanks").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("NPlanks").toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/RedwoodItem.java b/src/main/java/mods/natura/items/blocks/RedwoodItem.java index 143bac9b..17d398cd 100644 --- a/src/main/java/mods/natura/items/blocks/RedwoodItem.java +++ b/src/main/java/mods/natura/items/blocks/RedwoodItem.java @@ -1,18 +1,21 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class RedwoodItem extends MultiItemBlock { - public static final String blockType[] = { - "bark", "heart", "root", "", "", "", "", "", "", "", "", "", "", "", "", "" - }; + + public static final String blockType[] = { "bark", "heart", "root", "", "", "", "", "", "", "", "", "", "", "", "", + "" }; public RedwoodItem(Block i) { super(i, "block", "redwood", blockType); @@ -20,11 +23,10 @@ public RedwoodItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - return (new StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("Redwood").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { return (new + * StringBuilder()).append(blockType[itemstack.getItemDamage()]).append("Redwood").toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/SaguaroItem.java b/src/main/java/mods/natura/items/blocks/SaguaroItem.java index 814a2194..9c54d2c9 100644 --- a/src/main/java/mods/natura/items/blocks/SaguaroItem.java +++ b/src/main/java/mods/natura/items/blocks/SaguaroItem.java @@ -1,15 +1,18 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class SaguaroItem extends ItemBlock { + public SaguaroItem(Block i) { super(i); setMaxDamage(0); diff --git a/src/main/java/mods/natura/items/blocks/TreeItem.java b/src/main/java/mods/natura/items/blocks/TreeItem.java index b2b91d57..d3ce3989 100644 --- a/src/main/java/mods/natura/items/blocks/TreeItem.java +++ b/src/main/java/mods/natura/items/blocks/TreeItem.java @@ -1,16 +1,20 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class TreeItem extends MultiItemBlock { - public static final String blockType[] = {"eucalyptus", "sakura", "ghost", "hopseed"}; + + public static final String blockType[] = { "eucalyptus", "sakura", "ghost", "hopseed" }; public TreeItem(Block i) { super(i, "block", "log", blockType); @@ -18,12 +22,11 @@ public TreeItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - int i = MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); - return (new StringBuilder()).append(blockType[i]).append("Log").toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int i = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); return (new + * StringBuilder()).append(blockType[i]).append("Log").toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/blocks/WillowItem.java b/src/main/java/mods/natura/items/blocks/WillowItem.java index 39a17ffe..a95c4040 100644 --- a/src/main/java/mods/natura/items/blocks/WillowItem.java +++ b/src/main/java/mods/natura/items/blocks/WillowItem.java @@ -1,16 +1,20 @@ package mods.natura.items.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mantle.blocks.abstracts.MultiItemBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class WillowItem extends MultiItemBlock { - public static final String blockType[] = {"willow", "sakura", "ghost", "hopseed"}; + + public static final String blockType[] = { "willow", "sakura", "ghost", "hopseed" }; public WillowItem(Block i) { super(i, "block.log", blockType); @@ -18,12 +22,11 @@ public WillowItem(Block i) { setHasSubtypes(true); } - /* @Override - public String getUnlocalizedName (ItemStack itemstack) - { - int i = MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); - return (new StringBuilder()).append("block.log.").append(blockType[i]).toString(); - }*/ + /* + * @Override public String getUnlocalizedName (ItemStack itemstack) { int i = + * MathHelper.clamp_int(itemstack.getItemDamage(), 0, 3); return (new + * StringBuilder()).append("block.log.").append(blockType[i]).toString(); } + */ @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mods/natura/items/tools/FlintAndBlaze.java b/src/main/java/mods/natura/items/tools/FlintAndBlaze.java index fb37d6f5..9219fd15 100644 --- a/src/main/java/mods/natura/items/tools/FlintAndBlaze.java +++ b/src/main/java/mods/natura/items/tools/FlintAndBlaze.java @@ -8,6 +8,7 @@ import net.minecraft.world.World; public class FlintAndBlaze extends Item { + public FlintAndBlaze() { super(); this.maxStackSize = 1; @@ -15,64 +16,25 @@ public FlintAndBlaze() { this.setCreativeTab(CreativeTabs.tabTools); } - /*public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.fireballCharge.itemID)) - { - par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); - } - - return par1ItemStack; - } - - public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int ticksRemaining) - { - if (!world.isRemote) - { - int time = this.getMaxItemUseDuration(stack) - ticksRemaining; - if (time > 8) - { - int amount = time / 8; - if (amount > 1) - amount = 1; - for (int i = 0; i < amount; i++) - { - double x = player.posX; - double y = player.posY; - double z = player.posZ; - float f1 = player.rotationYawHead; - EntitySmallFireball entitysmallfireball = new EntitySmallFireball(world, player, x, y, z); - entitysmallfireball.posY = player.posY + 1.62D; - world.spawnEntityInWorld(entitysmallfireball); - world.playAuxSFXAtEntity(player, 1009, (int) x, (int) y, (int) z, 0); - } - } - } - } - - public int getMaxItemUseDuration (ItemStack par1ItemStack) - { - return 72000; - } - - public EnumAction getItemUseAction (ItemStack par1ItemStack) - { - return EnumAction.bow; - }*/ + /* + * public ItemStack onItemRightClick (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if + * (par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(Item.fireballCharge.itemID)) + * { par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack)); } return + * par1ItemStack; } public void onPlayerStoppedUsing (ItemStack stack, World world, EntityPlayer player, int + * ticksRemaining) { if (!world.isRemote) { int time = this.getMaxItemUseDuration(stack) - ticksRemaining; if (time + * > 8) { int amount = time / 8; if (amount > 1) amount = 1; for (int i = 0; i < amount; i++) { double x = + * player.posX; double y = player.posY; double z = player.posZ; float f1 = player.rotationYawHead; + * EntitySmallFireball entitysmallfireball = new EntitySmallFireball(world, player, x, y, z); + * entitysmallfireball.posY = player.posY + 1.62D; world.spawnEntityInWorld(entitysmallfireball); + * world.playAuxSFXAtEntity(player, 1009, (int) x, (int) y, (int) z, 0); } } } } public int getMaxItemUseDuration + * (ItemStack par1ItemStack) { return 72000; } public EnumAction getItemUseAction (ItemStack par1ItemStack) { return + * EnumAction.bow; } + */ // Right-click on blocks @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ) { if (side == 0) { --y; } @@ -102,7 +64,12 @@ public boolean onItemUse( } else { if (world.isAirBlock(x, y, z)) { world.playSoundEffect( - x + 0.5D, y + 0.5D, z + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + x + 0.5D, + y + 0.5D, + z + 0.5D, + "fire.ignite", + 1.0F, + itemRand.nextFloat() * 0.4F + 0.8F); world.setBlock(x, y, z, Blocks.fire); } diff --git a/src/main/java/mods/natura/items/tools/FusewoodBow.java b/src/main/java/mods/natura/items/tools/FusewoodBow.java index 6c4bb614..b20d3a02 100644 --- a/src/main/java/mods/natura/items/tools/FusewoodBow.java +++ b/src/main/java/mods/natura/items/tools/FusewoodBow.java @@ -1,6 +1,7 @@ package mods.natura.items.tools; import mods.natura.entity.FusewoodArrow; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; @@ -17,8 +18,8 @@ public FusewoodBow(int damage, String type) { } @Override - public void onPlayerStoppedUsing( - ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) { + public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, + int par4) { int j = this.getMaxItemUseDuration(par1ItemStack) - par4; ArrowLooseEvent event = new ArrowLooseEvent(par3EntityPlayer, par1ItemStack, j); @@ -68,7 +69,10 @@ public void onPlayerStoppedUsing( par1ItemStack.damageItem(1, par3EntityPlayer); par2World.playSoundAtEntity( - par3EntityPlayer, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + par3EntityPlayer, + "random.bow", + 1.0F, + 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); if (flag) { entityarrow.canBePickedUp = 2; diff --git a/src/main/java/mods/natura/items/tools/NaturaArmor.java b/src/main/java/mods/natura/items/tools/NaturaArmor.java index 6cc695f6..749402e0 100644 --- a/src/main/java/mods/natura/items/tools/NaturaArmor.java +++ b/src/main/java/mods/natura/items/tools/NaturaArmor.java @@ -1,10 +1,10 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import mods.natura.common.NContent; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -12,7 +12,11 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaArmor extends ItemArmor { + String itemTexture; String armorTexture; diff --git a/src/main/java/mods/natura/items/tools/NaturaBow.java b/src/main/java/mods/natura/items/tools/NaturaBow.java index 17a15aab..b4d6c222 100644 --- a/src/main/java/mods/natura/items/tools/NaturaBow.java +++ b/src/main/java/mods/natura/items/tools/NaturaBow.java @@ -1,16 +1,19 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaBow extends ItemBow { - public static final String[] drawNames = new String[] {"_bow_drawn_0", "_bow_drawn_1", "_bow_drawn_2"}; + + public static final String[] drawNames = new String[] { "_bow_drawn_0", "_bow_drawn_1", "_bow_drawn_2" }; IIcon[] icons; String woodType; diff --git a/src/main/java/mods/natura/items/tools/NaturaHatchet.java b/src/main/java/mods/natura/items/tools/NaturaHatchet.java index b8fca31d..3d625756 100644 --- a/src/main/java/mods/natura/items/tools/NaturaHatchet.java +++ b/src/main/java/mods/natura/items/tools/NaturaHatchet.java @@ -1,12 +1,15 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemAxe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaHatchet extends ItemAxe { + String texture; public NaturaHatchet(ToolMaterial toolMaterial, String texture) { diff --git a/src/main/java/mods/natura/items/tools/NaturaKama.java b/src/main/java/mods/natura/items/tools/NaturaKama.java index 78136540..1fbc6a90 100644 --- a/src/main/java/mods/natura/items/tools/NaturaKama.java +++ b/src/main/java/mods/natura/items/tools/NaturaKama.java @@ -1,11 +1,11 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import mods.natura.common.NaturaTab; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; @@ -22,7 +22,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaKama extends ItemSword { + String texture; public NaturaKama(ToolMaterial toolmaterial, String texture) { @@ -38,13 +42,7 @@ public void registerIcons(IIconRegister par1IconRegister) { } /* Shears */ - public boolean onBlockDestroyed( - ItemStack par1ItemStack, - World par2World, - int par3, - int par4, - int par5, - int par6, + public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, EntityLiving par7EntityLiving) { return true; } @@ -59,7 +57,7 @@ public boolean canHarvestBlock(Block par1Block) { */ public float getStrVsBlock(ItemStack par1ItemStack, Block par2Block) { return par2Block != Blocks.web && par2Block != Blocks.leaves - ? (par2Block == Blocks.wool ? 5.0F : super.func_150893_a /*getStrVsBlock*/(par1ItemStack, par2Block)) + ? (par2Block == Blocks.wool ? 5.0F : super.func_150893_a /* getStrVsBlock */(par1ItemStack, par2Block)) : 15.0F; } @@ -70,8 +68,8 @@ public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player } if (entity instanceof IShearable) { IShearable target = (IShearable) entity; - if (target.isShearable( - itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { + if (target + .isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { ArrayList drops = target.onSheared( itemstack, entity.worldObj, diff --git a/src/main/java/mods/natura/items/tools/NaturaPickaxe.java b/src/main/java/mods/natura/items/tools/NaturaPickaxe.java index 10f0a142..d1fd270f 100644 --- a/src/main/java/mods/natura/items/tools/NaturaPickaxe.java +++ b/src/main/java/mods/natura/items/tools/NaturaPickaxe.java @@ -1,12 +1,15 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemPickaxe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaPickaxe extends ItemPickaxe { + String texture; public NaturaPickaxe(ToolMaterial toolMaterial, String texture) { diff --git a/src/main/java/mods/natura/items/tools/NaturaShovel.java b/src/main/java/mods/natura/items/tools/NaturaShovel.java index aee6a387..fd816132 100644 --- a/src/main/java/mods/natura/items/tools/NaturaShovel.java +++ b/src/main/java/mods/natura/items/tools/NaturaShovel.java @@ -1,12 +1,15 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemSpade; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaShovel extends ItemSpade { + String texture; public NaturaShovel(ToolMaterial toolMaterial, String texture) { diff --git a/src/main/java/mods/natura/items/tools/NaturaSword.java b/src/main/java/mods/natura/items/tools/NaturaSword.java index adb168bd..fcd9f2ca 100644 --- a/src/main/java/mods/natura/items/tools/NaturaSword.java +++ b/src/main/java/mods/natura/items/tools/NaturaSword.java @@ -1,12 +1,15 @@ package mods.natura.items.tools; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mods.natura.common.NaturaTab; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemSword; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class NaturaSword extends ItemSword { + String texture; public NaturaSword(ToolMaterial toolMaterial, String texture) { diff --git a/src/main/java/mods/natura/plugins/fmp/FMPPulse.java b/src/main/java/mods/natura/plugins/fmp/FMPPulse.java index 79a8ac9a..f2244f09 100644 --- a/src/main/java/mods/natura/plugins/fmp/FMPPulse.java +++ b/src/main/java/mods/natura/plugins/fmp/FMPPulse.java @@ -1,9 +1,9 @@ package mods.natura.plugins.fmp; -import cpw.mods.fml.common.event.FMLInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.Natura; +import cpw.mods.fml.common.event.FMLInitializationEvent; @Pulse(id = "Natura FMP Compatibility", modsRequired = ForgeMultiPart.modId) public class FMPPulse { diff --git a/src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java b/src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java index 67679927..d1e89d50 100644 --- a/src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java +++ b/src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java @@ -1,10 +1,12 @@ package mods.natura.plugins.fmp; -import codechicken.microblock.BlockMicroMaterial; -import codechicken.microblock.MicroMaterialRegistry; import mods.natura.common.NContent; + import net.minecraft.block.Block; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.MicroMaterialRegistry; + public class ForgeMultiPart { public static final String modId = "ForgeMultipart"; @@ -36,8 +38,8 @@ public static void registerBlock(Block block) { } // For blocks with metadata values and special MicroMaterial only - public static void registerBlock( - Block block, int metastart, int metaend, MicroMaterialRegistry.IMicroMaterial material) { + public static void registerBlock(Block block, int metastart, int metaend, + MicroMaterialRegistry.IMicroMaterial material) { for (int meta = metastart; meta <= metaend; meta++) { String identifier = new String(block.getUnlocalizedName()); MicroMaterialRegistry.registerMaterial(material, identifier + meta); diff --git a/src/main/java/mods/natura/plugins/imc/BuildCraftPulse.java b/src/main/java/mods/natura/plugins/imc/BuildCraftPulse.java index 5b3204ff..cdeb60db 100644 --- a/src/main/java/mods/natura/plugins/imc/BuildCraftPulse.java +++ b/src/main/java/mods/natura/plugins/imc/BuildCraftPulse.java @@ -1,14 +1,16 @@ package mods.natura.plugins.imc; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; + @Pulse(id = "Natura BuildCraft Compatibility", modsRequired = BuildCraftPulse.modId) public class BuildCraftPulse { diff --git a/src/main/java/mods/natura/plugins/imc/ForestryPulse.java b/src/main/java/mods/natura/plugins/imc/ForestryPulse.java index e561216f..ee8137ee 100644 --- a/src/main/java/mods/natura/plugins/imc/ForestryPulse.java +++ b/src/main/java/mods/natura/plugins/imc/ForestryPulse.java @@ -1,8 +1,8 @@ package mods.natura.plugins.imc; -import cpw.mods.fml.common.event.FMLInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; +import cpw.mods.fml.common.event.FMLInitializationEvent; @Pulse(id = "Natura Forestry Compatibility", modsRequired = ForestryPulse.modId) public class ForestryPulse { @@ -12,13 +12,12 @@ public class ForestryPulse { @Handler public void init(FMLInitializationEvent evt) { /* - //Forestry - StringBuilder builder = new StringBuilder(); - String string = builder.append("farmWheat@").append(seeds.itemID).append(".0.").append(crops.blockID).append(".3").toString(); - FMLInterModComms.sendMessage("Forestry", "add-farmable-crop", string); - builder = new StringBuilder(); - string = builder.append("farmWheat@").append(seeds.itemID).append(".1.").append(crops.blockID).append(".8").toString(); - FMLInterModComms.sendMessage("Forestry", "add-farmable-crop", string); + * //Forestry StringBuilder builder = new StringBuilder(); String string = + * builder.append("farmWheat@").append(seeds.itemID).append(".0.").append(crops.blockID).append(".3").toString() + * ; FMLInterModComms.sendMessage("Forestry", "add-farmable-crop", string); builder = new StringBuilder(); + * string = + * builder.append("farmWheat@").append(seeds.itemID).append(".1.").append(crops.blockID).append(".8").toString() + * ; FMLInterModComms.sendMessage("Forestry", "add-farmable-crop", string); */ } } diff --git a/src/main/java/mods/natura/plugins/imc/TreeCapitatorPulse.java b/src/main/java/mods/natura/plugins/imc/TreeCapitatorPulse.java index b2176d5e..4d8414f5 100644 --- a/src/main/java/mods/natura/plugins/imc/TreeCapitatorPulse.java +++ b/src/main/java/mods/natura/plugins/imc/TreeCapitatorPulse.java @@ -1,16 +1,18 @@ package mods.natura.plugins.imc; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameData; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.GameData; + @Pulse(id = "Natura TreeCapitator Compatibility", modsRequired = TreeCapitatorPulse.modId) public class TreeCapitatorPulse { @@ -55,7 +57,8 @@ public void init(FMLInitializationEvent evt) { "leaves", String.format( "%s,2; %s,10", - getUniqueName(NContent.floraLeavesNoColor), getUniqueName(NContent.floraLeavesNoColor))); + getUniqueName(NContent.floraLeavesNoColor), + getUniqueName(NContent.floraLeavesNoColor))); treeList.appendTag(treeDef); // darkwood treeDef = new NBTTagCompound(); @@ -76,7 +79,9 @@ public void init(FMLInitializationEvent evt) { "logs", String.format( "%s,0; %s,4; %s,8", - getUniqueName(NContent.tree), getUniqueName(NContent.tree), getUniqueName(NContent.tree))); + getUniqueName(NContent.tree), + getUniqueName(NContent.tree), + getUniqueName(NContent.tree))); treeDef.setString( "leaves", String.format("%s,1; %s,9", getUniqueName(NContent.floraLeaves), getUniqueName(NContent.floraLeaves))); @@ -88,12 +93,15 @@ public void init(FMLInitializationEvent evt) { "logs", String.format( "%s,2; %s,6; %s,10", - getUniqueName(NContent.tree), getUniqueName(NContent.tree), getUniqueName(NContent.tree))); + getUniqueName(NContent.tree), + getUniqueName(NContent.tree), + getUniqueName(NContent.tree))); treeDef.setString( "leaves", String.format( "%s,1; %s,9", - getUniqueName(NContent.floraLeavesNoColor), getUniqueName(NContent.floraLeavesNoColor))); + getUniqueName(NContent.floraLeavesNoColor), + getUniqueName(NContent.floraLeavesNoColor))); treeList.appendTag(treeDef); // hopseed treeDef = new NBTTagCompound(); @@ -102,7 +110,9 @@ public void init(FMLInitializationEvent evt) { "logs", String.format( "%s,3; %s,7; %s,11", - getUniqueName(NContent.tree), getUniqueName(NContent.tree), getUniqueName(NContent.tree))); + getUniqueName(NContent.tree), + getUniqueName(NContent.tree), + getUniqueName(NContent.tree))); treeDef.setString( "leaves", String.format("%s,2; %s,10", getUniqueName(NContent.floraLeaves), getUniqueName(NContent.floraLeaves))); @@ -136,12 +146,15 @@ public void init(FMLInitializationEvent evt) { "logs", String.format( "%s,1; %s,5; %s,9", - getUniqueName(NContent.tree), getUniqueName(NContent.tree), getUniqueName(NContent.tree))); + getUniqueName(NContent.tree), + getUniqueName(NContent.tree), + getUniqueName(NContent.tree))); treeDef.setString( "leaves", String.format( "%s,0; %s,8", - getUniqueName(NContent.floraLeavesNoColor), getUniqueName(NContent.floraLeavesNoColor))); + getUniqueName(NContent.floraLeavesNoColor), + getUniqueName(NContent.floraLeavesNoColor))); treeList.appendTag(treeDef); // siverbell treeDef = new NBTTagCompound(); diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/MFRPulse.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/MFRPulse.java index 4b78fa9f..9c47d026 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/MFRPulse.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/MFRPulse.java @@ -1,9 +1,9 @@ package mods.natura.plugins.minefactoryreloaded; -import cpw.mods.fml.common.event.FMLInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.Natura; +import cpw.mods.fml.common.event.FMLInitializationEvent; @Pulse(id = "Natura MFR Compatibility", modsRequired = MFRPulse.modId) public class MFRPulse { diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/MRFRegistering.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/MRFRegistering.java index 6055bf91..acc71e8a 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/MRFRegistering.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/MRFRegistering.java @@ -12,13 +12,16 @@ import mods.natura.plugins.minefactoryreloaded.plantables.PlantableNaturaCrop; import mods.natura.plugins.minefactoryreloaded.plantables.PlantableNaturaNetherBerry; import mods.natura.plugins.minefactoryreloaded.plantables.PlantableStandard; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; + import powercrystals.minefactoryreloaded.api.FactoryRegistry; import powercrystals.minefactoryreloaded.api.HarvestType; public class MRFRegistering { + public static void registerWithMFR() { String registerPlantable = "registerPlantable"; String registerHarvestable = "registerHarvestable"; @@ -30,7 +33,8 @@ public static void registerWithMFR() { FactoryRegistry.sendMessage( registerPlantable, new PlantableNaturaNetherBerry( - Item.getItemFromBlock(NContent.netherBerryBush), NContent.netherBerryBush)); + Item.getItemFromBlock(NContent.netherBerryBush), + NContent.netherBerryBush)); FactoryRegistry.sendMessage( registerHarvestable, new HarvestableNaturaBerry(NContent.netherBerryBush, NContent.netherBerryItem)); @@ -40,7 +44,8 @@ public static void registerWithMFR() { registerPlantable, new PlantableNaturaBerry(Item.getItemFromBlock(NContent.berryBush), NContent.berryBush)); FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableNaturaBerry(NContent.berryBush, NContent.berryItem)); + registerHarvestable, + new HarvestableNaturaBerry(NContent.berryBush, NContent.berryItem)); } // Crops @@ -51,20 +56,22 @@ public static void registerWithMFR() { new PlantableStandard(Item.getItemFromBlock(NContent.floraSapling), NContent.floraSapling)); // misc plants - FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableStandard(NContent.bluebells, HarvestType.Normal)); + FactoryRegistry + .sendMessage(registerHarvestable, new HarvestableStandard(NContent.bluebells, HarvestType.Normal)); // glowshrooms + FactoryRegistry + .sendMessage(registerHarvestable, new HarvestableStandard(NContent.glowshroom, HarvestType.Normal)); + FactoryRegistry + .sendMessage(registerHarvestable, new HarvestableStandard(NContent.glowshroomBlue, HarvestType.Normal)); FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableStandard(NContent.glowshroom, HarvestType.Normal)); + registerHarvestable, + new HarvestableStandard(NContent.glowshroomGreen, HarvestType.Normal)); FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableStandard(NContent.glowshroomBlue, HarvestType.Normal)); - FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableStandard(NContent.glowshroomGreen, HarvestType.Normal)); - FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableStandard(NContent.glowshroomPurple, HarvestType.Normal)); + registerHarvestable, + new HarvestableStandard(NContent.glowshroomPurple, HarvestType.Normal)); // crops - FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableNaturaCropPlant(NContent.crops, NContent.plantItem)); + FactoryRegistry + .sendMessage(registerHarvestable, new HarvestableNaturaCropPlant(NContent.crops, NContent.plantItem)); // trees FactoryRegistry.sendMessage(registerHarvestable, new HarvestableStandard(NContent.tree, HarvestType.Tree)); @@ -72,8 +79,8 @@ public static void registerWithMFR() { FactoryRegistry.sendMessage(registerHarvestable, new HarvestableStandard(NContent.darkTree, HarvestType.Tree)); FactoryRegistry.sendMessage(registerHarvestable, new HarvestableStandard(NContent.redwood, HarvestType.Tree)); FactoryRegistry.sendMessage(registerHarvestable, new HarvestableStandard(NContent.willow, HarvestType.Tree)); - FactoryRegistry.sendMessage( - registerHarvestable, new HarvestableStandard(NContent.bloodwood, HarvestType.TreeFlipped)); + FactoryRegistry + .sendMessage(registerHarvestable, new HarvestableStandard(NContent.bloodwood, HarvestType.TreeFlipped)); // Nether plants FactoryRegistry.sendMessage(registerHarvestable, new HarvestableNaturaTreeLeaves(NContent.thornVines)); // leaves @@ -87,8 +94,8 @@ public static void registerWithMFR() { FactoryRegistry.sendMessage(registerFertilizable, new FertilizableSapling(NContent.rareSapling)); /* - * The sludge boiler takes sludge from harvester machines and boils it to get soil-like items, - * such as dirt, sand, clay, or rarely things like soulsand and mycelium. + * The sludge boiler takes sludge from harvester machines and boils it to get soil-like items, such as dirt, + * sand, clay, or rarely things like soulsand and mycelium. */ NBTTagCompound heatSand = new ItemStack(NContent.heatSand).writeToNBT(new NBTTagCompound()); heatSand.setInteger("value", 5); diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableNaturaCrop.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableNaturaCrop.java index b5827bda..915c41b6 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableNaturaCrop.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableNaturaCrop.java @@ -1,12 +1,15 @@ package mods.natura.plugins.minefactoryreloaded.fertilizables; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.FertilizerType; import powercrystals.minefactoryreloaded.api.IFactoryFertilizable; public class FertilizableNaturaCrop implements IFactoryFertilizable { + private Block _blockId; public FertilizableNaturaCrop(Block blockId) { @@ -20,8 +23,7 @@ public Block getPlant() { @Override public boolean canFertilize(World world, int x, int y, int z, FertilizerType fertilizerType) { - return fertilizerType == FertilizerType.GrowPlant - && world.getBlockMetadata(x, y, z) != 3 + return fertilizerType == FertilizerType.GrowPlant && world.getBlockMetadata(x, y, z) != 3 && world.getBlockMetadata(x, y, z) != 8; } diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableSapling.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableSapling.java index adf9a83e..055cd7a5 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableSapling.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableSapling.java @@ -1,13 +1,16 @@ package mods.natura.plugins.minefactoryreloaded.fertilizables; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.FertilizerType; import powercrystals.minefactoryreloaded.api.IFactoryFertilizable; public class FertilizableSapling implements IFactoryFertilizable { + private Block _blockId; public FertilizableSapling(Block blockId) { diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaBerry.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaBerry.java index f0c5462f..1c1577dd 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaBerry.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaBerry.java @@ -4,14 +4,17 @@ import java.util.List; import java.util.Map; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.HarvestType; import powercrystals.minefactoryreloaded.api.IFactoryHarvestable; public class HarvestableNaturaBerry implements IFactoryHarvestable { + private Block _sourceBlockId; private Item _berryItemId; @@ -41,9 +44,9 @@ public boolean canBeHarvested(World world, Map harvesterSetting } @Override - public List getDrops( - World world, Random rand, Map harvesterSettings, int x, int y, int z) { - ItemStack[] returnItems = {new ItemStack(_berryItemId, 1, world.getBlockMetadata(x, y, z) - 12)}; + public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, + int z) { + ItemStack[] returnItems = { new ItemStack(_berryItemId, 1, world.getBlockMetadata(x, y, z) - 12) }; return Arrays.asList(returnItems); } diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaCropPlant.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaCropPlant.java index 18abd340..c0c09da6 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaCropPlant.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaCropPlant.java @@ -4,14 +4,17 @@ import java.util.List; import java.util.Map; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.HarvestType; import powercrystals.minefactoryreloaded.api.IFactoryHarvestable; public class HarvestableNaturaCropPlant implements IFactoryHarvestable { + private Block _sourceId; private Item _cottonItemId; @@ -41,10 +44,10 @@ public boolean canBeHarvested(World world, Map harvesterSetting } @Override - public List getDrops( - World world, Random rand, Map harvesterSettings, int x, int y, int z) { + public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, + int z) { if (world.getBlockMetadata(x, y, z) == 8) { - ItemStack[] returnItems = {new ItemStack(_cottonItemId, 1, 3)}; + ItemStack[] returnItems = { new ItemStack(_cottonItemId, 1, 3) }; return Arrays.asList(returnItems); } else { return _sourceId.getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0); diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaTreeLeaves.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaTreeLeaves.java index 8c7f5410..33d65ce9 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaTreeLeaves.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaTreeLeaves.java @@ -1,23 +1,27 @@ package mods.natura.plugins.minefactoryreloaded.harvestables; -import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.HarvestType; +import com.google.common.collect.Lists; + public class HarvestableNaturaTreeLeaves extends HarvestableStandard { + public HarvestableNaturaTreeLeaves(Block id) { super(id, HarvestType.TreeLeaf); } @Override - public List getDrops( - World world, Random rand, Map harvesterSettings, int x, int y, int z) { + public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, + int z) { if (harvesterSettings.get("silkTouch") != null && harvesterSettings.get("silkTouch")) { ArrayList drops = Lists.newArrayList(); drops.add(new ItemStack(getPlant(), 1, world.getBlockMetadata(x, y, z))); diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableStandard.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableStandard.java index 884f071d..e170c90e 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableStandard.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableStandard.java @@ -3,13 +3,16 @@ import java.util.List; import java.util.Map; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import powercrystals.minefactoryreloaded.api.HarvestType; import powercrystals.minefactoryreloaded.api.IFactoryHarvestable; public class HarvestableStandard implements IFactoryHarvestable { + private Block sourceId; private HarvestType harvestType; @@ -39,8 +42,8 @@ public boolean canBeHarvested(World world, Map harvesterSetting } @Override - public List getDrops( - World world, Random rand, Map harvesterSettings, int x, int y, int z) { + public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, + int z) { return sourceId.getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0); } diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaBerry.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaBerry.java index 654af014..4961ec1d 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaBerry.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaBerry.java @@ -1,6 +1,7 @@ package mods.natura.plugins.minefactoryreloaded.plantables; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaCrop.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaCrop.java index 53c7d053..2cf01380 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaCrop.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaCrop.java @@ -21,13 +21,16 @@ public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack stac if (!world.isAirBlock(x, y, z)) { return false; } - return (groundId == Blocks.dirt - || groundId == Blocks.grass + return (groundId == Blocks.dirt || groundId == Blocks.grass || groundId == Blocks.farmland - || (_plantedBlockId instanceof IPlantable - && groundId != null + || (_plantedBlockId instanceof IPlantable && groundId != null && groundId.canSustainPlant( - world, x, y, z, ForgeDirection.UP, ((IPlantable) _plantedBlockId)))); + world, + x, + y, + z, + ForgeDirection.UP, + ((IPlantable) _plantedBlockId)))); } return false; } diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaNetherBerry.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaNetherBerry.java index fe2144b2..67cb2ded 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaNetherBerry.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaNetherBerry.java @@ -1,6 +1,7 @@ package mods.natura.plugins.minefactoryreloaded.plantables; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -20,8 +21,8 @@ public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack stac Block groundBlock = world.getBlock(x, y - 1, z); return (groundBlock != null - && (groundBlock.canSustainPlant( - world, x, y - 1, z, ForgeDirection.UP, (IPlantable) NContent.netherBerryBush) + && (groundBlock + .canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (IPlantable) NContent.netherBerryBush) || groundBlock == Blocks.netherrack) && world.isAirBlock(x, y, z)); } diff --git a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableStandard.java b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableStandard.java index 9a42ca46..9707672a 100644 --- a/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableStandard.java +++ b/src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableStandard.java @@ -7,15 +7,17 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; + import powercrystals.minefactoryreloaded.api.IFactoryPlantable; import powercrystals.minefactoryreloaded.api.ReplacementBlock; /* - * Used for directly placing blocks (ie saplings) and items (ie sugarcane). Pass in source ID to constructor, - * so one instance per source ID. + * Used for directly placing blocks (ie saplings) and items (ie sugarcane). Pass in source ID to constructor, so one + * instance per source ID. */ public class PlantableStandard implements IFactoryPlantable { + protected Item _sourceId; protected Block _plantedBlockId; @@ -35,8 +37,7 @@ public boolean canBePlantedHere(World world, int x, int y, int z, ItemStack stac return false; } return (_plantedBlockId.canPlaceBlockAt(world, x, y, z) && _plantedBlockId.canBlockStay(world, x, y, z)) - || (_plantedBlockId instanceof IPlantable - && groundId != null + || (_plantedBlockId instanceof IPlantable && groundId != null && groundId.canSustainPlant(world, x, y, z, ForgeDirection.UP, ((IPlantable) _plantedBlockId))); } diff --git a/src/main/java/mods/natura/plugins/nei/NEIPulse.java b/src/main/java/mods/natura/plugins/nei/NEIPulse.java index 515451d0..0bf1160b 100644 --- a/src/main/java/mods/natura/plugins/nei/NEIPulse.java +++ b/src/main/java/mods/natura/plugins/nei/NEIPulse.java @@ -1,13 +1,14 @@ package mods.natura.plugins.nei; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.Natura; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; @Pulse(id = "Natura NEI Compatibility", modsRequired = NEIPulse.modId) public class NEIPulse { + public static final String modId = "NotEnoughItems"; @Handler diff --git a/src/main/java/mods/natura/plugins/nei/NotEnoughItems.java b/src/main/java/mods/natura/plugins/nei/NotEnoughItems.java index ea2d236a..be2aacc7 100644 --- a/src/main/java/mods/natura/plugins/nei/NotEnoughItems.java +++ b/src/main/java/mods/natura/plugins/nei/NotEnoughItems.java @@ -1,14 +1,16 @@ package mods.natura.plugins.nei; -import codechicken.nei.api.API; -import codechicken.nei.recipe.DefaultOverlayHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import mods.natura.common.NContent; import mods.natura.common.PHNatura; import mods.natura.gui.WorkbenchGui; + import net.minecraft.item.ItemStack; +import codechicken.nei.api.API; +import codechicken.nei.recipe.DefaultOverlayHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; + public class NotEnoughItems { public static void registerNEICompat() { diff --git a/src/main/java/mods/natura/plugins/te4/TE4Pulse.java b/src/main/java/mods/natura/plugins/te4/TE4Pulse.java index f9fb8ba1..d4b89dc8 100644 --- a/src/main/java/mods/natura/plugins/te4/TE4Pulse.java +++ b/src/main/java/mods/natura/plugins/te4/TE4Pulse.java @@ -1,23 +1,27 @@ package mods.natura.plugins.te4; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.Arrays; import java.util.List; + import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.blocks.trees.Planks; import mods.natura.common.NContent; import mods.natura.common.PHNatura; import mods.natura.items.blocks.NDoorItem; + import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.GameRegistry; + @Pulse(id = "Natura TE4 Compatibility", modsRequired = TE4Pulse.modId) public class TE4Pulse { + private List list; public static final String modId = "ThermalExpansion"; @@ -26,8 +30,8 @@ public int findPlankForName(String name) { return list.indexOf(name); } - public void createSawmillRecipe( - int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int chance) { + public void createSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, + int chance) { NBTTagCompound toSend = new NBTTagCompound(); toSend.setInteger("energy", energy); toSend.setTag("input", new NBTTagCompound()); @@ -87,7 +91,9 @@ public void init(FMLInitializationEvent evt) { int plankMeta = findPlankForName(doorNames[i]); if (plankMeta >= 0) { createSawmillRecipe( - 2400, new ItemStack(NContent.doorItem, 1, i), new ItemStack(NContent.planks, 6, plankMeta)); + 2400, + new ItemStack(NContent.doorItem, 1, i), + new ItemStack(NContent.planks, 6, plankMeta)); } } } diff --git a/src/main/java/mods/natura/plugins/thaumcraft/ThaumcraftPulse.java b/src/main/java/mods/natura/plugins/thaumcraft/ThaumcraftPulse.java index ef1ce177..213c1e83 100644 --- a/src/main/java/mods/natura/plugins/thaumcraft/ThaumcraftPulse.java +++ b/src/main/java/mods/natura/plugins/thaumcraft/ThaumcraftPulse.java @@ -1,43 +1,46 @@ package mods.natura.plugins.thaumcraft; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.item.ItemStack; + import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; @Pulse(id = "Natura Thaumcraft Compatibility", modsRequired = ThaumcraftPulse.modId) public class ThaumcraftPulse { + public static final String modId = "Thaumcraft"; @Handler public void init(FMLInitializationEvent evt) { if (PHNatura.enableBerryBushes) { - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 12)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 13)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 14)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 15)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 12)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 13)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 14)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.berryBush, 1, 15)); } if (PHNatura.enableNetherBerryBushes) { - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 12)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 13)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 14)); - FMLInterModComms.sendMessage( - "Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 15)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 12)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 13)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 14)); + FMLInterModComms + .sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.netherBerryBush, 1, 15)); } FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(NContent.crops, 1, 8)); FMLInterModComms.sendMessage("Thaumcraft", "harvestStandardCrop", new ItemStack(NContent.crops, 1, 3)); @@ -59,8 +62,8 @@ public void postInit(FMLPostInitializationEvent evt) { ThaumcraftApi.registerObjectTag( new ItemStack(NContent.plantItem, 0, 0), new AspectList().add(Aspect.LIFE, 2).add(Aspect.CROP, 2)); - ThaumcraftApi.registerObjectTag( - new ItemStack(NContent.plantItem, 0, 3), new AspectList().add(Aspect.CLOTH, 1)); + ThaumcraftApi + .registerObjectTag(new ItemStack(NContent.plantItem, 0, 3), new AspectList().add(Aspect.CLOTH, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.plantItem, 0, 4), new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.FIRE, 1)); @@ -69,19 +72,11 @@ public void postInit(FMLPostInitializationEvent evt) { new AspectList().add(Aspect.AIR, 1).add(Aspect.FLIGHT, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.plantItem, 0, 6), - new AspectList() - .add(Aspect.BEAST, 1) - .add(Aspect.FLESH, 1) - .add(Aspect.CLOTH, 1) - .add(Aspect.ARMOR, 1) + new AspectList().add(Aspect.BEAST, 1).add(Aspect.FLESH, 1).add(Aspect.CLOTH, 1).add(Aspect.ARMOR, 1) .add(Aspect.FIRE, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.plantItem, 0, 7), - new AspectList() - .add(Aspect.BEAST, 1) - .add(Aspect.CLOTH, 1) - .add(Aspect.TRAP, 1) - .add(Aspect.FIRE, 1)); + new AspectList().add(Aspect.BEAST, 1).add(Aspect.CLOTH, 1).add(Aspect.TRAP, 1).add(Aspect.FIRE, 1)); // Register wood AspectList logTags = new AspectList(); @@ -172,14 +167,12 @@ public void postInit(FMLPostInitializationEvent evt) { // Register cactus stuff ThaumcraftApi.registerObjectTag( new ItemStack(NContent.saguaro, 0, 0), - new AspectList() - .add(Aspect.WATER, 1) - .add(Aspect.PLANT, 2) - .add(Aspect.WEAPON, 1) + new AspectList().add(Aspect.WATER, 1).add(Aspect.PLANT, 2).add(Aspect.WEAPON, 1) .add(Aspect.TREE, 2)); if (PHNatura.enableCactusJuice) { ThaumcraftApi.registerObjectTag( - new ItemStack(NContent.waterDrop, 0, 0), new AspectList().add(Aspect.WATER, 1)); + new ItemStack(NContent.waterDrop, 0, 0), + new AspectList().add(Aspect.WATER, 1)); } ThaumcraftApi.registerObjectTag( new ItemStack(NContent.seedFood, 0, 0), @@ -188,10 +181,7 @@ public void postInit(FMLPostInitializationEvent evt) { // Register overworld clouds ThaumcraftApi.registerObjectTag( new ItemStack(NContent.cloud, 0, 0), - new AspectList() - .add(Aspect.AIR, 1) - .add(Aspect.FLIGHT, 1) - .add(Aspect.WATER, 1) + new AspectList().add(Aspect.AIR, 1).add(Aspect.FLIGHT, 1).add(Aspect.WATER, 1) .add(Aspect.WEATHER, 1)); // Register Nether saplings @@ -213,7 +203,8 @@ public void postInit(FMLPostInitializationEvent evt) { new ItemStack(NContent.heatSand, 0, 0), new AspectList().add(Aspect.FIRE, 2).add(Aspect.EARTH, 1)); ThaumcraftApi.registerObjectTag( - new ItemStack(NContent.taintedSoil, 0, 0), new AspectList().add(Aspect.EARTH, 2)); + new ItemStack(NContent.taintedSoil, 0, 0), + new AspectList().add(Aspect.EARTH, 2)); // Register Nether trees and leaves ThaumcraftApi.registerObjectTag( @@ -223,8 +214,8 @@ public void postInit(FMLPostInitializationEvent evt) { ThaumcraftApi.registerObjectTag( new ItemStack(NContent.planks, 0, 4), new AspectList().add(Aspect.TREE, 1).add(Aspect.METAL, 1)); - ThaumcraftApi.registerObjectTag( - new ItemStack(NContent.darkTree, 0, 0), new AspectList().add(Aspect.TREE, 4)); + ThaumcraftApi + .registerObjectTag(new ItemStack(NContent.darkTree, 0, 0), new AspectList().add(Aspect.TREE, 4)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.darkTree, 0, 1), new AspectList().add(Aspect.TREE, 4).add(Aspect.ENTROPY, 2)); @@ -252,75 +243,45 @@ public void postInit(FMLPostInitializationEvent evt) { if (PHNatura.enableNetherBerryBushes) { ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryBush, 0, 0), - new AspectList() - .add(Aspect.ENTROPY, 4) - .add(Aspect.POISON, 4) - .add(Aspect.PLANT, 1)); + new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.POISON, 4).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryBush, 0, 1), - new AspectList() - .add(Aspect.ENTROPY, 4) - .add(Aspect.DARKNESS, 4) - .add(Aspect.PLANT, 1)); + new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.DARKNESS, 4).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryBush, 0, 2), - new AspectList() - .add(Aspect.ENTROPY, 4) - .add(Aspect.FLIGHT, 4) - .add(Aspect.PLANT, 1)); + new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.FLIGHT, 4).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryBush, 0, 3), new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryItem, 0, 0), - new AspectList() - .add(Aspect.ENTROPY, 4) - .add(Aspect.POISON, 4) - .add(Aspect.LIFE, 1) + new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.POISON, 4).add(Aspect.LIFE, 1) .add(Aspect.CROP, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryItem, 0, 1), - new AspectList() - .add(Aspect.ENTROPY, 4) - .add(Aspect.DARKNESS, 4) - .add(Aspect.LIFE, 1) + new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.DARKNESS, 4).add(Aspect.LIFE, 1) .add(Aspect.CROP, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryItem, 0, 2), - new AspectList() - .add(Aspect.ENTROPY, 4) - .add(Aspect.FLIGHT, 4) - .add(Aspect.LIFE, 1) + new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.FLIGHT, 4).add(Aspect.LIFE, 1) .add(Aspect.CROP, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.netherBerryItem, 0, 3), - new AspectList() - .add(Aspect.ENTROPY, 8) - .add(Aspect.LIFE, 1) - .add(Aspect.CROP, 1)); + new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.LIFE, 1).add(Aspect.CROP, 1)); } // Register Nether and End clouds ThaumcraftApi.registerObjectTag( new ItemStack(NContent.cloud, 0, 2), - new AspectList() - .add(Aspect.AIR, 1) - .add(Aspect.FLIGHT, 1) - .add(Aspect.FIRE, 1) + new AspectList().add(Aspect.AIR, 1).add(Aspect.FLIGHT, 1).add(Aspect.FIRE, 1) .add(Aspect.WEATHER, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.cloud, 0, 3), - new AspectList() - .add(Aspect.AIR, 1) - .add(Aspect.FLIGHT, 1) - .add(Aspect.POISON, 1) + new AspectList().add(Aspect.AIR, 1).add(Aspect.FLIGHT, 1).add(Aspect.POISON, 1) .add(Aspect.WEATHER, 1)); ThaumcraftApi.registerObjectTag( new ItemStack(NContent.cloud, 0, 1), - new AspectList() - .add(Aspect.AIR, 1) - .add(Aspect.FLIGHT, 1) - .add(Aspect.ELDRITCH, 1) + new AspectList().add(Aspect.AIR, 1).add(Aspect.FLIGHT, 1).add(Aspect.ELDRITCH, 1) .add(Aspect.WEATHER, 1)); // Register other Nether items/plants diff --git a/src/main/java/mods/natura/plugins/waila/NaturaCropDataProvider.java b/src/main/java/mods/natura/plugins/waila/NaturaCropDataProvider.java index 3f8f93ee..00566072 100644 --- a/src/main/java/mods/natura/plugins/waila/NaturaCropDataProvider.java +++ b/src/main/java/mods/natura/plugins/waila/NaturaCropDataProvider.java @@ -1,10 +1,12 @@ package mods.natura.plugins.waila; import java.util.List; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mods.natura.blocks.crops.CropBlock; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -28,14 +30,14 @@ public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler } @Override - public List getWailaHead( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public List getWailaBody( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { if (config.getConfig("general.showcrop")) { Block block = accessor.getBlock(); @@ -60,14 +62,14 @@ public List getWailaBody( } @Override - public List getWailaTail( - ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { return currenttip; } @Override - public NBTTagCompound getNBTData( - EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { return tag; } } diff --git a/src/main/java/mods/natura/plugins/waila/WailaPulse.java b/src/main/java/mods/natura/plugins/waila/WailaPulse.java index 8d655014..be6b3e5c 100644 --- a/src/main/java/mods/natura/plugins/waila/WailaPulse.java +++ b/src/main/java/mods/natura/plugins/waila/WailaPulse.java @@ -1,10 +1,10 @@ package mods.natura.plugins.waila; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import mods.natura.Natura; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; @Pulse(id = "Natura Waila Compatibility", modsRequired = WailaPulse.modId) public class WailaPulse { diff --git a/src/main/java/mods/natura/util/DispenserBehaviorSpawnEgg.java b/src/main/java/mods/natura/util/DispenserBehaviorSpawnEgg.java index bfa515a4..9ecb0257 100644 --- a/src/main/java/mods/natura/util/DispenserBehaviorSpawnEgg.java +++ b/src/main/java/mods/natura/util/DispenserBehaviorSpawnEgg.java @@ -1,6 +1,7 @@ package mods.natura.util; import mods.natura.items.SpawnEgg; + import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; @@ -9,6 +10,7 @@ import net.minecraft.util.EnumFacing; public class DispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem { + /** * Dispense the specified stack, play the dispense sound and spawn particles. */ diff --git a/src/main/java/mods/natura/util/ICrop.java b/src/main/java/mods/natura/util/ICrop.java index f0094e8c..d9156295 100644 --- a/src/main/java/mods/natura/util/ICrop.java +++ b/src/main/java/mods/natura/util/ICrop.java @@ -2,10 +2,12 @@ import java.util.Collections; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; public interface ICrop { + public enum HarvestType { BREAK, USE, diff --git a/src/main/java/mods/natura/worldgen/BaseCloudWorldgen.java b/src/main/java/mods/natura/worldgen/BaseCloudWorldgen.java index 3fcc6629..734c0537 100644 --- a/src/main/java/mods/natura/worldgen/BaseCloudWorldgen.java +++ b/src/main/java/mods/natura/worldgen/BaseCloudWorldgen.java @@ -1,18 +1,19 @@ package mods.natura.worldgen; -import cpw.mods.fml.common.IWorldGenerator; import java.util.Random; + import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; -/* Generates clouds in every dimension - * Current clouds: Normal, Dark, Sulfur, Ash - * Overworld: Normal - * Nether: Sulfur, Ash +import cpw.mods.fml.common.IWorldGenerator; + +/* + * Generates clouds in every dimension Current clouds: Normal, Dark, Sulfur, Ash Overworld: Normal Nether: Sulfur, Ash * End: Normal, Dark */ @@ -59,12 +60,7 @@ public BaseCloudWorldgen() { } @Override - public void generate( - Random random, - int chunkX, - int chunkZ, - World world, - IChunkProvider chunkGenerator, + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { int dimSettings = Natura.getDimensionWorldgenOverrides(world.provider.dimensionId); if ((dimSettings & Natura.DIM_WORLDGEN_CLOUD_BIT) == 0) { @@ -75,8 +71,7 @@ public void generate( int xChunk = chunkX * 16 + 8, zChunk = chunkZ * 16 + 8; BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(xChunk + 16, zChunk + 16); - if (PHNatura.generateOverworldClouds - && biome.rainfall > 0.15f + if (PHNatura.generateOverworldClouds && biome.rainfall > 0.15f && random.nextInt(PHNatura.cloudSpawnRarity) == 0 && world.provider.dimensionId != 1 && shouldGenerateInDim(world.provider.dimensionId)) { @@ -96,8 +91,7 @@ && shouldGenerateInDim(world.provider.dimensionId)) { } // End Generation - if (PHNatura.generateDarkClouds - && biome == BiomeGenBase.sky + if (PHNatura.generateDarkClouds && biome == BiomeGenBase.sky && world.provider.dimensionId == 1 && random.nextInt(4) == 0 && shouldGenerateDarkInDim(world.provider.dimensionId)) { @@ -136,8 +130,7 @@ && shouldGenerateDarkInDim(world.provider.dimensionId)) { } } - if (PHNatura.generateSulfurClouds - && random.nextInt(PHNatura.sulfurSpawnRarity) == 0 + if (PHNatura.generateSulfurClouds && random.nextInt(PHNatura.sulfurSpawnRarity) == 0 && shouldGenerateSulfurInDim(world.provider.dimensionId)) { xCh = xChunk + random.nextInt(16); yCh = random.nextInt(PHNatura.sulfurSpawnRange) + PHNatura.sulfurSpawnHeight; diff --git a/src/main/java/mods/natura/worldgen/BaseCropWorldgen.java b/src/main/java/mods/natura/worldgen/BaseCropWorldgen.java index db50f52a..29d8ea5c 100644 --- a/src/main/java/mods/natura/worldgen/BaseCropWorldgen.java +++ b/src/main/java/mods/natura/worldgen/BaseCropWorldgen.java @@ -1,17 +1,20 @@ package mods.natura.worldgen; -import cpw.mods.fml.common.IWorldGenerator; import java.util.Random; + import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; -/* Adds crops to the overworld - * Current crops: Barley, Berry bushes +import cpw.mods.fml.common.IWorldGenerator; + +/* + * Adds crops to the overworld Current crops: Barley, Berry bushes */ public class BaseCropWorldgen implements IWorldGenerator { @@ -33,12 +36,7 @@ public BaseCropWorldgen() { } @Override - public void generate( - Random random, - int chunkX, - int chunkZ, - World world, - IChunkProvider chunkGenerator, + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { int dimSettings = Natura.getDimensionWorldgenOverrides(world.provider.dimensionId); if ((dimSettings & Natura.DIM_WORLDGEN_CROP_BIT) == 0) { @@ -69,8 +67,7 @@ public void generate( } // Berry bushes - if (PHNatura.generateRaspberries - && random.nextInt(PHNatura.raspSpawnRarity) == 0 + if (PHNatura.generateRaspberries && random.nextInt(PHNatura.raspSpawnRarity) == 0 && goodClimate(biome, 0.6f, 2.0f, 0.2f, 0.93f)) { xCh = xChunk + random.nextInt(16); yCh = random.nextInt(PHNatura.raspSpawnRange) + PHNatura.seaLevel; @@ -78,8 +75,7 @@ && goodClimate(biome, 0.6f, 2.0f, 0.2f, 0.93f)) { raspgen.generate(world, random, xCh, yCh, zCh); } - if (PHNatura.generateBlueberries - && random.nextInt(PHNatura.blueSpawnRarity) == 0 + if (PHNatura.generateBlueberries && random.nextInt(PHNatura.blueSpawnRarity) == 0 && goodClimate(biome, 0.3f, 0.81f, 0.3f, 0.8f)) { xCh = xChunk + random.nextInt(16); yCh = random.nextInt(PHNatura.blueSpawnRange) + PHNatura.seaLevel; @@ -87,8 +83,7 @@ && goodClimate(biome, 0.3f, 0.81f, 0.3f, 0.8f)) { bluegen.generate(world, random, xCh, yCh, zCh); } - if (PHNatura.generateBlackberries - && random.nextInt(PHNatura.blackSpawnRarity) == 0 + if (PHNatura.generateBlackberries && random.nextInt(PHNatura.blackSpawnRarity) == 0 && goodClimate(biome, 0.5f, 5.0f, 0.6f, 3.0f)) { xCh = xChunk + random.nextInt(16); yCh = random.nextInt(PHNatura.blackSpawnRange) + PHNatura.seaLevel; @@ -96,8 +91,7 @@ && goodClimate(biome, 0.5f, 5.0f, 0.6f, 3.0f)) { blackgen.generate(world, random, xCh, yCh, zCh); } - if (PHNatura.generateBlackberries - && random.nextInt(PHNatura.blackSpawnRarity / 3) == 0 + if (PHNatura.generateBlackberries && random.nextInt(PHNatura.blackSpawnRarity / 3) == 0 && biome == BiomeGenBase.swampland) { xCh = xChunk + random.nextInt(16); yCh = random.nextInt(PHNatura.blackSpawnRange) + PHNatura.seaLevel; @@ -105,8 +99,7 @@ && goodClimate(biome, 0.5f, 5.0f, 0.6f, 3.0f)) { blackgen.generate(world, random, xCh, yCh, zCh); } - if (PHNatura.generateMaloberries - && random.nextInt(PHNatura.geoSpawnRarity) == 0 + if (PHNatura.generateMaloberries && random.nextInt(PHNatura.geoSpawnRarity) == 0 && goodClimate(biome, 0.0f, 0.3f, 0.0f, 5.0f)) { xCh = xChunk + random.nextInt(16); yCh = random.nextInt(PHNatura.geoSpawnRange) + PHNatura.seaLevel; diff --git a/src/main/java/mods/natura/worldgen/BaseTreeWorldgen.java b/src/main/java/mods/natura/worldgen/BaseTreeWorldgen.java index 99ba016d..cb43e688 100644 --- a/src/main/java/mods/natura/worldgen/BaseTreeWorldgen.java +++ b/src/main/java/mods/natura/worldgen/BaseTreeWorldgen.java @@ -1,16 +1,19 @@ package mods.natura.worldgen; -import cpw.mods.fml.common.IWorldGenerator; import java.util.Random; + import mods.natura.Natura; import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenerator; +import cpw.mods.fml.common.IWorldGenerator; + public class BaseTreeWorldgen implements IWorldGenerator { public BaseTreeWorldgen() { @@ -57,12 +60,7 @@ public BaseTreeWorldgen() { public static boolean retrogen; @Override - public void generate( - Random random, - int chunkX, - int chunkZ, - World world, - IChunkProvider chunkGenerator, + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { int dimSettings = Natura.getDimensionWorldgenOverrides(world.provider.dimensionId); if ((dimSettings & Natura.DIM_WORLDGEN_TREE_BIT) == 0) { @@ -76,8 +74,7 @@ public void generate( return; } - if (biomeName == "Forest" - || biomeName == "AutumnWoods" + if (biomeName == "Forest" || biomeName == "AutumnWoods" || biomeName == "BirchForest" || biomeName == "PineForest" || biomeName == "Rainforest" @@ -112,8 +109,7 @@ public void generate( eucalyptusShort.generate(world, random, xSpawn, ySpawn, zSpawn); } } - if (biomeName == "Extreme Hills" - || biomeName == "Extreme Hills Edge" + if (biomeName == "Extreme Hills" || biomeName == "Extreme Hills Edge" || biomeName == "ForestedHills" || biomeName == "GreenHills") { if (PHNatura.generateBush && random.nextInt(PHNatura.bushSpawnRarity) == 0) { @@ -193,8 +189,7 @@ public void generate( } // Nether trees - if (biomeName.equals("Hell") - || biomeName.equals("Boneyard") + if (biomeName.equals("Hell") || biomeName.equals("Boneyard") || biomeName.equals("Phantasmagoric Inferno") || biomeName.equals("Corrupted Sands")) { if (PHNatura.generateBloodwood && random.nextInt(PHNatura.bloodSpawnRarity) == 0) { @@ -258,8 +253,7 @@ int findGround(World world, int x, int y, int z) { do { height--; Block underID = world.getBlock(x, height, z); - if (underID == Blocks.netherrack - || underID == Blocks.soul_sand + if (underID == Blocks.netherrack || underID == Blocks.soul_sand || underID == NContent.taintedSoil || height < 0) { foundGround = true; diff --git a/src/main/java/mods/natura/worldgen/BerryBushGen.java b/src/main/java/mods/natura/worldgen/BerryBushGen.java index 7844dda5..140f50ac 100644 --- a/src/main/java/mods/natura/worldgen/BerryBushGen.java +++ b/src/main/java/mods/natura/worldgen/BerryBushGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/mods/natura/worldgen/BloodTreeLargeGen.java b/src/main/java/mods/natura/worldgen/BloodTreeLargeGen.java index a2cfd5f6..172d3d05 100644 --- a/src/main/java/mods/natura/worldgen/BloodTreeLargeGen.java +++ b/src/main/java/mods/natura/worldgen/BloodTreeLargeGen.java @@ -1,13 +1,16 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class BloodTreeLargeGen extends WorldGenerator { + private int mdWood; private int mdLeaves; @@ -28,10 +31,8 @@ int findCeiling(World world, int x, int y, int z) { int height = y; do { Block blockAtHeight = world.getBlock(x, height, z); - if ((blockAtHeight == Blocks.netherrack - || blockAtHeight == Blocks.soul_sand - || blockAtHeight == NContent.taintedSoil) - && !world.getBlock(x, height - 1, z).func_149730_j()) { + if ((blockAtHeight == Blocks.netherrack || blockAtHeight == Blocks.soul_sand + || blockAtHeight == NContent.taintedSoil) && !world.getBlock(x, height - 1, z).func_149730_j()) { ret = height - 1; break; } @@ -43,25 +44,13 @@ int findCeiling(World world, int x, int y, int z) { public boolean generateRandomTree(World world, Random random, int x, int y, int z) { int treeHeight = random.nextInt(8) + 8; - /*boolean valid = true; - for (int yPos = 0; yPos < treeHeight+2; yPos++) { - int range = 1; - - if (yPos == 0) - range = 0; - else if (yPos >= treeHeight -2) - range = 3; - - for (int xPos = 0-range; xPos < 2+range; xPos++) { - for (int zPos = 0-range; zPos < 2+range; zPos++) { - Block block = Block.blocksList[world.getBlockId(x + xPos, y - yPos, z + zPos)]; - if (block == null || block.isLeaves(world, x + xPos, y - yPos, z + zPos)) - valid = false; - } - } - if (!valid) - return false; - }*/ + /* + * boolean valid = true; for (int yPos = 0; yPos < treeHeight+2; yPos++) { int range = 1; if (yPos == 0) range = + * 0; else if (yPos >= treeHeight -2) range = 3; for (int xPos = 0-range; xPos < 2+range; xPos++) { for (int + * zPos = 0-range; zPos < 2+range; zPos++) { Block block = Block.blocksList[world.getBlockId(x + xPos, y - yPos, + * z + zPos)]; if (block == null || block.isLeaves(world, x + xPos, y - yPos, z + zPos)) valid = false; } } if + * (!valid) return false; } + */ for (int heightIter = 0; heightIter < treeHeight; heightIter++) { Block localID = world.getBlock(x, y - heightIter, z); diff --git a/src/main/java/mods/natura/worldgen/BushTreeGen.java b/src/main/java/mods/natura/worldgen/BushTreeGen.java index 5ba8f0e1..10cc4cf7 100644 --- a/src/main/java/mods/natura/worldgen/BushTreeGen.java +++ b/src/main/java/mods/natura/worldgen/BushTreeGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -150,7 +152,12 @@ private void growLeaves(World world, int par2, int par3, int par4, int par5, Ran || var12 * var12 + var14 * var14 <= (var10 - 1) * (var10 - 1)) && (block.canBeReplacedByLeaves(world, var11, var8, var13))) { this.setBlockAndNotifyAdequately( - world, var11, var8, var13, NContent.floraLeaves, this.leavesMetadata); + world, + var11, + var8, + var13, + NContent.floraLeaves, + this.leavesMetadata); } } } diff --git a/src/main/java/mods/natura/worldgen/CloudGen.java b/src/main/java/mods/natura/worldgen/CloudGen.java index eab3c7f8..48432cc7 100644 --- a/src/main/java/mods/natura/worldgen/CloudGen.java +++ b/src/main/java/mods/natura/worldgen/CloudGen.java @@ -1,12 +1,14 @@ package mods.natura.worldgen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class CloudGen extends WorldGenerator { + private Block cloudBlock; private int cloudMeta; private int numberOfBlocks; diff --git a/src/main/java/mods/natura/worldgen/DarkwoodGen.java b/src/main/java/mods/natura/worldgen/DarkwoodGen.java index f27a062c..5503ccc9 100644 --- a/src/main/java/mods/natura/worldgen/DarkwoodGen.java +++ b/src/main/java/mods/natura/worldgen/DarkwoodGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.blocks.trees.NSaplingBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -10,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class DarkwoodGen extends WorldGenerator { + /** The minimum height of a generated tree. */ private final int minTreeHeight; @@ -35,8 +38,7 @@ int findGround(World world, int x, int y, int z) { do { height--; Block blockBelow = world.getBlock(x, height, z); - if (blockBelow == Blocks.netherrack - || blockBelow == Blocks.soul_sand + if (blockBelow == Blocks.netherrack || blockBelow == Blocks.soul_sand || blockBelow == NContent.taintedSoil || height < 0) { foundGround = true; @@ -79,8 +81,7 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos Block block = world.getBlock(l1, i1, j1); - if (block != Blocks.air - && !block.isLeaves(world, l1, i1, j1) + if (block != Blocks.air && !block.isLeaves(world, l1, i1, j1) && block != Blocks.netherrack && block != Blocks.soul_sand && block != NContent.taintedSoil @@ -99,8 +100,12 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos } else { Block soil = world.getBlock(xPos, yPos - 1, zPos); boolean isSoil = (soil.canSustainPlant( - world, xPos, yPos - 1, zPos, ForgeDirection.UP, (NSaplingBlock) NContent.floraSapling)) - || soil == Blocks.netherrack; + world, + xPos, + yPos - 1, + zPos, + ForgeDirection.UP, + (NSaplingBlock) NContent.floraSapling)) || soil == Blocks.netherrack; if (isSoil && yPos < 256 - treeHeight - 1) { soil.onPlantGrow(world, xPos, yPos - 1, zPos, xPos, yPos, zPos); @@ -140,11 +145,15 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos for (j1 = 0; j1 < treeHeight; ++j1) { Block block = world.getBlock(xPos, yPos + j1, zPos); - if (block == Blocks.air - || block.isLeaves(world, xPos, yPos + j1, zPos) + if (block == Blocks.air || block.isLeaves(world, xPos, yPos + j1, zPos) || block.canBeReplacedByLeaves(world, xPos, yPos + j1, zPos)) { this.setBlockAndNotifyAdequately( - world, xPos, yPos + j1, zPos, NContent.darkTree, this.metaWood); + world, + xPos, + yPos + j1, + zPos, + NContent.darkTree, + this.metaWood); } } diff --git a/src/main/java/mods/natura/worldgen/EucalyptusTreeGenShort.java b/src/main/java/mods/natura/worldgen/EucalyptusTreeGenShort.java index d8b5d790..b03a19ff 100644 --- a/src/main/java/mods/natura/worldgen/EucalyptusTreeGenShort.java +++ b/src/main/java/mods/natura/worldgen/EucalyptusTreeGenShort.java @@ -1,13 +1,16 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class EucalyptusTreeGenShort extends WorldGenerator { + private int mdWood; private int mdLeaves; @@ -33,8 +36,7 @@ int findGround(World world, int x, int y, int z) { break; } Block j1 = world.getBlock(x, k1, z); - if ((j1 == Blocks.grass || j1 == Blocks.dirt) - && !world.getBlock(x, k1 + 1, z).func_149730_j()) { + if ((j1 == Blocks.grass || j1 == Blocks.dirt) && !world.getBlock(x, k1 + 1, z).func_149730_j()) { l = k1 + 1; break; } @@ -57,8 +59,7 @@ public boolean generateRandomTree(World world, Random random, int posX, int posY if (i1 >= (posY + 1 + height) - 2) { byte0 = 2; } - label0: - for (int l1 = posX - byte0; l1 <= posX + byte0 && flag; l1++) { + label0: for (int l1 = posX - byte0; l1 <= posX + byte0 && flag; l1++) { int j2 = posZ - byte0; do { if (j2 > posZ + byte0 || !flag) { @@ -95,8 +96,7 @@ public boolean generateRandomTree(World world, Random random, int posX, int posY } for (int k1 = 0; k1 < height; k1++) { Block block = world.getBlock(posX, posY + k1, posZ); - if (block == Blocks.air - || block.isLeaves(world, posX, posX + k1, posZ) + if (block == Blocks.air || block.isLeaves(world, posX, posX + k1, posZ) || block.canBeReplacedByLeaves(world, posX, posX + k1, posZ) || block == NContent.floraSapling) { this.setBlockAndNotifyAdequately(world, posX, posY + k1, posZ, NContent.tree, mdWood); diff --git a/src/main/java/mods/natura/worldgen/FlowerGen.java b/src/main/java/mods/natura/worldgen/FlowerGen.java index deaa8ccc..6fa96d8a 100644 --- a/src/main/java/mods/natura/worldgen/FlowerGen.java +++ b/src/main/java/mods/natura/worldgen/FlowerGen.java @@ -1,11 +1,13 @@ package mods.natura.worldgen; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class FlowerGen extends WorldGenerator { + /** The ID of the plant block used in this plant generator. */ public final Block flower; @@ -30,8 +32,7 @@ public boolean generate(World world, Random random, int x, int y, int z) { int posY = y + random.nextInt(4) - random.nextInt(4); int posZ = z + random.nextInt(8) - random.nextInt(8); - if (posY < 127 - && world.isAirBlock(posX, posY, posZ) + if (posY < 127 && world.isAirBlock(posX, posY, posZ) && !world.provider.hasNoSky && flower.canBlockStay(world, posX, posY, posZ)) { world.setBlock(posX, posY, posZ, flower, metadata, 2); diff --git a/src/main/java/mods/natura/worldgen/FusewoodGen.java b/src/main/java/mods/natura/worldgen/FusewoodGen.java index 2a5fbf20..b070d6d0 100644 --- a/src/main/java/mods/natura/worldgen/FusewoodGen.java +++ b/src/main/java/mods/natura/worldgen/FusewoodGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.blocks.trees.NSaplingBlock; import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -10,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class FusewoodGen extends WorldGenerator { + /** The minimum height of a generated tree. */ private final int minTreeHeight; @@ -35,10 +38,10 @@ int findGround(World world, int x, int y, int z) { do { height--; Block underID = world.getBlock(x, height, z); - if (underID == Blocks.netherrack - || underID == Blocks.soul_sand + if (underID == Blocks.netherrack || underID == Blocks.soul_sand || underID == NContent.taintedSoil - || height < 0) foundGround = true; + || height < 0) + foundGround = true; } while (!foundGround); return height + 1; } @@ -72,8 +75,7 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos if (i1 >= 0 && i1 < 256) { Block block = world.getBlock(l1, i1, j1); - if (block != Blocks.air - && !block.isLeaves(world, l1, i1, j1) + if (block != Blocks.air && !block.isLeaves(world, l1, i1, j1) && block != Blocks.netherrack && block != Blocks.soul_sand && block != NContent.taintedSoil @@ -92,8 +94,12 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos } else { Block soil = world.getBlock(xPos, yPos - 1, zPos); boolean isSoil = (soil.canSustainPlant( - world, xPos, yPos - 1, zPos, ForgeDirection.UP, (NSaplingBlock) NContent.floraSapling)) - || soil == Blocks.netherrack; + world, + xPos, + yPos - 1, + zPos, + ForgeDirection.UP, + (NSaplingBlock) NContent.floraSapling)) || soil == Blocks.netherrack; if (isSoil && yPos < 256 - treeHeight - 1) { soil.onPlantGrow(world, xPos, yPos - 1, zPos, xPos, yPos, zPos); @@ -127,11 +133,15 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos for (j1 = 0; j1 < treeHeight; ++j1) { Block block = world.getBlock(xPos, yPos + j1, zPos); - if (block == Blocks.air - || block.isLeaves(world, xPos, yPos + j1, zPos) + if (block == Blocks.air || block.isLeaves(world, xPos, yPos + j1, zPos) || block.canBeReplacedByLeaves(world, xPos, yPos + j1, zPos)) { this.setBlockAndNotifyAdequately( - world, xPos, yPos + j1, zPos, NContent.darkTree, this.metaWood); + world, + xPos, + yPos + j1, + zPos, + NContent.darkTree, + this.metaWood); } } diff --git a/src/main/java/mods/natura/worldgen/GlowshroomGenBlueGreen.java b/src/main/java/mods/natura/worldgen/GlowshroomGenBlueGreen.java index e1ca49c5..a3949df2 100644 --- a/src/main/java/mods/natura/worldgen/GlowshroomGenBlueGreen.java +++ b/src/main/java/mods/natura/worldgen/GlowshroomGenBlueGreen.java @@ -1,13 +1,16 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; public class GlowshroomGenBlueGreen extends WorldGenerator { + int mushroomType = -1; public GlowshroomGenBlueGreen(boolean doBlockNotify) { @@ -51,8 +54,7 @@ public boolean generate(World world, Random random, int x, int y, int z) { if (blockID >= 0 && blockID < 256) { Block block = world.getBlock(posY, blockID, l1); - if (posX != 0 - && !block.isLeaves(world, posY, blockID, l1) + if (posX != 0 && !block.isLeaves(world, posY, blockID, l1) && blockID != Block.getIdFromBlock(NContent.glowshroom)) { flag = false; } @@ -68,8 +70,7 @@ public boolean generate(World world, Random random, int x, int y, int z) { } else { Block blockb = world.getBlock(x, y - 1, z); - if (blockb != Blocks.mycelium - && blockb != Blocks.netherrack + if (blockb != Blocks.mycelium && blockb != Blocks.netherrack && blockb != NContent.taintedSoil && blockb != Blocks.soul_sand) { return false; @@ -155,9 +156,8 @@ public boolean generate(World world, Random random, int x, int y, int z) { Block block = world.getBlock(posX, posY, posZ); - if ((meta != 0 || y >= y + height - 1) - && (block == Blocks.fire - || block.canBeReplacedByLeaves(world, posX, posY, posZ))) { + if ((meta != 0 || y >= y + height - 1) && (block == Blocks.fire + || block.canBeReplacedByLeaves(world, posX, posY, posZ))) { Block localID = type == 1 ? NContent.glowshroomBlue : NContent.glowshroomGreen; setBlockAndNotifyAdequately(world, posX, posY, posZ, localID, meta); } diff --git a/src/main/java/mods/natura/worldgen/GlowshroomGenPurple.java b/src/main/java/mods/natura/worldgen/GlowshroomGenPurple.java index 8d81014c..b7958ffa 100644 --- a/src/main/java/mods/natura/worldgen/GlowshroomGenPurple.java +++ b/src/main/java/mods/natura/worldgen/GlowshroomGenPurple.java @@ -1,7 +1,9 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -54,8 +56,7 @@ public boolean generate(World world, Random random, int x, int y, int z) { } else { Block blockb = world.getBlock(x, y - 1, z); - if (blockb != Blocks.mycelium - && blockb != Blocks.netherrack + if (blockb != Blocks.mycelium && blockb != Blocks.netherrack && blockb != NContent.taintedSoil && blockb != Blocks.soul_sand) { return false; @@ -144,11 +145,15 @@ public boolean generate(World world, Random random, int x, int y, int z) { Block block = world.getBlock(posX, posY, posZ); - if ((meta != 0 || y >= y + height - 1) - && (block == Blocks.fire - || block.canBeReplacedByLeaves(world, posX, posY, posZ))) { + if ((meta != 0 || y >= y + height - 1) && (block == Blocks.fire + || block.canBeReplacedByLeaves(world, posX, posY, posZ))) { setBlockAndNotifyAdequately( - world, posX, posY, posZ, NContent.glowshroomPurple, meta); + world, + posX, + posY, + posZ, + NContent.glowshroomPurple, + meta); } } } diff --git a/src/main/java/mods/natura/worldgen/NetherBerryBushGen.java b/src/main/java/mods/natura/worldgen/NetherBerryBushGen.java index 688d91e5..9aa661b3 100644 --- a/src/main/java/mods/natura/worldgen/NetherBerryBushGen.java +++ b/src/main/java/mods/natura/worldgen/NetherBerryBushGen.java @@ -1,7 +1,9 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -10,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class NetherBerryBushGen extends WorldGenerator { + private Block blockGen; private int metadata; @@ -37,8 +40,7 @@ public boolean generate(World world, Random random, int x, int y, int z) { int findGround(World world, int x, int y, int z) { int returnHeight = -1; Block blockID = world.getBlock(x, y - 1, z); - if (!world.isAirBlock(x, y - 1, z) - && !world.getBlock(x, y, z).isOpaqueCube() + if (!world.isAirBlock(x, y - 1, z) && !world.getBlock(x, y, z).isOpaqueCube() && (blockID == Blocks.netherrack || blockID.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, (IPlantable) blockGen))) { // System.out.println("Returning "+y); diff --git a/src/main/java/mods/natura/worldgen/RareTreeGen.java b/src/main/java/mods/natura/worldgen/RareTreeGen.java index d4d93219..f6386176 100644 --- a/src/main/java/mods/natura/worldgen/RareTreeGen.java +++ b/src/main/java/mods/natura/worldgen/RareTreeGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -10,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class RareTreeGen extends WorldGenerator { + public final int minTreeHeight; public final int treeHeightRange; public final int metaWood; @@ -35,8 +38,8 @@ public boolean generate(World world, Random random, int xPos, int yPos, int zPos if (yPos >= 1 && yPos + height + 1 <= 256) { Block soil = world.getBlock(xPos, yPos - 1, zPos); - boolean isSoil = - (soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, NContent.rareSapling)); + boolean isSoil = (soil + .canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, NContent.rareSapling)); if (isSoil) { if (!checkClear(world, xPos, yPos, zPos, height)) return false; @@ -111,11 +114,15 @@ void placeTrunk(World world, int xPos, int yPos, int zPos, int height) { for (int localHeight = 0; localHeight < height; ++localHeight) { Block block = world.getBlock(xPos, yPos + localHeight, zPos); - if (block == Blocks.air - || block.isLeaves(world, xPos, yPos + localHeight, zPos) + if (block == Blocks.air || block.isLeaves(world, xPos, yPos + localHeight, zPos) || block.canBeReplacedByLeaves(world, xPos, yPos + localHeight, zPos)) { this.setBlockAndNotifyAdequately( - world, xPos, yPos + localHeight, zPos, NContent.rareTree, this.metaWood); + world, + xPos, + yPos + localHeight, + zPos, + NContent.rareTree, + this.metaWood); } } } diff --git a/src/main/java/mods/natura/worldgen/RedwoodTreeGen.java b/src/main/java/mods/natura/worldgen/RedwoodTreeGen.java index 30271a70..ce421c8a 100644 --- a/src/main/java/mods/natura/worldgen/RedwoodTreeGen.java +++ b/src/main/java/mods/natura/worldgen/RedwoodTreeGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; @@ -11,58 +13,25 @@ public class RedwoodTreeGen extends WorldGenerator { - /*public boolean drawCircle (World par1World, int radius, int x, int y, int z) { - int tempX = x; - int tempZ = z; - int tempRadius = radius; - int aTrig = 0; - int bTrig = 0; - - for (int loopCount = 0; loopCount <= radius; loopCount++) { - // draw quadrants - aTrig = (radius - loopCount); - bTrig = (int) (Math.sqrt(radius * radius - aTrig * aTrig)); - //if ( par1World.getBlockId(x + aTrig, y, z + bTrig) != 56) // top right - //{ - par1World.setBlock(x + aTrig, y, z + bTrig, 56); - for (int i = z + bTrig; i >= z; i--) { - par1World.setBlock(x + aTrig, y, i, 56); - } - //} - - //if ( par1World.getBlockId(x - aTrig, y, z - bTrig) != 56) // bottom left - //{ - par1World.setBlock(x - aTrig, y, z - bTrig, 56); - for (int i = z - bTrig; i <= z; i++) { - par1World.setBlock(x - aTrig, y, i, 56); - } - //} - - //if ( par1World.getBlockId(x - aTrig, y, z + bTrig) != 56) // top left - //{ - par1World.setBlock(x - aTrig, y, z + bTrig, 56); - for (int i = z + bTrig; i >= z; i--) { - par1World.setBlock(x - aTrig, y, i, 56); - } - //} - - //if ( par1World.getBlockId(x + aTrig, y, z - bTrig) != 56) // bottom right - //{ - par1World.setBlock(x + aTrig, y, z - bTrig, 56); - for (int i = z - bTrig; i <= z; i++) { - par1World.setBlock(x + aTrig, y, i, 56); - } - //} - - } - - return true; - }*/ - - static final byte otherCoordPairs[] = {2, 0, 0, 1, 2, 1}; + /* + * public boolean drawCircle (World par1World, int radius, int x, int y, int z) { int tempX = x; int tempZ = z; int + * tempRadius = radius; int aTrig = 0; int bTrig = 0; for (int loopCount = 0; loopCount <= radius; loopCount++) { // + * draw quadrants aTrig = (radius - loopCount); bTrig = (int) (Math.sqrt(radius * radius - aTrig * aTrig)); //if ( + * par1World.getBlockId(x + aTrig, y, z + bTrig) != 56) // top right //{ par1World.setBlock(x + aTrig, y, z + bTrig, + * 56); for (int i = z + bTrig; i >= z; i--) { par1World.setBlock(x + aTrig, y, i, 56); } //} //if ( + * par1World.getBlockId(x - aTrig, y, z - bTrig) != 56) // bottom left //{ par1World.setBlock(x - aTrig, y, z - + * bTrig, 56); for (int i = z - bTrig; i <= z; i++) { par1World.setBlock(x - aTrig, y, i, 56); } //} //if ( + * par1World.getBlockId(x - aTrig, y, z + bTrig) != 56) // top left //{ par1World.setBlock(x - aTrig, y, z + bTrig, + * 56); for (int i = z + bTrig; i >= z; i--) { par1World.setBlock(x - aTrig, y, i, 56); } //} //if ( + * par1World.getBlockId(x + aTrig, y, z - bTrig) != 56) // bottom right //{ par1World.setBlock(x + aTrig, y, z - + * bTrig, 56); for (int i = z - bTrig; i <= z; i++) { par1World.setBlock(x + aTrig, y, i, 56); } //} } return true; + * } + */ + + static final byte otherCoordPairs[] = { 2, 0, 0, 1, 2, 1 }; Random rand; World worldObj; - int basePos[] = {0, 0, 0}; + int basePos[] = { 0, 0, 0 }; int heightLimit; int height; double heightAttenuation; @@ -214,74 +183,31 @@ public boolean generate(World world, Random random, int x, int yPos, int z) { return true; } - /*else if (height > 70) { - if (heightPos >= 70) { - for (int j3 = currentHeight + groundPoint; j3 <= (groundPoint + heightPos) - 70; j3++) { - genRing11(world, random, x, currentHeight + groundPoint, z); - heightPos--; - currentHeight + groundPoint++; - } - } - if (heightPos >= 58) { - for (int k3 = currentHeight + groundPoint; k3 <= (groundPoint + heightPos) - 58; k3++) { - genRing10(world, random, x, currentHeight + groundPoint, z); - heightPos--; - currentHeight + groundPoint++; - } - } - if (heightPos >= 35) { - for (int l3 = currentHeight + groundPoint; l3 <= (groundPoint + heightPos) - 35; l3++) { - genRing9(world, random, x, currentHeight + groundPoint, z); - heightPos--; - growMediumLowerBranch(world, random, x, currentHeight + groundPoint, z); - currentHeight + groundPoint++; - } - } - if (heightPos >= 15) { - for (int i4 = currentHeight + groundPoint; i4 <= (groundPoint + heightPos) - 15; i4++) { - genRing8(world, random, x, currentHeight + groundPoint, z); - heightPos--; - growMediumUpperBranch(world, random, x, currentHeight + groundPoint, z); - currentHeight + groundPoint++; - } - } - if (heightPos >= 0) { - for (int j4 = currentHeight + groundPoint; j4 <= (groundPoint + heightPos) - 0; j4++) { - genRing7(world, random, x, currentHeight + groundPoint, z); - heightPos--; - growMediumUpperBranch(world, random, x, currentHeight + groundPoint, z); - currentHeight + groundPoint++; - } - } - growMediumRoots(world, random, x, groundPoint - 1, z); - growMediumTop(world, random, x, currentHeight + groundPoint, z); - } else { - if (heightPos >= 50) { - for (int k4 = currentHeight + groundPoint; k4 <= (groundPoint + heightPos) - 50; k4++) { - genRing9(world, random, x, currentHeight + groundPoint, z); - heightPos--; - currentHeight + groundPoint++; - } - } - if (heightPos >= 25) { - for (int l4 = currentHeight + groundPoint; l4 <= (groundPoint + heightPos) - 25; l4++) { - genRing8(world, random, x, currentHeight + groundPoint, z); - heightPos--; - growSmallLowerBranch(world, random, x, currentHeight + groundPoint, z); - currentHeight + groundPoint++; - } - } - if (heightPos >= 0) { - for (int i5 = currentHeight + groundPoint; i5 <= (groundPoint + heightPos) - 0; i5++) { - genRing7(world, random, x, currentHeight + groundPoint, z); - heightPos--; - growSmallUpperBranch(world, random, x, currentHeight + groundPoint, z); - currentHeight + groundPoint++; - } - } - growSmallRoots(world, random, x, groundPoint - 1, z); - growSmallTop(world, random, x, currentHeight + groundPoint, z); - }*/ + /* + * else if (height > 70) { if (heightPos >= 70) { for (int j3 = currentHeight + groundPoint; j3 <= (groundPoint + + * heightPos) - 70; j3++) { genRing11(world, random, x, currentHeight + groundPoint, z); heightPos--; currentHeight + * + groundPoint++; } } if (heightPos >= 58) { for (int k3 = currentHeight + groundPoint; k3 <= (groundPoint + + * heightPos) - 58; k3++) { genRing10(world, random, x, currentHeight + groundPoint, z); heightPos--; currentHeight + * + groundPoint++; } } if (heightPos >= 35) { for (int l3 = currentHeight + groundPoint; l3 <= (groundPoint + + * heightPos) - 35; l3++) { genRing9(world, random, x, currentHeight + groundPoint, z); heightPos--; + * growMediumLowerBranch(world, random, x, currentHeight + groundPoint, z); currentHeight + groundPoint++; } } if + * (heightPos >= 15) { for (int i4 = currentHeight + groundPoint; i4 <= (groundPoint + heightPos) - 15; i4++) { + * genRing8(world, random, x, currentHeight + groundPoint, z); heightPos--; growMediumUpperBranch(world, random, x, + * currentHeight + groundPoint, z); currentHeight + groundPoint++; } } if (heightPos >= 0) { for (int j4 = + * currentHeight + groundPoint; j4 <= (groundPoint + heightPos) - 0; j4++) { genRing7(world, random, x, + * currentHeight + groundPoint, z); heightPos--; growMediumUpperBranch(world, random, x, currentHeight + + * groundPoint, z); currentHeight + groundPoint++; } } growMediumRoots(world, random, x, groundPoint - 1, z); + * growMediumTop(world, random, x, currentHeight + groundPoint, z); } else { if (heightPos >= 50) { for (int k4 = + * currentHeight + groundPoint; k4 <= (groundPoint + heightPos) - 50; k4++) { genRing9(world, random, x, + * currentHeight + groundPoint, z); heightPos--; currentHeight + groundPoint++; } } if (heightPos >= 25) { for (int + * l4 = currentHeight + groundPoint; l4 <= (groundPoint + heightPos) - 25; l4++) { genRing8(world, random, x, + * currentHeight + groundPoint, z); heightPos--; growSmallLowerBranch(world, random, x, currentHeight + groundPoint, + * z); currentHeight + groundPoint++; } } if (heightPos >= 0) { for (int i5 = currentHeight + groundPoint; i5 <= + * (groundPoint + heightPos) - 0; i5++) { genRing7(world, random, x, currentHeight + groundPoint, z); heightPos--; + * growSmallUpperBranch(world, random, x, currentHeight + groundPoint, z); currentHeight + groundPoint++; } } + * growSmallRoots(world, random, x, groundPoint - 1, z); growSmallTop(world, random, x, currentHeight + groundPoint, + * z); } + */ public boolean growTop(World world, Random random, int x, int y, int z) { basePos[0] = x; @@ -1819,12 +1745,12 @@ void generateLeafNodeList() { double d2 = (double) rand.nextFloat() * 2D * 3.1415899999999999D; int k1 = MathHelper.floor_double(d1 * Math.sin(d2) + (double) basePos[0] + d); int l1 = MathHelper.floor_double(d1 * Math.cos(d2) + (double) basePos[2] + d); - int ai1[] = {k1, j, l1}; - int ai2[] = {k1, j + leafDistanceLimit, l1}; + int ai1[] = { k1, j, l1 }; + int ai2[] = { k1, j + leafDistanceLimit, l1 }; if (checkBlockLine(ai1, ai2) != -1) { continue; } - int ai3[] = {basePos[0], basePos[1], basePos[2]}; + int ai3[] = { basePos[0], basePos[1], basePos[2] }; double d3 = Math.sqrt( Math.pow(Math.abs(basePos[0] - ai1[0]), 2D) + Math.pow(Math.abs(basePos[2] - ai1[2]), 2D)); double d4 = d3 * field_874_i; @@ -1854,16 +1780,16 @@ void func_523_a(int i, int j, int k, float f, byte byte0, Block l) { int i1 = (int) ((double) f + 0.61799999999999999D); byte byte1 = otherCoordPairs[byte0]; byte byte2 = otherCoordPairs[byte0 + 3]; - int ai[] = {i, j, k}; - int ai1[] = {0, 0, 0}; + int ai[] = { i, j, k }; + int ai1[] = { 0, 0, 0 }; int j1 = -i1; int k1 = -i1; ai1[byte0] = ai[byte0]; for (; j1 <= i1; j1++) { ai1[byte1] = ai[byte1] + j1; - for (int l1 = -i1; l1 <= i1; ) { - double d = Math.sqrt( - Math.pow((double) Math.abs(j1) + 0.5D, 2D) + Math.pow((double) Math.abs(l1) + 0.5D, 2D)); + for (int l1 = -i1; l1 <= i1;) { + double d = Math + .sqrt(Math.pow((double) Math.abs(j1) + 0.5D, 2D) + Math.pow((double) Math.abs(l1) + 0.5D, 2D)); if (d > (double) f) { l1++; } else { @@ -1915,7 +1841,7 @@ void generateLeafNode(int x, int y, int z) { } void placeBlockLine(int ai[], int ai1[], Block i) { - int ai2[] = {0, 0, 0}; + int ai2[] = { 0, 0, 0 }; byte byte0 = 0; int j = 0; for (; byte0 < 3; byte0++) { @@ -1938,7 +1864,7 @@ void placeBlockLine(int ai[], int ai1[], Block i) { } double d = (double) ai2[byte1] / (double) ai2[j]; double d1 = (double) ai2[byte2] / (double) ai2[j]; - int ai3[] = {0, 0, 0}; + int ai3[] = { 0, 0, 0 }; int k = 0; for (int l = ai2[j] + byte3; k != l; k += byte3) { ai3[j] = MathHelper.floor_double((double) (ai[j] + k) + 0.5D); @@ -1964,10 +1890,10 @@ boolean leafNodeNeedsBase(int i) { void generateLeafNodeBases() { int i = 0; int j = leafNodes.length; - int ai[] = {basePos[0], basePos[1], basePos[2]}; + int ai[] = { basePos[0], basePos[1], basePos[2] }; for (; i < j; i++) { int ai1[] = leafNodes[i]; - int ai2[] = {ai1[0], ai1[1], ai1[2]}; + int ai2[] = { ai1[0], ai1[1], ai1[2] }; ai[1] = ai1[3]; int k = ai[1] - basePos[1]; if (leafNodeNeedsBase(k)) { @@ -1977,7 +1903,7 @@ void generateLeafNodeBases() { } int checkBlockLine(int ai[], int ai1[]) { - int ai2[] = {0, 0, 0}; + int ai2[] = { 0, 0, 0 }; byte byte0 = 0; int i = 0; for (; byte0 < 3; byte0++) { @@ -2000,7 +1926,7 @@ int checkBlockLine(int ai[], int ai1[]) { } double d = (double) ai2[byte1] / (double) ai2[i]; double d1 = (double) ai2[byte2] / (double) ai2[i]; - int ai3[] = {0, 0, 0}; + int ai3[] = { 0, 0, 0 }; int j = 0; int k = ai2[i] + byte3; do { @@ -2022,34 +1948,12 @@ int checkBlockLine(int ai[], int ai1[]) { return Math.abs(j); } } - /* Unused? - jss2a98aj - boolean validTreeLocation() { - int ai[] = { basePos[0], basePos[1], basePos[2] }; - int ai1[] = { basePos[0], (basePos[1] + heightLimit) - 1, basePos[2] }; - Block i = worldObj.getBlock(basePos[0], basePos[1] - 1, basePos[2]); - if (i != Blocks.dirt && i != Blocks.glass) { - return false; - } - int j = checkBlockLine(ai, ai1); - if (j == -1) { - return true; - } - if (j < 6) { - return false; - } else { - heightLimit = j; - return true; - } - } - - public void func_517_a (double d, double d1, double d2) { - heightLimitLimit = (int) (d * 12D); - if (d > 0.5D) - { - leafDistanceLimit = 5; - } - field_873_j = d1; - field_872_k = d2; - } - */ + /* + * Unused? - jss2a98aj boolean validTreeLocation() { int ai[] = { basePos[0], basePos[1], basePos[2] }; int ai1[] = + * { basePos[0], (basePos[1] + heightLimit) - 1, basePos[2] }; Block i = worldObj.getBlock(basePos[0], basePos[1] - + * 1, basePos[2]); if (i != Blocks.dirt && i != Blocks.glass) { return false; } int j = checkBlockLine(ai, ai1); if + * (j == -1) { return true; } if (j < 6) { return false; } else { heightLimit = j; return true; } } public void + * func_517_a (double d, double d1, double d2) { heightLimitLimit = (int) (d * 12D); if (d > 0.5D) { + * leafDistanceLimit = 5; } field_873_j = d1; field_872_k = d2; } + */ } diff --git a/src/main/java/mods/natura/worldgen/SaguaroGen.java b/src/main/java/mods/natura/worldgen/SaguaroGen.java index fe7f9efa..511966bb 100644 --- a/src/main/java/mods/natura/worldgen/SaguaroGen.java +++ b/src/main/java/mods/natura/worldgen/SaguaroGen.java @@ -1,7 +1,9 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -10,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class SaguaroGen extends WorldGenerator { + boolean useHeight; private final int saguaroMeta; @@ -131,8 +134,7 @@ int findGround(World world, int x, int y, int z, boolean useHeight) { do { height--; Block underID = world.getBlock(x, height, z); - if (underID == Blocks.sand - || underID == Blocks.dirt + if (underID == Blocks.sand || underID == Blocks.dirt || underID == Blocks.grass || height < PHNatura.seaLevel) { foundGround = true; diff --git a/src/main/java/mods/natura/worldgen/SakuraTreeGen.java b/src/main/java/mods/natura/worldgen/SakuraTreeGen.java index 1186a311..129cd9fb 100644 --- a/src/main/java/mods/natura/worldgen/SakuraTreeGen.java +++ b/src/main/java/mods/natura/worldgen/SakuraTreeGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.init.Blocks; @@ -12,10 +14,11 @@ import net.minecraftforge.common.util.ForgeDirection; public class SakuraTreeGen extends WorldGenAbstractTree { - static final byte[] otherCoordPairs = new byte[] {(byte) 2, (byte) 0, (byte) 0, (byte) 1, (byte) 2, (byte) 1}; + + static final byte[] otherCoordPairs = new byte[] { (byte) 2, (byte) 0, (byte) 0, (byte) 1, (byte) 2, (byte) 1 }; Random rand = new Random(); World worldObj; - int[] basePos = new int[] {0, 0, 0}; + int[] basePos = new int[] { 0, 0, 0 }; int heightLimit; int height; double heightAttenuation = 0.618D; @@ -76,13 +79,14 @@ void generateLeafNodeList() { double d2 = (double) this.rand.nextFloat() * 2.0D * Math.PI; int k1 = MathHelper.floor_double(d1 * Math.sin(d2) + (double) this.basePos[0] + d0); int l1 = MathHelper.floor_double(d1 * Math.cos(d2) + (double) this.basePos[2] + d0); - int[] aint1 = new int[] {k1, j, l1}; - int[] aint2 = new int[] {k1, j + this.leafDistanceLimit, l1}; + int[] aint1 = new int[] { k1, j, l1 }; + int[] aint2 = new int[] { k1, j + this.leafDistanceLimit, l1 }; if (this.checkBlockLine(aint1, aint2) == -1) { - int[] aint3 = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; - double d3 = Math.sqrt(Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) - + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D)); + int[] aint3 = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; + double d3 = Math.sqrt( + Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) + + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D)); double d4 = d3 * this.branchSlope; if ((double) aint1[1] - d4 > (double) l) { @@ -114,8 +118,8 @@ void func_150529_a(int x, int y, int z, float p_150529_4_, byte p_150529_5_, Blo int l = (int) ((double) p_150529_4_ + 0.618D); byte b1 = otherCoordPairs[p_150529_5_]; byte b2 = otherCoordPairs[p_150529_5_ + 3]; - int[] aint = new int[] {x, y, z}; - int[] aint1 = new int[] {0, 0, 0}; + int[] aint = new int[] { x, y, z }; + int[] aint1 = new int[] { 0, 0, 0 }; int i1 = -l; int j1 = -l; @@ -137,7 +141,12 @@ void func_150529_a(int x, int y, int z, float p_150529_4_, byte p_150529_5_, Blo ++j1; } else { this.setBlockAndNotifyAdequately( - this.worldObj, aint1[0], aint1[1], aint1[2], block, metaLeaves); + this.worldObj, + aint1[0], + aint1[1], + aint1[2], + block, + metaLeaves); ++j1; } } @@ -182,7 +191,7 @@ void generateLeafNode(int par1, int par2, int par3) { } void func_150530_a(int[] p_150530_1_, int[] p_150530_2_, Block block) { - int[] aint2 = new int[] {0, 0, 0}; + int[] aint2 = new int[] { 0, 0, 0 }; byte b0 = 0; byte b1; @@ -207,7 +216,7 @@ void func_150530_a(int[] p_150530_1_, int[] p_150530_2_, Block block) { double d0 = (double) aint2[b2] / (double) aint2[b1]; double d1 = (double) aint2[b3] / (double) aint2[b1]; - int[] aint3 = new int[] {0, 0, 0}; + int[] aint3 = new int[] { 0, 0, 0 }; int i = 0; for (int j = aint2[b1] + b4; i != j; i += b4) { @@ -252,8 +261,8 @@ void generateTrunk() { int j = this.basePos[1]; int k = this.basePos[1] + this.height; int l = this.basePos[2]; - int[] aint = new int[] {i, j, l}; - int[] aint1 = new int[] {i, k, l}; + int[] aint = new int[] { i, j, l }; + int[] aint1 = new int[] { i, k, l }; this.func_150530_a(aint, aint1, NContent.tree); if (this.trunkSize == 2) { @@ -273,9 +282,9 @@ void generateLeafNodeBases() { int i = 0; int j = this.leafNodes.length; - for (int[] aint = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; i < j; ++i) { + for (int[] aint = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; i < j; ++i) { int[] aint1 = this.leafNodes[i]; - int[] aint2 = new int[] {aint1[0], aint1[1], aint1[2]}; + int[] aint2 = new int[] { aint1[0], aint1[1], aint1[2] }; aint[1] = aint1[3]; int k = aint[1] - this.basePos[1]; @@ -286,7 +295,7 @@ void generateLeafNodeBases() { } int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { - int[] aint2 = new int[] {0, 0, 0}; + int[] aint2 = new int[] { 0, 0, 0 }; byte b0 = 0; byte b1; @@ -313,7 +322,7 @@ int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { double d0 = (double) aint2[b2] / (double) aint2[b1]; double d1 = (double) aint2[b3] / (double) aint2[b1]; - int[] aint3 = new int[] {0, 0, 0}; + int[] aint3 = new int[] { 0, 0, 0 }; int i = 0; int j; @@ -332,12 +341,17 @@ int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { } boolean validTreeLocation() { - int[] aint = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; - int[] aint1 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]}; + int[] aint = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; + int[] aint1 = new int[] { this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2] }; Block block = this.worldObj.getBlock(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); boolean isSoil = block.canSustainPlant( - worldObj, basePos[0], basePos[1] - 1, basePos[2], ForgeDirection.UP, (BlockSapling) Blocks.sapling); + worldObj, + basePos[0], + basePos[1] - 1, + basePos[2], + ForgeDirection.UP, + (BlockSapling) Blocks.sapling); if (!isSoil) { return false; } else { diff --git a/src/main/java/mods/natura/worldgen/WhiteTreeGen.java b/src/main/java/mods/natura/worldgen/WhiteTreeGen.java index 312ec026..444f3a9b 100644 --- a/src/main/java/mods/natura/worldgen/WhiteTreeGen.java +++ b/src/main/java/mods/natura/worldgen/WhiteTreeGen.java @@ -1,7 +1,9 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; + import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.init.Blocks; @@ -11,13 +13,14 @@ import net.minecraftforge.common.util.ForgeDirection; public class WhiteTreeGen extends WorldGenAbstractTree { + // JAVADOC FIELD $$ field_76507_a - static final byte[] otherCoordPairs = new byte[] {(byte) 2, (byte) 0, (byte) 0, (byte) 1, (byte) 2, (byte) 1}; + static final byte[] otherCoordPairs = new byte[] { (byte) 2, (byte) 0, (byte) 0, (byte) 1, (byte) 2, (byte) 1 }; // JAVADOC FIELD $$ field_76505_b Random rand = new Random(); // JAVADOC FIELD $$ field_76506_c World worldObj; - int[] basePos = new int[] {0, 0, 0}; + int[] basePos = new int[] { 0, 0, 0 }; int heightLimit; int height; double heightAttenuation = 0.618D; @@ -38,8 +41,6 @@ public class WhiteTreeGen extends WorldGenAbstractTree { int metaLeaves; boolean dontFindHeight; - private static final String __OBFID = "CL_00000400"; - public WhiteTreeGen(boolean par1, int mdwood, int mdleaves) { super(par1); dontFindHeight = par1; @@ -85,13 +86,14 @@ void generateLeafNodeList() { double d2 = (double) this.rand.nextFloat() * 2.0D * Math.PI; int k1 = MathHelper.floor_double(d1 * Math.sin(d2) + (double) this.basePos[0] + d0); int l1 = MathHelper.floor_double(d1 * Math.cos(d2) + (double) this.basePos[2] + d0); - int[] aint1 = new int[] {k1, j, l1}; - int[] aint2 = new int[] {k1, j + this.leafDistanceLimit, l1}; + int[] aint1 = new int[] { k1, j, l1 }; + int[] aint2 = new int[] { k1, j + this.leafDistanceLimit, l1 }; if (this.checkBlockLine(aint1, aint2) == -1) { - int[] aint3 = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; - double d3 = Math.sqrt(Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) - + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D)); + int[] aint3 = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; + double d3 = Math.sqrt( + Math.pow((double) Math.abs(this.basePos[0] - aint1[0]), 2.0D) + + Math.pow((double) Math.abs(this.basePos[2] - aint1[2]), 2.0D)); double d4 = d3 * this.branchSlope; if ((double) aint1[1] - d4 > (double) l) { @@ -118,13 +120,13 @@ void generateLeafNodeList() { System.arraycopy(aint, 0, this.leafNodes, 0, k); } - void func_150529_a( - int p_150529_1_, int p_150529_2_, int p_150529_3_, float p_150529_4_, byte p_150529_5_, Block block) { + void func_150529_a(int p_150529_1_, int p_150529_2_, int p_150529_3_, float p_150529_4_, byte p_150529_5_, + Block block) { int l = (int) ((double) p_150529_4_ + 0.618D); byte b1 = otherCoordPairs[p_150529_5_]; byte b2 = otherCoordPairs[p_150529_5_ + 3]; - int[] aint = new int[] {p_150529_1_, p_150529_2_, p_150529_3_}; - int[] aint1 = new int[] {0, 0, 0}; + int[] aint = new int[] { p_150529_1_, p_150529_2_, p_150529_3_ }; + int[] aint1 = new int[] { 0, 0, 0 }; int i1 = -l; int j1 = -l; @@ -146,7 +148,12 @@ void func_150529_a( ++j1; } else { this.setBlockAndNotifyAdequately( - this.worldObj, aint1[0], aint1[1], aint1[2], block, metaLeaves); + this.worldObj, + aint1[0], + aint1[1], + aint1[2], + block, + metaLeaves); ++j1; } } @@ -192,7 +199,7 @@ void generateLeafNode(int par1, int par2, int par3) { } void func_150530_a(int[] p_150530_1_, int[] p_150530_2_, Block p_150530_3_) { - int[] aint2 = new int[] {0, 0, 0}; + int[] aint2 = new int[] { 0, 0, 0 }; byte b0 = 0; byte b1; @@ -217,7 +224,7 @@ void func_150530_a(int[] p_150530_1_, int[] p_150530_2_, Block p_150530_3_) { double d0 = (double) aint2[b2] / (double) aint2[b1]; double d1 = (double) aint2[b3] / (double) aint2[b1]; - int[] aint3 = new int[] {0, 0, 0}; + int[] aint3 = new int[] { 0, 0, 0 }; int i = 0; for (int j = aint2[b1] + b4; i != j; i += b4) { @@ -265,8 +272,8 @@ void generateTrunk() { int j = this.basePos[1]; int k = this.basePos[1] + this.height; int l = this.basePos[2]; - int[] aint = new int[] {i, j, l}; - int[] aint1 = new int[] {i, k, l}; + int[] aint = new int[] { i, j, l }; + int[] aint1 = new int[] { i, k, l }; this.func_150530_a(aint, aint1, NContent.tree); if (this.trunkSize == 2) { @@ -287,9 +294,9 @@ void generateLeafNodeBases() { int i = 0; int j = this.leafNodes.length; - for (int[] aint = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; i < j; ++i) { + for (int[] aint = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; i < j; ++i) { int[] aint1 = this.leafNodes[i]; - int[] aint2 = new int[] {aint1[0], aint1[1], aint1[2]}; + int[] aint2 = new int[] { aint1[0], aint1[1], aint1[2] }; aint[1] = aint1[3]; int k = aint[1] - this.basePos[1]; @@ -301,7 +308,7 @@ void generateLeafNodeBases() { // JAVADOC METHOD $$ func_76496_a int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { - int[] aint2 = new int[] {0, 0, 0}; + int[] aint2 = new int[] { 0, 0, 0 }; byte b0 = 0; byte b1; @@ -328,7 +335,7 @@ int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { double d0 = (double) aint2[b2] / (double) aint2[b1]; double d1 = (double) aint2[b3] / (double) aint2[b1]; - int[] aint3 = new int[] {0, 0, 0}; + int[] aint3 = new int[] { 0, 0, 0 }; int i = 0; int j; @@ -349,14 +356,17 @@ int checkBlockLine(int[] par1ArrayOfInteger, int[] par2ArrayOfInteger) { // JAVADOC METHOD $$ func_76497_e boolean validTreeLocation() { - int[] aint = new int[] {this.basePos[0], this.basePos[1], this.basePos[2]}; - int[] aint1 = new int[] {this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2]}; + int[] aint = new int[] { this.basePos[0], this.basePos[1], this.basePos[2] }; + int[] aint1 = new int[] { this.basePos[0], this.basePos[1] + this.heightLimit - 1, this.basePos[2] }; Block block = this.worldObj.getBlock(this.basePos[0], this.basePos[1] - 1, this.basePos[2]); boolean isSoil = block.canSustainPlant( - worldObj, basePos[0], basePos[1] - 1, basePos[2], ForgeDirection.UP, (BlockSapling) - Blocks.sapling) - || block == Blocks.netherrack; + worldObj, + basePos[0], + basePos[1] - 1, + basePos[2], + ForgeDirection.UP, + (BlockSapling) Blocks.sapling) || block == Blocks.netherrack; if (!isSoil) { return false; } else { @@ -391,10 +401,10 @@ int findGround(World world, int x, int y, int z) { do { height--; Block blockBelow = world.getBlock(x, height, z); - if (blockBelow == Blocks.netherrack - || blockBelow == Blocks.soul_sand + if (blockBelow == Blocks.netherrack || blockBelow == Blocks.soul_sand || blockBelow == NContent.taintedSoil - || height < 0) foundGround = true; + || height < 0) + foundGround = true; } while (!foundGround); return height + 1; } diff --git a/src/main/java/mods/natura/worldgen/WillowGen.java b/src/main/java/mods/natura/worldgen/WillowGen.java index 27896383..95b7a278 100644 --- a/src/main/java/mods/natura/worldgen/WillowGen.java +++ b/src/main/java/mods/natura/worldgen/WillowGen.java @@ -1,8 +1,10 @@ package mods.natura.worldgen; import java.util.Random; + import mods.natura.common.NContent; import mods.natura.common.PHNatura; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -10,6 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenerator; public class WillowGen extends WorldGenerator { + public final boolean seekHeight; public WillowGen(boolean notify) { @@ -106,8 +109,7 @@ public boolean generate(World world, Random random, int x, int y, int z) { for (j2 = 0; j2 < l; ++j2) { block = world.getBlock(x, y + j2, z); - if (block == Blocks.air - || block.isLeaves(world, x, y + j2, z) + if (block == Blocks.air || block.isLeaves(world, x, y + j2, z) || block.canBeReplacedByLeaves(world, x, y + j2, z) || block == Blocks.water) { this.setBlockAndNotifyAdequately(world, x, y + j2, z, NContent.willow, 0); diff --git a/src/main/java/mods/natura/worldgen/retro/TickHandlerWorld.java b/src/main/java/mods/natura/worldgen/retro/TickHandlerWorld.java index 1d541377..c507e491 100644 --- a/src/main/java/mods/natura/worldgen/retro/TickHandlerWorld.java +++ b/src/main/java/mods/natura/worldgen/retro/TickHandlerWorld.java @@ -1,15 +1,18 @@ package mods.natura.worldgen.retro; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.Type; -import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; import java.util.ArrayList; import java.util.HashMap; import java.util.Random; + import mantle.world.ChunkCoord; + import net.minecraft.world.World; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.Type; +import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; + public class TickHandlerWorld { public static TickHandlerWorld instance = new TickHandlerWorld(); diff --git a/src/main/java/mods/natura/worldgen/retro/WorldHandler.java b/src/main/java/mods/natura/worldgen/retro/WorldHandler.java index 7d3b91ac..5b0f3af2 100644 --- a/src/main/java/mods/natura/worldgen/retro/WorldHandler.java +++ b/src/main/java/mods/natura/worldgen/retro/WorldHandler.java @@ -1,16 +1,19 @@ package mods.natura.worldgen.retro; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList; import java.util.HashSet; import java.util.Random; + import mantle.world.ChunkCoord; import mods.natura.Natura; import mods.natura.worldgen.BaseTreeWorldgen; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.event.world.ChunkDataEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class WorldHandler { private static HashSet dimensionBlacklist = new HashSet();