From 4ede6fc608dd55e91734488a98fb891d7592d1bc Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 3 Oct 2015 10:19:40 +0200 Subject: [PATCH] More cleanup! --- .../achievement/TheAchievements.java | 8 +- .../blocks/BlockBreaker.java | 60 +-- .../blocks/BlockCanolaPress.java | 30 +- .../blocks/BlockCoalGenerator.java | 48 +-- .../blocks/BlockCoffeeMachine.java | 74 ++-- .../blocks/BlockColoredLamp.java | 74 ++-- .../blocks/BlockCompost.java | 88 ++--- .../blocks/BlockDropper.java | 60 +-- .../blocks/BlockEnergizer.java | 32 +- .../actuallyadditions/blocks/BlockFeeder.java | 30 +- .../blocks/BlockFermentingBarrel.java | 32 +- .../blocks/BlockFishingNet.java | 34 +- .../blocks/BlockFluidCollector.java | 60 +-- .../blocks/BlockFluidFlowing.java | 10 +- .../blocks/BlockFurnaceDouble.java | 118 +++--- .../blocks/BlockFurnaceSolar.java | 34 +- .../blocks/BlockGeneric.java | 20 +- .../blocks/BlockGiantChest.java | 32 +- .../blocks/BlockGreenhouseGlass.java | 48 +-- .../blocks/BlockGrinder.java | 44 +-- .../blocks/BlockHeatCollector.java | 10 +- .../blocks/BlockInputter.java | 40 +- .../blocks/BlockItemRepairer.java | 42 +- .../blocks/BlockLampPowerer.java | 56 +-- .../blocks/BlockLavaFactoryController.java | 24 +- .../blocks/BlockLeafGenerator.java | 48 +-- .../actuallyadditions/blocks/BlockMisc.java | 28 +- .../blocks/BlockOilGenerator.java | 48 +-- .../blocks/BlockOreMagnet.java | 32 +- .../blocks/BlockPhantom.java | 53 +-- .../blocks/BlockPhantomBooster.java | 20 +- .../actuallyadditions/blocks/BlockPlant.java | 44 +-- .../actuallyadditions/blocks/BlockSlabs.java | 60 +-- .../blocks/BlockSmileyCloud.java | 72 ++-- .../actuallyadditions/blocks/BlockStair.java | 10 +- .../blocks/BlockTreasureChest.java | 128 +++---- .../blocks/BlockWildPlant.java | 52 +-- .../blocks/BlockXPSolidifier.java | 94 ++--- .../blocks/render/ModelCoffeeMachine.java | 12 +- .../blocks/render/ModelCompost.java | 28 +- .../blocks/render/ModelPhantomBooster.java | 12 +- .../blocks/render/ModelSmileyCloud.java | 18 +- .../actuallyadditions/booklet/GuiBooklet.java | 358 +++++++++--------- .../booklet/page/BookletPage.java | 32 +- .../booklet/page/PageCrafting.java | 54 +-- .../booklet/page/PageCrusherRecipe.java | 10 +- .../booklet/page/PageFurnace.java | 18 +- .../booklet/page/PageTextOnly.java | 10 +- .../config/values/ConfigCrafting.java | 8 +- .../creative/CreativeTab.java | 20 +- .../actuallyadditions/event/CraftEvent.java | 26 +- .../event/WorldDecorationEvent.java | 32 +- .../gen/JamVillagerTradeHandler.java | 18 +- .../ellpeck/actuallyadditions/gen/OreGen.java | 10 +- .../gen/VillageComponentCustomCropField.java | 26 +- .../gen/VillageComponentJamHouse.java | 8 +- .../inventory/ContainerBreaker.java | 10 +- .../inventory/ContainerCanolaPress.java | 10 +- .../inventory/ContainerCoalGenerator.java | 10 +- .../inventory/ContainerCoffeeMachine.java | 10 +- .../inventory/ContainerCrafter.java | 48 +-- .../inventory/ContainerDrill.java | 52 +-- .../inventory/ContainerDropper.java | 10 +- .../inventory/ContainerEnergizer.java | 18 +- .../inventory/ContainerEnervator.java | 18 +- .../inventory/ContainerFeeder.java | 10 +- .../inventory/ContainerFermentingBarrel.java | 10 +- .../inventory/ContainerFluidCollector.java | 10 +- .../inventory/ContainerFurnaceDouble.java | 10 +- .../inventory/ContainerGiantChest.java | 10 +- .../inventory/ContainerGrinder.java | 10 +- .../inventory/ContainerInputter.java | 32 +- .../inventory/ContainerOilGenerator.java | 10 +- .../inventory/ContainerOreMagnet.java | 10 +- .../inventory/ContainerPhantomPlacer.java | 10 +- .../inventory/ContainerRepairer.java | 10 +- .../inventory/ContainerSmileyCloud.java | 10 +- .../inventory/ContainerXPSolidifier.java | 10 +- .../inventory/GuiHandler.java | 8 +- .../inventory/gui/GuiBreaker.java | 10 +- .../inventory/gui/GuiCanolaPress.java | 28 +- .../inventory/gui/GuiCoalGenerator.java | 18 +- .../inventory/gui/GuiCoffeeMachine.java | 36 +- .../inventory/gui/GuiDropper.java | 10 +- .../inventory/gui/GuiEnergizer.java | 18 +- .../inventory/gui/GuiEnervator.java | 18 +- .../inventory/gui/GuiFeeder.java | 18 +- .../inventory/gui/GuiFermentingBarrel.java | 30 +- .../inventory/gui/GuiFluidCollector.java | 20 +- .../inventory/gui/GuiFurnaceDouble.java | 18 +- .../inventory/gui/GuiGrinder.java | 19 +- .../inventory/gui/GuiInputter.java | 198 +++++----- .../inventory/gui/GuiOilGenerator.java | 26 +- .../inventory/gui/GuiOreMagnet.java | 34 +- .../inventory/gui/GuiPhantomPlacer.java | 10 +- .../inventory/gui/GuiRepairer.java | 18 +- .../inventory/gui/GuiSmileyCloud.java | 58 +-- .../inventory/gui/GuiXPSolidifier.java | 10 +- .../inventory/slot/SlotImmovable.java | 10 +- .../actuallyadditions/items/ItemArmorAA.java | 24 +- .../actuallyadditions/items/ItemBattery.java | 10 +- .../actuallyadditions/items/ItemBooklet.java | 20 +- .../actuallyadditions/items/ItemBucketAA.java | 10 +- .../actuallyadditions/items/ItemCoffee.java | 136 +++---- .../items/ItemCoffeeBean.java | 8 +- .../items/ItemCrafterOnAStick.java | 22 +- .../actuallyadditions/items/ItemDrill.java | 329 ++++++++-------- .../items/ItemDrillUpgrade.java | 11 +- .../actuallyadditions/items/ItemDust.java | 36 +- .../actuallyadditions/items/ItemEnergy.java | 38 +- .../items/ItemFertilizer.java | 10 +- .../actuallyadditions/items/ItemFoods.java | 86 ++--- .../items/ItemGrowthRing.java | 10 +- .../items/ItemHairyBall.java | 10 +- .../actuallyadditions/items/ItemJams.java | 80 ++-- .../actuallyadditions/items/ItemKnife.java | 30 +- .../items/ItemLeafBlower.java | 56 +-- .../items/ItemMagnetRing.java | 10 +- .../actuallyadditions/items/ItemMisc.java | 34 +- .../items/ItemPhantomConnector.java | 36 +- .../items/ItemPotionRing.java | 60 +-- .../items/ItemResonantRice.java | 10 +- .../actuallyadditions/items/ItemSeed.java | 16 +- .../items/ItemSpecialDrop.java | 34 +- .../items/ItemTeleStaff.java | 100 ++--- .../items/ItemWaterRemovalRing.java | 10 +- .../items/ItemWingsOfTheBats.java | 24 +- .../items/metalists/TheFoods.java | 1 + .../items/tools/ItemAllToolAA.java | 86 ++--- .../items/tools/ItemAxeAA.java | 8 +- .../items/tools/ItemHoeAA.java | 16 +- .../items/tools/ItemPickaxeAA.java | 10 +- .../items/tools/ItemShovelAA.java | 10 +- .../items/tools/ItemSwordAA.java | 10 +- .../nei/CoffeeMachineRecipeHandler.java | 52 +-- .../nei/CompostRecipeHandler.java | 34 +- .../nei/CrusherRecipeHandler.java | 64 ++-- .../nei/FurnaceDoubleRecipeHandler.java | 74 ++-- .../nei/HairyBallRecipeHandler.java | 42 +- .../nei/TreasureChestRecipeHandler.java | 42 +- .../recipe/CrusherRecipeAutoRegistry.java | 26 +- .../recipe/CrusherRecipeManualRegistry.java | 32 +- .../actuallyadditions/recipe/FuelHandler.java | 22 +- .../tile/TileEntityCompost.java | 10 +- .../tile/TileEntityDropper.java | 24 +- .../tile/TileEntityEnervator.java | 10 +- .../tile/TileEntityFermentingBarrel.java | 30 +- .../tile/TileEntityFishingNet.java | 24 +- .../tile/TileEntityFluidCollector.java | 14 +- .../tile/TileEntityFurnaceDouble.java | 10 +- .../tile/TileEntityFurnaceSolar.java | 24 +- .../tile/TileEntityGiantChest.java | 8 +- .../tile/TileEntityGrinder.java | 28 +- .../tile/TileEntityInventoryBase.java | 62 +-- .../tile/TileEntityItemRepairer.java | 18 +- .../tile/TileEntityLavaFactoryController.java | 28 +- .../tile/TileEntityLeafGenerator.java | 24 +- .../tile/TileEntityOreMagnet.java | 24 +- .../tile/TileEntityPhantomPlacer.java | 24 +- .../tile/TileEntityPhantomface.java | 184 ++++----- .../tile/TileEntitySmileyCloud.java | 22 +- .../actuallyadditions/util/BlockUtil.java | 10 +- .../actuallyadditions/util/ItemUtil.java | 24 +- .../actuallyadditions/util/StringUtil.java | 8 +- .../actuallyadditions/util/WorldPos.java | 32 +- .../actuallyadditions/util/WorldUtil.java | 38 +- 166 files changed, 2962 insertions(+), 2957 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/achievement/TheAchievements.java b/src/main/java/ellpeck/actuallyadditions/achievement/TheAchievements.java index c481e6c45..7002a6ba9 100644 --- a/src/main/java/ellpeck/actuallyadditions/achievement/TheAchievements.java +++ b/src/main/java/ellpeck/actuallyadditions/achievement/TheAchievements.java @@ -49,6 +49,10 @@ public enum TheAchievements{ public final Achievement ach; public final int type; + TheAchievements(String name, int x, int y, ItemStack displayStack, Achievement hasToHaveBefore){ + this(name, x, y, displayStack, hasToHaveBefore, InitAchievements.CRAFTING_ACH); + } + TheAchievements(String name, int x, int y, ItemStack displayStack, Achievement hasToHaveBefore, int type){ this.ach = new Achievement("achievement."+ModUtil.MOD_ID_LOWER+"."+name, ModUtil.MOD_ID_LOWER+"."+name, x, y, displayStack, hasToHaveBefore); if(hasToHaveBefore == null){ @@ -57,8 +61,4 @@ public enum TheAchievements{ this.ach.registerStat(); this.type = type; } - - TheAchievements(String name, int x, int y, ItemStack displayStack, Achievement hasToHaveBefore){ - this(name, x, y, displayStack, hasToHaveBefore, InitAchievements.CRAFTING_ACH); - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java index d132c754d..869fa1539 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java @@ -47,28 +47,11 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo this.setStepSound(soundTypeStone); } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); - world.setBlockMetadataWithNotify(x, y, z, rotation, 2); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isPlacer ? new TileEntityBreaker.TileEntityPlacer() : new TileEntityBreaker(); } - @Override - public IIcon getIcon(int side, int meta){ - if(side == 0 || side == 1){ - return this.topIcon; - } - if(side == 3){ - return this.frontIcon; - } - return this.blockIcon; - } - @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); @@ -82,11 +65,14 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + public IIcon getIcon(int side, int meta){ + if(side == 0 || side == 1){ + return this.topIcon; + } + if(side == 3){ + return this.frontIcon; + } + return this.blockIcon; } @Override @@ -102,9 +88,17 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ + int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); + world.setBlockMetadataWithNotify(x, y, z, rotation, 2); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); } @Override @@ -112,6 +106,12 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo return this.isPlacer ? "blockPlacer" : "blockBreaker"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -123,11 +123,6 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -137,5 +132,10 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java index a0f1ce726..919838b08 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java @@ -50,13 +50,6 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO return side == 1 || side == 0 ? this.topIcon : this.blockIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - } - @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){ @@ -70,9 +63,10 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); } @Override @@ -80,6 +74,12 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO return "blockCanolaPress"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -91,11 +91,6 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -105,5 +100,10 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java index b917920c6..77d058058 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java @@ -44,18 +44,6 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte this.setTickRandomly(true); } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand){ - int meta = world.getBlockMetadata(x, y, z); - - if(meta == 1){ - for(int i = 0; i < 5; i++){ - world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D); - } - } - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityCoalGenerator(); @@ -68,10 +56,14 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); + public void randomDisplayTick(World world, int x, int y, int z, Random rand){ + int meta = world.getBlockMetadata(x, y, z); + + if(meta == 1){ + for(int i = 0; i < 5; i++){ + world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D); + } + } } @Override @@ -87,9 +79,11 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override @@ -97,6 +91,12 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte return "blockCoalGenerator"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -108,11 +108,6 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -122,5 +117,10 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index c7c1410e4..fe0326676 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -44,6 +44,38 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte this.setBlockBounds(f, 0F, f, 1F-f, 1F-2*f, 1F-f); } + @Override + public boolean renderAsNormalBlock(){ + return false; + } + + @Override + public int getRenderType(){ + return AssetUtil.COFFEE_MACHINE_RENDER_ID; + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; + } + + @Override + public boolean isOpaqueCube(){ + return false; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int f6, float f7, float f8, float f9){ + if(!world.isRemote){ + TileEntityCoffeeMachine machine = (TileEntityCoffeeMachine)world.getTileEntity(x, y, z); + if(machine != null){ + player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.COFFEE_MACHINE.ordinal(), world, x, y, z); + } + return true; + } + return true; + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; @@ -62,44 +94,12 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte } } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int f6, float f7, float f8, float f9){ - if(!world.isRemote){ - TileEntityCoffeeMachine machine = (TileEntityCoffeeMachine)world.getTileEntity(x, y, z); - if(machine != null){ - player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.COFFEE_MACHINE.ordinal(), world, x, y, z); - } - return true; - } - return true; - } - - @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ this.blockIcon = Blocks.coal_block.getIcon(0, 0); } - @Override - public boolean isOpaqueCube(){ - return false; - } - - @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - public int getRenderType(){ - return AssetUtil.COFFEE_MACHINE_RENDER_ID; - } - @Override public TileEntity createNewTileEntity(World world, int meta){ return new TileEntityCoffeeMachine(); @@ -127,11 +127,6 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -141,5 +136,10 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index c452e0aed..711720d37 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -48,8 +48,23 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z){ - return this.isOn ? 15 : 0; + public String getName(){ + return this.isOn ? "blockColoredLampOn" : "blockColoredLamp"; + } + + @Override + public IIcon getIcon(int side, int meta){ + return meta >= allLampTypes.length ? null : textures[meta]; + } + + @Override + public Item getItemDropped(int par1, Random rand, int par3){ + return Item.getItemFromBlock(InitBlocks.blockColoredLamp); + } + + @Override + public int damageDropped(int meta){ + return meta; } @Override @@ -86,13 +101,14 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ } @Override - public String getName(){ - return this.isOn ? "blockColoredLampOn" : "blockColoredLamp"; + public ItemStack createStackedBlock(int meta){ + return new ItemStack(InitBlocks.blockColoredLamp, 1, meta); } @Override - public IIcon getIcon(int side, int meta){ - return meta >= allLampTypes.length ? null : textures[meta]; + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z){ + return Item.getItemFromBlock(InitBlocks.blockColoredLamp); } @SuppressWarnings("all") @@ -103,27 +119,6 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ } } - @Override - public Item getItemDropped(int par1, Random rand, int par3){ - return Item.getItemFromBlock(InitBlocks.blockColoredLamp); - } - - @Override - @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z){ - return Item.getItemFromBlock(InitBlocks.blockColoredLamp); - } - - @Override - public ItemStack createStackedBlock(int meta){ - return new ItemStack(InitBlocks.blockColoredLamp, 1, meta); - } - - @Override - public int damageDropped(int meta){ - return meta; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -132,6 +127,11 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ } } + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z){ + return this.isOn ? 15 : 0; + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -143,16 +143,6 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].getName(); - } - @Override public int getMetadata(int damage){ return damage; @@ -165,5 +155,15 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ } return StringUtil.localize(this.getUnlocalizedName(stack)+".name")+(((BlockColoredLamp)this.theBlock).isOn ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".onSuffix.desc")+")" : ""); } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].getName(); + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index f93597f71..44c2187fc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -47,6 +47,42 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo this.setBlockBoundsForItemRender(); } + @Override + public boolean renderAsNormalBlock(){ + return false; + } + + @Override + public int getRenderType(){ + return AssetUtil.COMPOST_RENDER_ID; + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; + } + + @Override + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity collidingEntity){ + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.3125F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); + float f = 0.125F; + this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); + this.setBlockBounds(1.0F-f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); + this.setBlockBounds(0.0F, 0.0F, 1.0F-f, 1.0F, 1.0F, 1.0F); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); + this.setBlockBoundsForItemRender(); + } + + @Override + public boolean isOpaqueCube(){ + return false; + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int f6, float f7, float f8, float f9){ if(!world.isRemote){ @@ -79,33 +115,6 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo return true; } - @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity collidingEntity){ - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.3125F, 1.0F); - super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); - float f = 0.125F; - this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F); - super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f); - super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); - this.setBlockBounds(1.0F-f, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); - this.setBlockBounds(0.0F, 0.0F, 1.0F-f, 1.0F, 1.0F, 1.0F); - super.addCollisionBoxesToList(world, x, y, z, mask, list, collidingEntity); - this.setBlockBoundsForItemRender(); - } - - @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = Blocks.planks.getIcon(0, 0); - } - @Override public void setBlockBoundsForItemRender(){ float f = 1.0F/16.0F; @@ -113,18 +122,9 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo } @Override - public boolean isOpaqueCube(){ - return false; - } - - @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - public int getRenderType(){ - return AssetUtil.COMPOST_RENDER_ID; + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = Blocks.planks.getIcon(0, 0); } @Override @@ -154,11 +154,6 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -168,5 +163,10 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java index 71f62229f..221513880 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java @@ -44,28 +44,11 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo this.setStepSound(soundTypeStone); } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); - world.setBlockMetadataWithNotify(x, y, z, rotation, 2); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityDropper(); } - @Override - public IIcon getIcon(int side, int meta){ - if(side == 0 || side == 1){ - return this.topIcon; - } - if(side == 3){ - return this.frontIcon; - } - return this.blockIcon; - } - @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); @@ -79,11 +62,14 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + public IIcon getIcon(int side, int meta){ + if(side == 0 || side == 1){ + return this.topIcon; + } + if(side == 3){ + return this.frontIcon; + } + return this.blockIcon; } @Override @@ -99,9 +85,17 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ + int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); + world.setBlockMetadataWithNotify(x, y, z, rotation, 2); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); } @Override @@ -109,6 +103,12 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo return "blockDropper"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -120,11 +120,6 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -134,5 +129,10 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java index db9e0f3f1..b9cf064cc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java @@ -54,14 +54,6 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB return side == 1 ? this.topIcon : (side == 0 ? this.blockIcon : this.sideIcon); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.sideIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Side"); - } - @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){ @@ -83,9 +75,11 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.sideIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Side"); } @Override @@ -93,6 +87,12 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB return this.isEnergizer ? "blockEnergizer" : "blockEnervator"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -104,11 +104,6 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -118,5 +113,10 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index b8ba5a4ac..880cda963 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -50,13 +50,6 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc return (side == 0 || side == 1) ? this.topIcon : this.blockIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - } - @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){ @@ -70,9 +63,10 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); } @Override @@ -80,6 +74,12 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc return "blockFeeder"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -91,11 +91,6 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -105,5 +100,10 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java index a02000345..ce896a9b6 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java @@ -45,6 +45,17 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd return new TileEntityFermentingBarrel(); } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + + @Override + public IIcon getIcon(int side, int metadata){ + return side <= 1 ? this.iconTop : this.blockIcon; + } + @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){ @@ -57,17 +68,6 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd return true; } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); - } - - @Override - public IIcon getIcon(int side, int metadata){ - return side <= 1 ? this.iconTop : this.blockIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -91,11 +91,6 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -105,5 +100,10 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index 1365d8f7c..fc16e698a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -43,14 +43,18 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr } @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; + public boolean renderAsNormalBlock(){ + return false; } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = Blocks.planks.getIcon(0, 0); + public int getRenderType(){ + return AssetUtil.FISHING_NET_RENDER_ID; + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; } @Override @@ -59,13 +63,9 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr } @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - public int getRenderType(){ - return AssetUtil.FISHING_NET_RENDER_ID; + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = Blocks.planks.getIcon(0, 0); } @Override @@ -84,11 +84,6 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -98,5 +93,10 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java index 86512af57..5114479b1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java @@ -47,28 +47,11 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt this.setStepSound(soundTypeStone); } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); - world.setBlockMetadataWithNotify(x, y, z, rotation, 2); - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return this.isPlacer ? new TileEntityFluidCollector.TileEntityFluidPlacer() : new TileEntityFluidCollector(); } - @Override - public IIcon getIcon(int side, int meta){ - if(side == 0 || side == 1){ - return this.topIcon; - } - if(side == 3){ - return this.frontIcon; - } - return this.blockIcon; - } - @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); @@ -82,11 +65,14 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + public IIcon getIcon(int side, int meta){ + if(side == 0 || side == 1){ + return this.topIcon; + } + if(side == 3){ + return this.frontIcon; + } + return this.blockIcon; } @Override @@ -102,9 +88,17 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ + int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); + world.setBlockMetadataWithNotify(x, y, z, rotation, 2); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); } @Override @@ -112,6 +106,12 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt return this.isPlacer ? "blockFluidPlacer" : "blockFluidCollector"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -123,11 +123,6 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -137,5 +132,10 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java index 3ca4d4952..b726a30ba 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java @@ -78,11 +78,6 @@ public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemO this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -92,5 +87,10 @@ public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemO public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index e21679deb..bee024c71 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -48,45 +48,11 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte this.setTickRandomly(true); } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ - int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; - - if(rotation == 0){ - world.setBlockMetadataWithNotify(x, y, z, 0, 2); - } - if(rotation == 1){ - world.setBlockMetadataWithNotify(x, y, z, 3, 2); - } - if(rotation == 2){ - world.setBlockMetadataWithNotify(x, y, z, 1, 2); - } - if(rotation == 3){ - world.setBlockMetadataWithNotify(x, y, z, 2, 2); - } - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityFurnaceDouble(); } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z){ - return world.getBlockMetadata(x, y, z) > 3 ? 12 : 0; - } - - @Override - public IIcon getIcon(int side, int meta){ - if(side == 1){ - return this.topIcon; - } - if(side == 3){ - return this.frontIcon; - } - return this.blockIcon; - } - @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); @@ -103,24 +69,14 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.onIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"On"); - this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); - } - - @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){ - TileEntityFurnaceDouble furnace = (TileEntityFurnaceDouble)world.getTileEntity(x, y, z); - if(furnace != null){ - player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.FURNACE_DOUBLE.ordinal(), world, x, y, z); - } - return true; + public IIcon getIcon(int side, int meta){ + if(side == 1){ + return this.topIcon; } - return true; + if(side == 3){ + return this.frontIcon; + } + return this.blockIcon; } @Override @@ -159,9 +115,47 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ + if(!world.isRemote){ + TileEntityFurnaceDouble furnace = (TileEntityFurnaceDouble)world.getTileEntity(x, y, z); + if(furnace != null){ + player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.FURNACE_DOUBLE.ordinal(), world, x, y, z); + } + return true; + } + return true; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ + int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; + + if(rotation == 0){ + world.setBlockMetadataWithNotify(x, y, z, 0, 2); + } + if(rotation == 1){ + world.setBlockMetadataWithNotify(x, y, z, 3, 2); + } + if(rotation == 2){ + world.setBlockMetadataWithNotify(x, y, z, 1, 2); + } + if(rotation == 3){ + world.setBlockMetadataWithNotify(x, y, z, 2, 2); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.onIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"On"); + this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z){ + return world.getBlockMetadata(x, y, z) > 3 ? 12 : 0; } @Override @@ -169,6 +163,12 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte return "blockFurnaceDouble"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -180,11 +180,6 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -194,5 +189,10 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index 6a2142c83..016d25016 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -43,14 +43,18 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem } @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; + public boolean renderAsNormalBlock(){ + return false; } @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = Blocks.daylight_detector.getIcon(0, 0); + public int getRenderType(){ + return AssetUtil.FURNACE_SOLAR_RENDER_ID; + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; } @Override @@ -59,13 +63,9 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem } @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - public int getRenderType(){ - return AssetUtil.FURNACE_SOLAR_RENDER_ID; + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = Blocks.daylight_detector.getIcon(0, 0); } @Override @@ -84,11 +84,6 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -98,5 +93,10 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java index 061fc600a..b5673bf56 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java @@ -35,11 +35,6 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ this.setStepSound(soundTypeStone); } - @Override - public String getName(){ - return this.name; - } - @Override public IIcon getIcon(int side, int meta){ return this.blockIcon; @@ -51,6 +46,11 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public String getName(){ + return this.name; + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -62,11 +62,6 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -76,5 +71,10 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index 6aa3979a4..4c636340c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -51,14 +51,6 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr return side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); - } - @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){ @@ -72,9 +64,11 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override @@ -82,6 +76,12 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr return "blockGiantChest"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -93,11 +93,6 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -107,6 +102,11 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java index f199c397f..76a1229d1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java @@ -37,6 +37,23 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI this.setStepSound(soundTypeStone); } + @Override + public boolean renderAsNormalBlock(){ + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int meta){ + return world.getBlockMetadata(x, y, z) != world.getBlockMetadata(x-Facing.offsetsXForSide[meta], y-Facing.offsetsYForSide[meta], z-Facing.offsetsZForSide[meta]) || (world.getBlock(x, y, z) != this && super.shouldSideBeRendered(world, x, y, z, meta)); + + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; + } + @Override public boolean isOpaqueCube(){ return false; @@ -48,21 +65,6 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI return 0; } - @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - public TileEntity createNewTileEntity(World world, int par2){ - return new TileEntityGreenhouseGlass(); - } - - @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -75,10 +77,8 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI } @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int meta){ - return world.getBlockMetadata(x, y, z) != world.getBlockMetadata(x-Facing.offsetsXForSide[meta], y-Facing.offsetsYForSide[meta], z-Facing.offsetsZForSide[meta]) || (world.getBlock(x, y, z) != this && super.shouldSideBeRendered(world, x, y, z, meta)); - + public TileEntity createNewTileEntity(World world, int par2){ + return new TileEntityGreenhouseGlass(); } public static class TheItemBlock extends ItemBlock{ @@ -92,11 +92,6 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -106,5 +101,10 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index e5cc429f0..59466d1c9 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -53,11 +53,6 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo return this.isDouble ? new TileEntityGrinder.TileEntityGrinderDouble() : new TileEntityGrinder(); } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z){ - return world.getBlockMetadata(x, y, z) == 1 ? 12 : 0; - } - @Override public IIcon getIcon(int side, int meta){ if(side == 1 && meta != 1){ @@ -87,15 +82,6 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockGrinderTop"); - this.onIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockGrinderOn"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockGrinderBottom"); - } - @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){ @@ -109,9 +95,17 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockGrinderTop"); + this.onIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockGrinderOn"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockGrinderBottom"); + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z){ + return world.getBlockMetadata(x, y, z) == 1 ? 12 : 0; } @Override @@ -119,6 +113,12 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo return isDouble ? "blockGrinderDouble" : "blockGrinder"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -130,11 +130,6 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return ((BlockGrinder)theBlock).isDouble ? EnumRarity.epic : EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -144,5 +139,10 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return ((BlockGrinder)theBlock).isDouble ? EnumRarity.epic : EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index a7fe3a197..43ccc38fc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -72,11 +72,6 @@ public class BlockHeatCollector extends BlockContainerBase implements IActAddIte this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -86,5 +81,10 @@ public class BlockHeatCollector extends BlockContainerBase implements IActAddIte public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index 6cd24ccaa..4d61c8312 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -58,12 +58,6 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl return this.blockIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } - @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){ @@ -76,6 +70,17 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl return true; } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public String getName(){ + return this.isAdvanced ? "blockInputterAdvanced" : "blockInputter"; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ if(!world.isRemote){ @@ -88,11 +93,6 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl super.breakBlock(world, x, y, z, block, par6); } - @Override - public String getName(){ - return this.isAdvanced ? "blockInputterAdvanced" : "blockInputter"; - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -108,8 +108,13 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl } @Override - public EnumRarity getRarity(ItemStack stack){ - return ((BlockInputter)theBlock).isAdvanced ? EnumRarity.epic : EnumRarity.rare; + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName(); + } + + @Override + public int getMetadata(int damage){ + return damage; } @Override @@ -126,13 +131,8 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl } @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; + public EnumRarity getRarity(ItemStack stack){ + return ((BlockInputter)theBlock).isAdvanced ? EnumRarity.epic : EnumRarity.rare; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java index d564e18f4..8885bfd14 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java @@ -48,11 +48,6 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem return new TileEntityItemRepairer(); } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z){ - return world.getBlockMetadata(x, y, z) == 1 ? 12 : 0; - } - @Override public IIcon getIcon(int side, int meta){ if(side == 1){ @@ -64,14 +59,6 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem return this.blockIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); - } - @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){ @@ -85,9 +72,16 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); + } + + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z){ + return world.getBlockMetadata(x, y, z) == 1 ? 12 : 0; } @Override @@ -95,6 +89,12 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem return "blockItemRepairer"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -106,11 +106,6 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -120,5 +115,10 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java index 43c72772a..b8fd82d45 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java @@ -42,14 +42,12 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "blockLampPowerer"; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ - int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); - world.setBlockMetadataWithNotify(x, y, z, rotation, 2); + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ + int meta = world.getBlockMetadata(x, y, z); + if(side == meta){ + return this.frontIcon; + } + return this.blockIcon; } @Override @@ -61,12 +59,8 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ - int meta = world.getBlockMetadata(x, y, z); - if(side == meta){ - return this.frontIcon; - } - return this.blockIcon; + public void onNeighborBlockChange(World world, int x, int y, int z, Block block){ + this.updateLamp(world, x, y, z); } @Override @@ -75,8 +69,21 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block block){ - this.updateLamp(world, x, y, z); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ + int rotation = BlockPistonBase.determineOrientation(world, x, y, z, player); + world.setBlockMetadataWithNotify(x, y, z, rotation, 2); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); + } + + @Override + public String getName(){ + return "blockLampPowerer"; } private void updateLamp(World world, int x, int y, int z){ @@ -97,13 +104,6 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front"); - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -115,11 +115,6 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -129,5 +124,10 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java index 35a08e3f4..36e73ee1d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java @@ -50,13 +50,6 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA return side == 1 ? this.topIcon : this.blockIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - } - @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){ @@ -76,6 +69,13 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA return true; } + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + } + @Override public String getName(){ return "blockLavaFactoryController"; @@ -92,11 +92,6 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -106,5 +101,10 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java index f2f271d58..92a476673 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java @@ -43,18 +43,6 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte this.setTickRandomly(true); } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand){ - int meta = world.getBlockMetadata(x, y, z); - - if(meta == 1){ - for(int i = 0; i < 5; i++){ - world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D); - } - } - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityLeafGenerator(); @@ -67,10 +55,14 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); + public void randomDisplayTick(World world, int x, int y, int z, Random rand){ + int meta = world.getBlockMetadata(x, y, z); + + if(meta == 1){ + for(int i = 0; i < 5; i++){ + world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D); + } + } } @Override @@ -86,9 +78,11 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override @@ -96,6 +90,12 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte return "blockLeafGenerator"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ public TheItemBlock(Block block){ @@ -104,11 +104,6 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -118,5 +113,10 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 561e5a23d..606fffbd0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -39,12 +39,9 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ this.setHarvestLevel("pickaxe", 1); } - @SuppressWarnings("all") - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list){ - for(int j = 0; j < allMiscBlocks.length; j++){ - list.add(new ItemStack(item, 1, j)); - } + @Override + public IIcon getIcon(int side, int metadata){ + return metadata >= textures.length ? null : textures[metadata]; } @Override @@ -52,9 +49,12 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ return meta; } - @Override - public IIcon getIcon(int side, int metadata){ - return metadata >= textures.length ? null : textures[metadata]; + @SuppressWarnings("all") + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item item, CreativeTabs tab, List list){ + for(int j = 0; j < allMiscBlocks.length; j++){ + list.add(new ItemStack(item, 1, j)); + } } @Override @@ -81,11 +81,6 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allMiscBlocks.length ? EnumRarity.common : allMiscBlocks[stack.getItemDamage()].rarity; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscBlocks.length ? " ERROR!" : allMiscBlocks[stack.getItemDamage()].getName()); @@ -95,5 +90,10 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allMiscBlocks.length ? EnumRarity.common : allMiscBlocks[stack.getItemDamage()].rarity; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java index 6dcbc0349..c751691e0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java @@ -44,18 +44,6 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem this.setTickRandomly(true); } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand){ - int meta = world.getBlockMetadata(x, y, z); - - if(meta == 1){ - for(int i = 0; i < 5; i++){ - world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D); - } - } - } - @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityOilGenerator(); @@ -68,10 +56,14 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); + public void randomDisplayTick(World world, int x, int y, int z, Random rand){ + int meta = world.getBlockMetadata(x, y, z); + + if(meta == 1){ + for(int i = 0; i < 5; i++){ + world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D); + } + } } @Override @@ -87,9 +79,11 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override @@ -97,6 +91,12 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem return "blockOilGenerator"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -108,11 +108,6 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -122,5 +117,10 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java index d92a1e062..abb197f9d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java @@ -51,14 +51,6 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB return (side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon)); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconReg){ - this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); - this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); - } - @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){ @@ -72,9 +64,11 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6){ - this.dropInventory(world, x, y, z); - super.breakBlock(world, x, y, z, block, par6); + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override @@ -82,6 +76,12 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB return "blockOreMagnet"; } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int par6){ + this.dropInventory(world, x, y, z); + super.breakBlock(world, x, y, z, block, par6); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -93,11 +93,6 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -107,5 +102,10 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java index 8c62876cd..b957ff1ab 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java @@ -38,6 +38,7 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo public Type type; public int range; + public BlockPhantom(Type type){ super(Material.rock); this.type = type; @@ -62,6 +63,27 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo super.breakBlock(world, x, y, z, block, par6); } + @Override + public TileEntity createNewTileEntity(World world, int par2){ + switch(this.type){ + case PLACER: + return new TileEntityPhantomPlacer(); + case BREAKER: + return new TileEntityPhantomPlacer.TileEntityPhantomBreaker(); + case LIQUIFACE: + return new TileEntityPhantomface.TileEntityPhantomLiquiface(); + case ENERGYFACE: + return new TileEntityPhantomface.TileEntityPhantomEnergyface(); + default: + return new TileEntityPhantomface.TileEntityPhantomItemface(); + } + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int hitSide, float hitX, float hitY, float hitZ){ if(!world.isRemote){ @@ -97,27 +119,6 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo return true; } - @Override - public TileEntity createNewTileEntity(World world, int par2){ - switch(this.type){ - case PLACER: - return new TileEntityPhantomPlacer(); - case BREAKER: - return new TileEntityPhantomPlacer.TileEntityPhantomBreaker(); - case LIQUIFACE: - return new TileEntityPhantomface.TileEntityPhantomLiquiface(); - case ENERGYFACE: - return new TileEntityPhantomface.TileEntityPhantomEnergyface(); - default: - return new TileEntityPhantomface.TileEntityPhantomItemface(); - } - } - - @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -159,11 +160,6 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -173,5 +169,10 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index a4e445c10..225e7b6f2 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -39,11 +39,6 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt this.setBlockBounds(3*f, 0F, 3*f, 1-3*f, 1F, 1-3*f); } - @Override - public boolean isOpaqueCube(){ - return false; - } - @Override public boolean renderAsNormalBlock(){ return false; @@ -59,6 +54,11 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt return this.blockIcon; } + @Override + public boolean isOpaqueCube(){ + return false; + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -86,11 +86,6 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -100,5 +95,10 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java index 9e34a07f3..6f593bedd 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java @@ -50,11 +50,6 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ return EnumPlantType.Crop; } - @Override - public int quantityDropped(int meta, int fortune, Random random){ - return meta >= 7 ? random.nextInt(addDropAmount)+minDropAmount : super.quantityDropped(meta, fortune, random); - } - @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ @@ -74,24 +69,14 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ return this.seedItem; } - @Override - public Item getItemDropped(int meta, Random rand, int par3){ - return meta >= 7 ? this.func_149865_P() : this.func_149866_i(); - } - @Override public Item func_149865_P(){ return this.returnItem; } @Override - public int damageDropped(int meta){ - return this.returnMeta; - } - - @Override - public int getDamageValue(World world, int x, int y, int z){ - return 0; + public Item getItemDropped(int meta, Random rand, int par3){ + return meta >= 7 ? this.func_149865_P() : this.func_149866_i(); } @Override @@ -107,6 +92,21 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ return this.name; } + @Override + public int damageDropped(int meta){ + return this.returnMeta; + } + + @Override + public int getDamageValue(World world, int x, int y, int z){ + return 0; + } + + @Override + public int quantityDropped(int meta, int fortune, Random random){ + return meta >= 7 ? random.nextInt(addDropAmount)+minDropAmount : super.quantityDropped(meta, fortune, random); + } + public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -118,11 +118,6 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -132,5 +127,10 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java index 27bdaba1e..822003d46 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java @@ -41,6 +41,17 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ this.name = name; } + @Override + public boolean renderAsNormalBlock(){ + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta){ + return this.fullBlock.getIcon(0, 0); + } + @Override public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axis, List list, Entity entity){ this.setBlockBoundsBasedOnState(world, x, y, z); @@ -48,16 +59,8 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ } @Override - public void setBlockBoundsForItemRender(){ - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); - } - - @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z){ - int meta = world.getBlockMetadata(x, y, z); - float minY = meta == 1 ? 0.5F : 0.0F; - float maxY = meta == 1 ? 1.0F : 0.5F; - this.setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); + public boolean isOpaqueCube(){ + return false; } @Override @@ -72,19 +75,16 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ } @Override - public boolean isOpaqueCube(){ - return false; + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z){ + int meta = world.getBlockMetadata(x, y, z); + float minY = meta == 1 ? 0.5F : 0.0F; + float maxY = meta == 1 ? 1.0F : 0.5F; + this.setBlockBounds(0.0F, minY, 0F, 1.0F, maxY, 1.0F); } @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta){ - return this.fullBlock.getIcon(0, 0); + public void setBlockBoundsForItemRender(){ + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } @Override @@ -109,21 +109,16 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - @Override public int getMetadata(int meta){ return meta; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } + @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ){ if(world.getBlock(x, y, z) == this.theBlock && ((side == 1 && world.getBlockMetadata(x, y, z) == 0) || (side == 0 && world.getBlockMetadata(x, y, z) == 1))){ @@ -135,5 +130,10 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ } return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ); } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName(); + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java index 6055a1d99..adb522c87 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java @@ -41,6 +41,37 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO this.setStepSound(soundTypeCloth); } + @Override + public boolean renderAsNormalBlock(){ + return false; + } + + @Override + public int getRenderType(){ + return AssetUtil.SMILEY_CLOUD_RENDER_ID; + } + + @Override + public IIcon getIcon(int side, int metadata){ + return this.blockIcon; + } + + @Override + public boolean isOpaqueCube(){ + return false; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int f6, float f7, float f8, float f9){ + if(!world.isRemote){ + TileEntity tile = world.getTileEntity(x, y, z); + if(tile instanceof TileEntitySmileyCloud){ + player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CLOUD.ordinal(), world, x, y, z); + } + } + return true; + } + @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z){ int meta = world.getBlockMetadata(x, y, z); @@ -60,22 +91,6 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO } } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int f6, float f7, float f8, float f9){ - if(!world.isRemote){ - TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof TileEntitySmileyCloud){ - player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CLOUD.ordinal(), world, x, y, z); - } - } - return true; - } - - @Override - public IIcon getIcon(int side, int metadata){ - return this.blockIcon; - } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; @@ -100,21 +115,6 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO this.blockIcon = Blocks.wool.getIcon(0, 0); } - @Override - public boolean isOpaqueCube(){ - return false; - } - - @Override - public boolean renderAsNormalBlock(){ - return false; - } - - @Override - public int getRenderType(){ - return AssetUtil.SMILEY_CLOUD_RENDER_ID; - } - @Override public TileEntity createNewTileEntity(World world, int meta){ return new TileEntitySmileyCloud(); @@ -142,11 +142,6 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -156,5 +151,10 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java index 97ee3779f..3327a402e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java @@ -43,11 +43,6 @@ public class BlockStair extends BlockStairs implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -57,5 +52,10 @@ public class BlockStair extends BlockStairs implements IActAddItemOrBlock{ public int getMetadata(int meta){ return meta; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java index a8f3e1489..f2147d359 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java @@ -50,6 +50,63 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ this.setTickRandomly(true); } + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ + int meta = world.getBlockMetadata(x, y, z); + if(side == 1){ + return this.topIcon; + } + if(side == meta+2){ + return this.frontIcon; + } + if(side == 0){ + return this.bottomIcon; + } + return this.blockIcon; + } + + @Override + public IIcon getIcon(int side, int meta){ + if(side == 1){ + return this.topIcon; + } + if(side == 0){ + return this.bottomIcon; + } + if(side == 3){ + return this.frontIcon; + } + return this.blockIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World world, int x, int y, int z, Random rand){ + for(int i = 0; i < 2; i++){ + for(float f = 0; f <= 3; f += 0.5){ + float particleX = rand.nextFloat(); + float particleZ = rand.nextFloat(); + world.spawnParticle("bubble", (double)x+particleX, (double)y+f+1, (double)z+particleZ, 0.0D, 0.2D, 0.0D); + } + } + } + + @Override + public Item getItemDropped(int par1, Random rand, int par3){ + return null; + } + + @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){ + world.playSoundAtEntity(player, "random.chestopen", 0.2F, new Random().nextFloat()*0.1F+0.9F); + this.dropItems(world, x, y, z); + player.addStat(TheAchievements.OPEN_TREASURE_CHEST.ach, 1); + world.setBlockToAir(x, y, z); + } + return true; + } + @Override public boolean canSilkHarvest(){ return false; @@ -73,40 +130,6 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ } } - @Override - public Item getItemDropped(int par1, Random rand, int par3){ - return null; - } - - @Override - public IIcon getIcon(int side, int meta){ - if(side == 1){ - return this.topIcon; - } - if(side == 0){ - return this.bottomIcon; - } - if(side == 3){ - return this.frontIcon; - } - return this.blockIcon; - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ - int meta = world.getBlockMetadata(x, y, z); - if(side == 1){ - return this.topIcon; - } - if(side == meta+2){ - return this.frontIcon; - } - if(side == 0){ - return this.bottomIcon; - } - return this.blockIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -117,14 +140,8 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ } @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){ - world.playSoundAtEntity(player, "random.chestopen", 0.2F, new Random().nextFloat()*0.1F+0.9F); - this.dropItems(world, x, y, z); - player.addStat(TheAchievements.OPEN_TREASURE_CHEST.ach, 1); - world.setBlockToAir(x, y, z); - } - return true; + public String getName(){ + return "blockTreasureChest"; } private void dropItems(World world, int x, int y, int z){ @@ -150,23 +167,6 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ } } - @Override - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random rand){ - for(int i = 0; i < 2; i++){ - for(float f = 0; f <= 3; f += 0.5){ - float particleX = rand.nextFloat(); - float particleZ = rand.nextFloat(); - world.spawnParticle("bubble", (double)x+particleX, (double)y+f+1, (double)z+particleZ, 0.0D, 0.2D, 0.0D); - } - } - } - - @Override - public String getName(){ - return "blockTreasureChest"; - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -178,11 +178,6 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -192,5 +187,10 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index 98aeaa6df..56bdaedde 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -44,11 +44,23 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ return world.getBlockMetadata(x, y, z) == TheWildPlants.RICE.ordinal() ? world.getBlock(x, y-1, z).getMaterial() == Material.water : world.getBlock(x, y-1, z).canSustainPlant(world, x, y-1, z, ForgeDirection.UP, this); } + @Override + public IIcon getIcon(int side, int metadata){ + return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getIcon(0, 7); + } + @Override public boolean canSilkHarvest(){ return false; } + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z){ + int meta = world.getBlockMetadata(x, y, z); + return meta >= allWildPlants.length ? null : ((BlockPlant)allWildPlants[meta].wildVersionOf).seedItem; + } + @SuppressWarnings("all") @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list){ @@ -57,16 +69,6 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ } } - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune){ - return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getDrops(world, x, y, z, 7, fortune); - } - - @Override - public IIcon getIcon(int side, int metadata){ - return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getIcon(0, 7); - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -74,15 +76,13 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "blockWild"; + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune){ + return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getDrops(world, x, y, z, 7, fortune); } @Override - @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z){ - int meta = world.getBlockMetadata(x, y, z); - return meta >= allWildPlants.length ? null : ((BlockPlant)allWildPlants[meta].wildVersionOf).seedItem; + public String getName(){ + return "blockWild"; } public static class TheItemBlock extends ItemBlock{ @@ -96,26 +96,26 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allWildPlants.length ? EnumRarity.common : allWildPlants[stack.getItemDamage()].rarity; - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allWildPlants.length ? " ERROR!" : allWildPlants[stack.getItemDamage()].getName()); - } - @Override public int getMetadata(int damage){ return damage; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allWildPlants.length ? EnumRarity.common : allWildPlants[stack.getItemDamage()].rarity; + } + @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamage(int meta){ return this.theBlock.getIcon(0, meta); } + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName()+(stack.getItemDamage() >= allWildPlants.length ? " ERROR!" : allWildPlants[stack.getItemDamage()].getName()); + } + } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java index 76c261fad..9aecc11a5 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java @@ -47,6 +47,46 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem this.setStepSound(soundTypeStone); } + @Override + public TileEntity createNewTileEntity(World world, int par2){ + return new TileEntityXPSolidifier(); + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ + int meta = world.getBlockMetadata(x, y, z); + if(side == 1 || side == 0){ + return this.topIcon; + } + if(side == meta+2){ + return this.frontIcon; + } + return this.blockIcon; + } + + @Override + public IIcon getIcon(int side, int meta){ + if(side == 1 || side == 0){ + return this.topIcon; + } + if(side == 3){ + return this.frontIcon; + } + return this.blockIcon; + } + + @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){ + TileEntityXPSolidifier solidifier = (TileEntityXPSolidifier)world.getTileEntity(x, y, z); + if(solidifier != null){ + player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.XP_SOLIDIFIER.ordinal(), world, x, y, z); + } + return true; + } + return true; + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){ int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; @@ -65,34 +105,6 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem } } - @Override - public TileEntity createNewTileEntity(World world, int par2){ - return new TileEntityXPSolidifier(); - } - - @Override - public IIcon getIcon(int side, int meta){ - if(side == 1 || side == 0){ - return this.topIcon; - } - if(side == 3){ - return this.frontIcon; - } - return this.blockIcon; - } - - @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ - int meta = world.getBlockMetadata(x, y, z); - if(side == 1 || side == 0){ - return this.topIcon; - } - if(side == meta+2){ - return this.frontIcon; - } - return this.blockIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ @@ -102,15 +114,8 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem } @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){ - TileEntityXPSolidifier solidifier = (TileEntityXPSolidifier)world.getTileEntity(x, y, z); - if(solidifier != null){ - player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.XP_SOLIDIFIER.ordinal(), world, x, y, z); - } - return true; - } - return true; + public String getName(){ + return "blockXPSolidifier"; } @Override @@ -145,11 +150,6 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem world.spawnEntityInWorld(entityItem); } - @Override - public String getName(){ - return "blockXPSolidifier"; - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; @@ -161,11 +161,6 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName(); @@ -175,5 +170,10 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem public int getMetadata(int damage){ return damage; } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java index 15f96f173..39ae29d95 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java @@ -116,6 +116,12 @@ public class ModelCoffeeMachine extends ModelBaseAA{ setRotation(p13, 0F, 0F, 0F); } + private void setRotation(ModelRenderer model, float x, float y, float z){ + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + @Override public void render(float f){ p1.render(f); @@ -133,12 +139,6 @@ public class ModelCoffeeMachine extends ModelBaseAA{ p13.render(f); } - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - @Override public String getName(){ return "modelCoffeeMachine"; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java index 32fb51e5e..d40eb2443 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java @@ -54,6 +54,20 @@ public class ModelCompost extends ModelBaseAA{ this.innerDone.addBox(0.0F, 0.0F, 0.0F, 12, 13, 12, 0.0F); } + @Override + public void render(float f){ + this.wallThree.render(f); + this.wallFour.render(f); + this.wallOne.render(f); + this.wallTwo.render(f); + this.floor.render(f); + } + + @Override + public String getName(){ + return "modelCompost"; + } + @Override public void renderExtra(float f, TileEntity tile){ int meta = tile.getWorldObj().getBlockMetadata(tile.xCoord, tile.yCoord, tile.zCoord); @@ -69,18 +83,4 @@ public class ModelCompost extends ModelBaseAA{ this.innerDone.render(f); } } - - @Override - public void render(float f){ - this.wallThree.render(f); - this.wallFour.render(f); - this.wallOne.render(f); - this.wallTwo.render(f); - this.floor.render(f); - } - - @Override - public String getName(){ - return "modelCompost"; - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java index d9f7bf9e3..dbe6fba6a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java @@ -126,6 +126,12 @@ public class ModelPhantomBooster extends ModelBaseAA{ setRotation(s15, 0F, 0F, 0F); } + private void setRotation(ModelRenderer model, float x, float y, float z){ + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + @Override public void render(float f){ s1.render(f); @@ -154,10 +160,4 @@ public class ModelPhantomBooster extends ModelBaseAA{ public boolean doesRotate(){ return true; } - - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java index b379233df..3b78f576f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java @@ -133,9 +133,10 @@ public class ModelSmileyCloud extends ModelBaseAA{ setRotation(s16, 0F, 0F, 0F); } - @Override - public boolean doesRotate(){ - return true; + private void setRotation(ModelRenderer model, float x, float y, float z){ + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; } @Override @@ -158,14 +159,13 @@ public class ModelSmileyCloud extends ModelBaseAA{ s16.render(f); } - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - @Override public String getName(){ return "modelSmileyCloud"; } + + @Override + public boolean doesRotate(){ + return true; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java index 84d84a717..022dc16fc 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java @@ -72,139 +72,6 @@ public class GuiBooklet extends GuiScreen{ this.parentScreen = parentScreen; } - @Override - public void updateScreen(){ - super.updateScreen(); - this.searchField.updateCursorCounter(); - - if(this.currentIndexEntry != null && this.currentChapter != null && this.currentPage != null){ - this.currentPage.updateScreen(this.ticksElapsed); - } - - boolean buttonThere = UpdateChecker.doneChecking && UpdateChecker.updateVersion > UpdateChecker.clientVersion; - this.buttonUpdate.visible = buttonThere; - if(buttonThere){ - if(this.ticksElapsed%8 == 0){ - TexturedButton button = (TexturedButton)this.buttonUpdate; - button.setTexturePos(245, button.texturePosY == 0 ? 22 : 0); - } - } - - this.ticksElapsed++; - } - - @SuppressWarnings("unchecked") - @Override - public void keyTyped(char theChar, int key){ - if(key != 1 && this.searchField.isFocused()){ - this.searchField.textboxKeyTyped(theChar, key); - - if(this.currentIndexEntry instanceof BookletEntryAllSearch){ - BookletEntryAllSearch currentEntry = (BookletEntryAllSearch)this.currentIndexEntry; - if(this.searchField.getText() != null && !this.searchField.getText().isEmpty()){ - currentEntry.chapters.clear(); - - for(BookletChapter chapter : currentEntry.allChapters){ - if(chapter.getLocalizedName().toLowerCase().contains(this.searchField.getText().toLowerCase())){ - currentEntry.chapters.add(chapter); - } - } - } - else{ - currentEntry.chapters = (ArrayList)currentEntry.allChapters.clone(); - } - this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex, false); - } - } - else{ - super.keyTyped(theChar, key); - } - } - - @Override - public void onGuiClosed(){ - PersistentClientData.saveBookPage(this.currentIndexEntry, this.currentChapter, this.currentPage, this.pageOpenInIndex); - } - - @Override - protected void mouseClicked(int par1, int par2, int par3){ - this.searchField.mouseClicked(par1, par2, par3); - if(par3 == 0 && this.currentChapter != null){ - this.mouseClicked = true; - } - super.mouseClicked(par1, par2, par3); - } - - @SuppressWarnings("unchecked") - @Override - public void initGui(){ - this.guiLeft = (this.width-this.xSize)/2; - this.guiTop = (this.height-this.ySize)/2; - - this.unicodeRenderer = new FontRenderer(this.mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), this.mc.renderEngine, true); - - this.buttonForward = new TexturedButton(0, this.guiLeft+this.xSize, this.guiTop+this.ySize+2, 164, 0, 18, 10); - this.buttonList.add(this.buttonForward); - - this.buttonBackward = new TexturedButton(1, this.guiLeft-18, this.guiTop+this.ySize+2, 146, 0, 18, 10); - this.buttonList.add(this.buttonBackward); - - this.buttonPreviousScreen = new TexturedButton(2, this.guiLeft+this.xSize/2-7, this.guiTop+this.ySize+2, 182, 0, 15, 10); - this.buttonList.add(this.buttonPreviousScreen); - - this.buttonPreviouslyOpenedGui = new TexturedButton(3, this.guiLeft+this.xSize/3, this.guiTop+this.ySize+2, 245, 44, 11, 15); - this.buttonList.add(this.buttonPreviouslyOpenedGui); - - this.buttonUpdate = new TexturedButton(4, this.guiLeft-11, this.guiTop-11, 245, 0, 11, 11); - this.buttonUpdate.visible = UpdateChecker.doneChecking && UpdateChecker.updateVersion > UpdateChecker.clientVersion; - this.buttonList.add(this.buttonUpdate); - - this.buttonTwitter = new TexturedButton(5, this.guiLeft, this.guiTop, 213, 0, 8, 8); - this.buttonList.add(this.buttonTwitter); - - this.buttonForum = new TexturedButton(6, this.guiLeft, this.guiTop+10, 221, 0, 8, 8); - this.buttonList.add(this.buttonForum); - - this.buttonAchievements = new TexturedButton(7, this.guiLeft+138, this.guiTop, 205, 0, 8, 8); - this.buttonList.add(this.buttonAchievements); - - this.buttonConfig = new TexturedButton(8, this.guiLeft+138, this.guiTop+10, 197, 0, 8, 8); - this.buttonList.add(this.buttonConfig); - - for(int i = 0; i < this.chapterButtons.length; i++){ - this.chapterButtons[i] = new IndexButton(9+i, guiLeft+15, guiTop+10+(i*12), 115, 10, "", this); - this.buttonList.add(this.chapterButtons[i]); - } - - this.searchField = new GuiTextField(this.unicodeRenderer, guiLeft+148, guiTop+162, 66, 10); - this.searchField.setMaxStringLength(30); - this.searchField.setEnableBackgroundDrawing(false); - - this.currentPage = null; - this.currentChapter = null; - this.currentIndexEntry = null; - - if(!PersistentClientData.getBoolean("BookAlreadyOpened")){ - this.openIndexEntry(InitBooklet.chapterIntro.entry, 1, true); - this.openChapter(InitBooklet.chapterIntro, null); - - PersistentClientData.setBoolean("BookAlreadyOpened", true); - } - else{ - PersistentClientData.openLastBookPage(this); - } - } - - @Override - public boolean doesGuiPauseGame(){ - return false; - } - - @Override - public void renderToolTip(ItemStack stack, int x, int y){ - super.renderToolTip(stack, x, y); - } - public void drawHoveringText(List list, int x, int y){ super.func_146283_a(list, x, y); } @@ -298,30 +165,46 @@ public class GuiBooklet extends GuiScreen{ } } - private boolean isGimmicky(){ - return KeyUtil.isControlPressed() && KeyUtil.isShiftPressed() && KeyUtil.isAltPressed(); - } + @SuppressWarnings("unchecked") + @Override + public void keyTyped(char theChar, int key){ + if(key != 1 && this.searchField.isFocused()){ + this.searchField.textboxKeyTyped(theChar, key); - private BookletPage getNextPage(BookletChapter chapter, BookletPage currentPage){ - for(int i = 0; i < chapter.pages.length; i++){ - if(chapter.pages[i] == currentPage){ - if(i+1 < chapter.pages.length){ - return chapter.pages[i+1]; + if(this.currentIndexEntry instanceof BookletEntryAllSearch){ + BookletEntryAllSearch currentEntry = (BookletEntryAllSearch)this.currentIndexEntry; + if(this.searchField.getText() != null && !this.searchField.getText().isEmpty()){ + currentEntry.chapters.clear(); + + for(BookletChapter chapter : currentEntry.allChapters){ + if(chapter.getLocalizedName().toLowerCase().contains(this.searchField.getText().toLowerCase())){ + currentEntry.chapters.add(chapter); + } + } } + else{ + currentEntry.chapters = (ArrayList)currentEntry.allChapters.clone(); + } + this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex, false); } } - return null; + else{ + super.keyTyped(theChar, key); + } } - private BookletPage getPrevPage(BookletChapter chapter, BookletPage currentPage){ - for(int i = 0; i < chapter.pages.length; i++){ - if(chapter.pages[i] == currentPage){ - if(i-1 >= 0){ - return chapter.pages[i-1]; - } - } + @Override + public void renderToolTip(ItemStack stack, int x, int y){ + super.renderToolTip(stack, x, y); + } + + @Override + protected void mouseClicked(int par1, int par2, int par3){ + this.searchField.mouseClicked(par1, par2, par3); + if(par3 == 0 && this.currentChapter != null){ + this.mouseClicked = true; } - return null; + super.mouseClicked(par1, par2, par3); } @Override @@ -429,6 +312,150 @@ public class GuiBooklet extends GuiScreen{ } } + @SuppressWarnings("unchecked") + @Override + public void initGui(){ + this.guiLeft = (this.width-this.xSize)/2; + this.guiTop = (this.height-this.ySize)/2; + + this.unicodeRenderer = new FontRenderer(this.mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), this.mc.renderEngine, true); + + this.buttonForward = new TexturedButton(0, this.guiLeft+this.xSize, this.guiTop+this.ySize+2, 164, 0, 18, 10); + this.buttonList.add(this.buttonForward); + + this.buttonBackward = new TexturedButton(1, this.guiLeft-18, this.guiTop+this.ySize+2, 146, 0, 18, 10); + this.buttonList.add(this.buttonBackward); + + this.buttonPreviousScreen = new TexturedButton(2, this.guiLeft+this.xSize/2-7, this.guiTop+this.ySize+2, 182, 0, 15, 10); + this.buttonList.add(this.buttonPreviousScreen); + + this.buttonPreviouslyOpenedGui = new TexturedButton(3, this.guiLeft+this.xSize/3, this.guiTop+this.ySize+2, 245, 44, 11, 15); + this.buttonList.add(this.buttonPreviouslyOpenedGui); + + this.buttonUpdate = new TexturedButton(4, this.guiLeft-11, this.guiTop-11, 245, 0, 11, 11); + this.buttonUpdate.visible = UpdateChecker.doneChecking && UpdateChecker.updateVersion > UpdateChecker.clientVersion; + this.buttonList.add(this.buttonUpdate); + + this.buttonTwitter = new TexturedButton(5, this.guiLeft, this.guiTop, 213, 0, 8, 8); + this.buttonList.add(this.buttonTwitter); + + this.buttonForum = new TexturedButton(6, this.guiLeft, this.guiTop+10, 221, 0, 8, 8); + this.buttonList.add(this.buttonForum); + + this.buttonAchievements = new TexturedButton(7, this.guiLeft+138, this.guiTop, 205, 0, 8, 8); + this.buttonList.add(this.buttonAchievements); + + this.buttonConfig = new TexturedButton(8, this.guiLeft+138, this.guiTop+10, 197, 0, 8, 8); + this.buttonList.add(this.buttonConfig); + + for(int i = 0; i < this.chapterButtons.length; i++){ + this.chapterButtons[i] = new IndexButton(9+i, guiLeft+15, guiTop+10+(i*12), 115, 10, "", this); + this.buttonList.add(this.chapterButtons[i]); + } + + this.searchField = new GuiTextField(this.unicodeRenderer, guiLeft+148, guiTop+162, 66, 10); + this.searchField.setMaxStringLength(30); + this.searchField.setEnableBackgroundDrawing(false); + + this.currentPage = null; + this.currentChapter = null; + this.currentIndexEntry = null; + + if(!PersistentClientData.getBoolean("BookAlreadyOpened")){ + this.openIndexEntry(InitBooklet.chapterIntro.entry, 1, true); + this.openChapter(InitBooklet.chapterIntro, null); + + PersistentClientData.setBoolean("BookAlreadyOpened", true); + } + else{ + PersistentClientData.openLastBookPage(this); + } + } + + @Override + public void updateScreen(){ + super.updateScreen(); + this.searchField.updateCursorCounter(); + + if(this.currentIndexEntry != null && this.currentChapter != null && this.currentPage != null){ + this.currentPage.updateScreen(this.ticksElapsed); + } + + boolean buttonThere = UpdateChecker.doneChecking && UpdateChecker.updateVersion > UpdateChecker.clientVersion; + this.buttonUpdate.visible = buttonThere; + if(buttonThere){ + if(this.ticksElapsed%8 == 0){ + TexturedButton button = (TexturedButton)this.buttonUpdate; + button.setTexturePos(245, button.texturePosY == 0 ? 22 : 0); + } + } + + this.ticksElapsed++; + } + + @Override + public void onGuiClosed(){ + PersistentClientData.saveBookPage(this.currentIndexEntry, this.currentChapter, this.currentPage, this.pageOpenInIndex); + } + + @Override + public boolean doesGuiPauseGame(){ + return false; + } + + public void openChapter(BookletChapter chapter, BookletPage page){ + if(chapter == null){ + return; + } + + this.searchField.setVisible(false); + this.searchField.setFocused(false); + this.searchField.setText(""); + + this.currentChapter = chapter; + this.currentPage = page != null && this.hasPage(chapter, page) ? page : chapter.pages[0]; + + this.buttonForward.visible = this.getNextPage(chapter, this.currentPage) != null; + this.buttonBackward.visible = this.getPrevPage(chapter, this.currentPage) != null; + this.buttonPreviousScreen.visible = true; + this.buttonPreviouslyOpenedGui.visible = this.parentScreen != null; + + for(GuiButton chapterButton : this.chapterButtons){ + chapterButton.visible = false; + } + } + + private boolean hasPage(BookletChapter chapter, BookletPage page){ + for(BookletPage aPage : chapter.pages){ + if(aPage == page){ + return true; + } + } + return false; + } + + private BookletPage getNextPage(BookletChapter chapter, BookletPage currentPage){ + for(int i = 0; i < chapter.pages.length; i++){ + if(chapter.pages[i] == currentPage){ + if(i+1 < chapter.pages.length){ + return chapter.pages[i+1]; + } + } + } + return null; + } + + private BookletPage getPrevPage(BookletChapter chapter, BookletPage currentPage){ + for(int i = 0; i < chapter.pages.length; i++){ + if(chapter.pages[i] == currentPage){ + if(i-1 >= 0){ + return chapter.pages[i-1]; + } + } + } + return null; + } + @SuppressWarnings("unchecked") public void openIndexEntry(BookletIndexEntry entry, int page, boolean resetTextField){ if(resetTextField){ @@ -474,35 +501,8 @@ public class GuiBooklet extends GuiScreen{ } } - public void openChapter(BookletChapter chapter, BookletPage page){ - if(chapter == null){ - return; - } - - this.searchField.setVisible(false); - this.searchField.setFocused(false); - this.searchField.setText(""); - - this.currentChapter = chapter; - this.currentPage = page != null && this.hasPage(chapter, page) ? page : chapter.pages[0]; - - this.buttonForward.visible = this.getNextPage(chapter, this.currentPage) != null; - this.buttonBackward.visible = this.getPrevPage(chapter, this.currentPage) != null; - this.buttonPreviousScreen.visible = true; - this.buttonPreviouslyOpenedGui.visible = this.parentScreen != null; - - for(GuiButton chapterButton : this.chapterButtons){ - chapterButton.visible = false; - } - } - - private boolean hasPage(BookletChapter chapter, BookletPage page){ - for(BookletPage aPage : chapter.pages){ - if(aPage == page){ - return true; - } - } - return false; + private boolean isGimmicky(){ + return KeyUtil.isControlPressed() && KeyUtil.isShiftPressed() && KeyUtil.isAltPressed(); } private static class IndexButton extends GuiButton{ diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java index 92960c68f..de789faf0 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/BookletPage.java @@ -68,14 +68,6 @@ public class BookletPage{ return this.id; } - public BookletChapter getChapter(){ - return this.chapter; - } - - public void setChapter(BookletChapter chapter){ - this.chapter = chapter; - } - public final String getText(){ if(this.hasNoText){ return null; @@ -89,15 +81,15 @@ public class BookletPage{ return base; } + public BookletPage addTextReplacement(String text, int replacement){ + return this.addTextReplacement(text, Integer.toString(replacement)); + } + public BookletPage addTextReplacement(String text, String replacement){ this.textReplacements.put(text, replacement); return this; } - public BookletPage addTextReplacement(String text, int replacement){ - return this.addTextReplacement(text, Integer.toString(replacement)); - } - public void renderPre(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick, int ticksElapsed){ } @@ -106,10 +98,6 @@ public class BookletPage{ } - public ItemStack[] getItemStacksForPage(){ - return null; - } - public void updateScreen(int ticksElapsed){ } @@ -145,4 +133,16 @@ public class BookletPage{ gui.drawHoveringText(list, x, y); } + + public ItemStack[] getItemStacksForPage(){ + return null; + } + + public BookletChapter getChapter(){ + return this.chapter; + } + + public void setChapter(BookletChapter chapter){ + this.chapter = chapter; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java index 9f3ab850c..9ee55e83f 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java @@ -31,25 +31,14 @@ public class PageCrafting extends BookletPage{ private final IRecipe[] recipes; private int recipePos; - public PageCrafting(int id, IRecipe... recipes){ - super(id); - this.recipes = recipes; - InitBooklet.pagesWithItemStackData.add(this); - } - public PageCrafting(int id, ArrayList recipes){ this(id, recipes.toArray(new IRecipe[recipes.size()])); } - @Override - public ItemStack[] getItemStacksForPage(){ - ItemStack[] stacks = new ItemStack[this.recipes.length]; - for(int i = 0; i < stacks.length; i++){ - if(this.recipes[i] != null){ - stacks[i] = this.recipes[i].getRecipeOutput(); - } - } - return stacks; + public PageCrafting(int id, IRecipe... recipes){ + super(id); + this.recipes = recipes; + InitBooklet.pagesWithItemStackData.add(this); } @Override @@ -60,18 +49,6 @@ public class PageCrafting extends BookletPage{ } } - @Override - public void updateScreen(int ticksElapsed){ - if(ticksElapsed%30 == 0){ - if(this.recipePos+1 >= this.recipes.length){ - this.recipePos = 0; - } - else{ - this.recipePos++; - } - } - } - @SuppressWarnings("unchecked") @Override public void render(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick, int ticksElapsed){ @@ -158,4 +135,27 @@ public class PageCrafting extends BookletPage{ } } } + + @Override + public void updateScreen(int ticksElapsed){ + if(ticksElapsed%30 == 0){ + if(this.recipePos+1 >= this.recipes.length){ + this.recipePos = 0; + } + else{ + this.recipePos++; + } + } + } + + @Override + public ItemStack[] getItemStacksForPage(){ + ItemStack[] stacks = new ItemStack[this.recipes.length]; + for(int i = 0; i < stacks.length; i++){ + if(this.recipes[i] != null){ + stacks[i] = this.recipes[i].getRecipeOutput(); + } + } + return stacks; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java index 0b60b59fd..6ff150226 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java @@ -37,11 +37,6 @@ public class PageCrusherRecipe extends BookletPage{ } } - @Override - public ItemStack[] getItemStacksForPage(){ - return this.recipe == null ? new ItemStack[0] : new ItemStack[]{this.recipe.firstOutput}; - } - @SuppressWarnings("unchecked") @Override public void render(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick, int ticksElapsed){ @@ -89,4 +84,9 @@ public class PageCrusherRecipe extends BookletPage{ } } } + + @Override + public ItemStack[] getItemStacksForPage(){ + return this.recipe == null ? new ItemStack[0] : new ItemStack[]{this.recipe.firstOutput}; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java index 846106d2c..9ef42cd9f 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java @@ -26,6 +26,10 @@ public class PageFurnace extends BookletPage{ private final ItemStack result; private final ItemStack input; + public PageFurnace(int id, ItemStack result){ + this(id, null, result); + } + public PageFurnace(int id, ItemStack input, ItemStack result){ super(id); this.result = result; @@ -33,15 +37,6 @@ public class PageFurnace extends BookletPage{ InitBooklet.pagesWithItemStackData.add(this); } - public PageFurnace(int id, ItemStack result){ - this(id, null, result); - } - - @Override - public ItemStack[] getItemStacksForPage(){ - return this.result == null ? new ItemStack[0] : new ItemStack[]{this.result}; - } - @Override public void renderPre(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick, int ticksElapsed){ if(this.input != null || this.getInputForOutput(this.result) != null){ @@ -91,6 +86,11 @@ public class PageFurnace extends BookletPage{ } } + @Override + public ItemStack[] getItemStacksForPage(){ + return this.result == null ? new ItemStack[0] : new ItemStack[]{this.result}; + } + private ItemStack getInputForOutput(ItemStack output){ for(Object o : FurnaceRecipes.smelting().getSmeltingList().entrySet()){ ItemStack stack = (ItemStack)((Map.Entry)o).getValue(); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java index e0eb71760..4e3a13c84 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageTextOnly.java @@ -30,11 +30,6 @@ public class PageTextOnly extends BookletPage{ return this; } - @Override - public ItemStack[] getItemStacksForPage(){ - return this.stack == null ? new ItemStack[0] : new ItemStack[]{this.stack}; - } - @Override public void renderPre(GuiBooklet gui, int mouseX, int mouseY, boolean mouseClick, int ticksElapsed){ String text = gui.currentPage.getText(); @@ -42,4 +37,9 @@ public class PageTextOnly extends BookletPage{ gui.unicodeRenderer.drawSplitString(text, gui.guiLeft+14, gui.guiTop+9, 115, 0); } } + + @Override + public ItemStack[] getItemStacksForPage(){ + return this.stack == null ? new ItemStack[0] : new ItemStack[]{this.stack}; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index b634709a3..032fa38f7 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -160,8 +160,8 @@ public enum ConfigCrafting{ this(name, category, true); } - ConfigCrafting(String name, ConfigCategories category, String extraText){ - this(name, category, extraText, true); + ConfigCrafting(String name, ConfigCategories category, boolean defaultValue){ + this(name, category, "", defaultValue); } ConfigCrafting(String name, ConfigCategories category, String extraText, boolean defaultValue){ @@ -171,8 +171,8 @@ public enum ConfigCrafting{ this.extraText = extraText.length() > 0 ? extraText+" " : ""; } - ConfigCrafting(String name, ConfigCategories category, boolean defaultValue){ - this(name, category, "", defaultValue); + ConfigCrafting(String name, ConfigCategories category, String extraText){ + this(name, category, extraText, true); } public boolean isEnabled(){ diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index 80586f1f3..b2ca54b17 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -32,6 +32,16 @@ public class CreativeTab extends CreativeTabs{ super(ModUtil.MOD_ID_LOWER); } + @Override + public ItemStack getIconItemStack(){ + return new ItemStack(this.getTabIconItem()); + } + + @Override + public Item getTabIconItem(){ + return Item.getItemFromBlock(InitBlocks.blockPhantomLiquiface); + } + @Override @SideOnly(Side.CLIENT) public void displayAllReleventItems(List list){ @@ -186,16 +196,6 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.itemPotionRingAdvanced); } - @Override - public Item getTabIconItem(){ - return Item.getItemFromBlock(InitBlocks.blockPhantomLiquiface); - } - - @Override - public ItemStack getIconItemStack(){ - return new ItemStack(this.getTabIconItem()); - } - public void add(Item item){ item.getSubItems(item, instance, this.list); } diff --git a/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java b/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java index 55cab5248..b8fa438df 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java @@ -25,19 +25,6 @@ import net.minecraft.item.ItemStack; public class CraftEvent{ - public static void checkAchievements(ItemStack gotten, EntityPlayer player, int type){ - for(int i = 0; i < TheAchievements.values().length; i++){ - TheAchievements ach = TheAchievements.values()[i]; - if(ach.type == type){ - if(gotten != null && ach.ach.theItemStack != null && gotten.getItem() == ach.ach.theItemStack.getItem()){ - if(gotten.getItemDamage() == ach.ach.theItemStack.getItemDamage()){ - player.addStat(ach.ach, 1); - } - } - } - } - } - @SubscribeEvent public void onCraftedEvent(PlayerEvent.ItemCraftedEvent event){ checkAchievements(event.crafting, event.player, InitAchievements.CRAFTING_ACH); @@ -55,4 +42,17 @@ public class CraftEvent{ } } } + + public static void checkAchievements(ItemStack gotten, EntityPlayer player, int type){ + for(int i = 0; i < TheAchievements.values().length; i++){ + TheAchievements ach = TheAchievements.values()[i]; + if(ach.type == type){ + if(gotten != null && ach.ach.theItemStack != null && gotten.getItem() == ach.ach.theItemStack.getItem()){ + if(gotten.getItemDamage() == ach.ach.theItemStack.getItemDamage()){ + player.addStat(ach.ach, 1); + } + } + } + } + } } diff --git a/src/main/java/ellpeck/actuallyadditions/event/WorldDecorationEvent.java b/src/main/java/ellpeck/actuallyadditions/event/WorldDecorationEvent.java index 38a276454..21bc2abf8 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/WorldDecorationEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/WorldDecorationEvent.java @@ -55,22 +55,6 @@ public class WorldDecorationEvent{ } } - private void genPlantNormally(Block plant, int meta, int amount, boolean doIt, Material blockBelow, DecorateBiomeEvent event){ - if(doIt){ - for(int i = 0; i < amount; i++){ - if(event.rand.nextInt(ConfigIntValues.NORMAL_PLANT_CHANCE.getValue()) == 0){ - int genX = event.chunkX+event.rand.nextInt(16)+8; - int genZ = event.chunkZ+event.rand.nextInt(16)+8; - int genY = event.world.getTopSolidOrLiquidBlock(genX, genZ)-1; - - if(event.world.getBlock(genX, genY, genZ).getMaterial() == blockBelow){ - event.world.setBlock(genX, genY+1, genZ, plant, meta, 2); - } - } - } - } - } - private void generateRice(DecorateBiomeEvent event){ if(ConfigBoolValues.DO_RICE_GEN.isEnabled()){ for(int i = 0; i < ConfigIntValues.RICE_AMOUNT.getValue(); i++){ @@ -92,4 +76,20 @@ public class WorldDecorationEvent{ } } } + + private void genPlantNormally(Block plant, int meta, int amount, boolean doIt, Material blockBelow, DecorateBiomeEvent event){ + if(doIt){ + for(int i = 0; i < amount; i++){ + if(event.rand.nextInt(ConfigIntValues.NORMAL_PLANT_CHANCE.getValue()) == 0){ + int genX = event.chunkX+event.rand.nextInt(16)+8; + int genZ = event.chunkZ+event.rand.nextInt(16)+8; + int genY = event.world.getTopSolidOrLiquidBlock(genX, genZ)-1; + + if(event.world.getBlock(genX, genY, genZ).getMaterial() == blockBelow){ + event.world.setBlock(genX, genY+1, genZ, plant, meta, 2); + } + } + } + } + } } diff --git a/src/main/java/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java b/src/main/java/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java index dc80f97f3..b414c9e0a 100644 --- a/src/main/java/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/gen/JamVillagerTradeHandler.java @@ -40,6 +40,15 @@ public class JamVillagerTradeHandler implements VillagerRegistry.IVillageTradeHa this.addWants("dustGlowstone", 12, 22); } + public void addWants(String oredictName, int minSize, int maxSize){ + ArrayList stacks = (ArrayList)OreDictionary.getOres(oredictName, false); + trades.add(new Trade(stacks, minSize, maxSize)); + } + + public void addWants(ItemStack stack, int minSize, int maxSize){ + trades.add(new Trade(stack, minSize, maxSize)); + } + @Override @SuppressWarnings("all") public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random rand){ @@ -67,15 +76,6 @@ public class JamVillagerTradeHandler implements VillagerRegistry.IVillageTradeHa } } - public void addWants(String oredictName, int minSize, int maxSize){ - ArrayList stacks = (ArrayList)OreDictionary.getOres(oredictName, false); - trades.add(new Trade(stacks, minSize, maxSize)); - } - - public void addWants(ItemStack stack, int minSize, int maxSize){ - trades.add(new Trade(stack, minSize, maxSize)); - } - public static class Trade{ public final ArrayList wants = new ArrayList(); diff --git a/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java b/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java index d75d9d003..b505b6a4a 100644 --- a/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java +++ b/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java @@ -52,6 +52,11 @@ public class OreGen implements IWorldGenerator{ } } + @SuppressWarnings("unused") + private void generateNether(World world, Random random, int x, int z){ + + } + @SuppressWarnings("unused") private void generateEnd(World world, Random random, int x, int z){ @@ -63,11 +68,6 @@ public class OreGen implements IWorldGenerator{ } } - @SuppressWarnings("unused") - private void generateNether(World world, Random random, int x, int z){ - - } - public void addOreSpawn(Block block, int meta, Block blockIn, World world, Random random, int blockXPos, int blockZPos, int maxVeinSize, int chancesToSpawn, int minY, int maxY){ if(maxY > minY){ int yDiff = maxY-minY; diff --git a/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java b/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java index e63ae90b0..5718eb2a0 100644 --- a/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java +++ b/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentCustomCropField.java @@ -68,17 +68,8 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous return true; } - private Block getRandomCropType(Random rand){ - switch(rand.nextInt(4)){ - case 0: - return InitBlocks.blockFlax; - case 1: - return InitBlocks.blockCoffee; - case 2: - return InitBlocks.blockRice; - default: - return InitBlocks.blockCanola; - } + public void fillWithBlocks(World world, StructureBoundingBox sbb, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block block){ + this.fillWithBlocks(world, sbb, minX, minY, minZ, maxX, maxY, maxZ, block, block, false); } public void spawnActualHouse(World world, Random rand, StructureBoundingBox sbb){ @@ -106,7 +97,16 @@ public class VillageComponentCustomCropField extends StructureVillagePieces.Hous } } - public void fillWithBlocks(World world, StructureBoundingBox sbb, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block block){ - this.fillWithBlocks(world, sbb, minX, minY, minZ, maxX, maxY, maxZ, block, block, false); + private Block getRandomCropType(Random rand){ + switch(rand.nextInt(4)){ + case 0: + return InitBlocks.blockFlax; + case 1: + return InitBlocks.blockCoffee; + case 2: + return InitBlocks.blockRice; + default: + return InitBlocks.blockCanola; + } } } diff --git a/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java b/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java index a554781f9..31bddc791 100644 --- a/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java +++ b/src/main/java/ellpeck/actuallyadditions/gen/VillageComponentJamHouse.java @@ -73,6 +73,10 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{ return true; } + public void fillWithBlocks(World world, StructureBoundingBox sbb, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block block){ + this.fillWithBlocks(world, sbb, minX, minY, minZ, maxX, maxY, maxZ, block, block, false); + } + public void spawnActualHouse(World world, Random rand, StructureBoundingBox sbb){ //Base this.fillWithBlocks(world, sbb, 1, 0, 8, 9, 0, 10, Blocks.grass); @@ -193,10 +197,6 @@ public class VillageComponentJamHouse extends StructureVillagePieces.House1{ this.placeBlockAtCurrentPosition(world, Blocks.torch, 0, 8, 3, 6, sbb); } - public void fillWithBlocks(World world, StructureBoundingBox sbb, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block block){ - this.fillWithBlocks(world, sbb, minX, minY, minZ, maxX, maxY, maxZ, block, block, false); - } - @Override protected int getVillagerType(int par1){ return ConfigIntValues.JAM_VILLAGER_ID.getValue(); diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java index 1e8e4eeef..a02841045 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java @@ -43,11 +43,6 @@ public class ContainerBreaker extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.breaker.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 9; @@ -96,4 +91,9 @@ public class ContainerBreaker extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.breaker.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java index 1eecc4c23..d656642af 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java @@ -47,11 +47,6 @@ public class ContainerCanolaPress extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.press.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 3; @@ -109,4 +104,9 @@ public class ContainerCanolaPress extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.press.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java index cd195efef..a512c3476 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java @@ -40,11 +40,6 @@ public class ContainerCoalGenerator extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.generator.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 1; @@ -97,4 +92,9 @@ public class ContainerCoalGenerator extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.generator.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java index 0db5c83ca..04b1d4345 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java @@ -57,11 +57,6 @@ public class ContainerCoffeeMachine extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.machine.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 13; @@ -136,4 +131,9 @@ public class ContainerCoffeeMachine extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.machine.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java index 0d9432701..21f0edc73 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java @@ -55,30 +55,6 @@ public class ContainerCrafter extends Container{ this.onCraftMatrixChanged(this.craftMatrix); } - @Override - public void onCraftMatrixChanged(IInventory inv){ - this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.world)); - } - - @Override - public void onContainerClosed(EntityPlayer player){ - super.onContainerClosed(player); - - if(!this.world.isRemote){ - for(int i = 0; i < 9; ++i){ - ItemStack stack = this.craftMatrix.getStackInSlotOnClosing(i); - if(stack != null){ - player.dropPlayerItemWithRandomChoice(stack, false); - } - } - } - } - - @Override - public boolean canInteractWith(EntityPlayer player){ - return true; - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ ItemStack stack = null; @@ -119,4 +95,28 @@ public class ContainerCrafter extends Container{ } return stack; } + + @Override + public void onContainerClosed(EntityPlayer player){ + super.onContainerClosed(player); + + if(!this.world.isRemote){ + for(int i = 0; i < 9; ++i){ + ItemStack stack = this.craftMatrix.getStackInSlotOnClosing(i); + if(stack != null){ + player.dropPlayerItemWithRandomChoice(stack, false); + } + } + } + } + + @Override + public void onCraftMatrixChanged(IInventory inv){ + this.craftResult.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(this.craftMatrix, this.world)); + } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return true; + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java index 869ba827e..70c6a92b5 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java @@ -65,32 +65,6 @@ public class ContainerDrill extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.drillInventory.isUseableByPlayer(player); - } - - @Override - public void onContainerClosed(EntityPlayer player){ - ItemStack stack = inventory.getCurrentItem(); - if(stack != null && stack.getItem() instanceof ItemDrill){ - ((ItemDrill)stack.getItem()).writeSlotsToNBT(this.drillInventory.slots, inventory.getCurrentItem()); - } - super.onContainerClosed(player); - } - - @Override - public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer player){ - //par3 appears to be the type of clicking - //par3 == 2 appears to be one of the number keys being hit - if(par3 == 2 && par2 == inventory.currentItem){ - return null; - } - else{ - return super.slotClick(par1, par2, par3, player); - } - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 5; @@ -144,6 +118,32 @@ public class ContainerDrill extends Container{ return null; } + @Override + public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer player){ + //par3 appears to be the type of clicking + //par3 == 2 appears to be one of the number keys being hit + if(par3 == 2 && par2 == inventory.currentItem){ + return null; + } + else{ + return super.slotClick(par1, par2, par3, player); + } + } + + @Override + public void onContainerClosed(EntityPlayer player){ + ItemStack stack = inventory.getCurrentItem(); + if(stack != null && stack.getItem() instanceof ItemDrill){ + ((ItemDrill)stack.getItem()).writeSlotsToNBT(this.drillInventory.slots, inventory.getCurrentItem()); + } + super.onContainerClosed(player); + } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.drillInventory.isUseableByPlayer(player); + } + public static class InventoryDrill implements IInventory{ public ItemStack[] slots = new ItemStack[SLOT_AMOUNT]; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java index d83695ed9..4b2434faf 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java @@ -43,11 +43,6 @@ public class ContainerDropper extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.dropper.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 9; @@ -96,4 +91,9 @@ public class ContainerDropper extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.dropper.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java index 97f9795a7..4f9a73f71 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java @@ -50,13 +50,13 @@ public class ContainerEnergizer extends Container{ final int finalI = i; this.addSlotToContainer(new Slot(inventory, inventory.getSizeInventory()-1-i, 102, 19+i*18){ @Override - public int getSlotStackLimit(){ - return 1; + public boolean isItemValid(ItemStack stack){ + return stack != null && stack.getItem().isValidArmor(stack, finalI, finalPlayer); } @Override - public boolean isItemValid(ItemStack stack){ - return stack != null && stack.getItem().isValidArmor(stack, finalI, finalPlayer); + public int getSlotStackLimit(){ + return 1; } @Override @@ -68,11 +68,6 @@ public class ContainerEnergizer extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.energizer.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 2; @@ -132,4 +127,9 @@ public class ContainerEnergizer extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.energizer.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java index 5786c0434..cd00b3586 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java @@ -50,13 +50,13 @@ public class ContainerEnervator extends Container{ final int finalI = i; this.addSlotToContainer(new Slot(inventory, inventory.getSizeInventory()-1-i, 102, 19+i*18){ @Override - public int getSlotStackLimit(){ - return 1; + public boolean isItemValid(ItemStack stack){ + return stack != null && stack.getItem().isValidArmor(stack, finalI, finalPlayer); } @Override - public boolean isItemValid(ItemStack stack){ - return stack != null && stack.getItem().isValidArmor(stack, finalI, finalPlayer); + public int getSlotStackLimit(){ + return 1; } @Override @@ -68,11 +68,6 @@ public class ContainerEnervator extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.enervator.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 2; @@ -132,4 +127,9 @@ public class ContainerEnervator extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.enervator.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java index 6fc97a1ef..c80aa3719 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java @@ -38,11 +38,6 @@ public class ContainerFeeder extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.tileFeeder.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 1; @@ -91,4 +86,9 @@ public class ContainerFeeder extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.tileFeeder.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java index 805489060..5c8eac2c2 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java @@ -46,11 +46,6 @@ public class ContainerFermentingBarrel extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.barrel.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 4; @@ -108,4 +103,9 @@ public class ContainerFermentingBarrel extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.barrel.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java index 834d573c5..8b00bd168 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java @@ -42,11 +42,6 @@ public class ContainerFluidCollector extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.collector.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 2; @@ -106,4 +101,9 @@ public class ContainerFluidCollector extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.collector.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java index 838a6bdc7..78cf29182 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java @@ -44,11 +44,6 @@ public class ContainerFurnaceDouble extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.tileFurnace.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 4; @@ -110,4 +105,9 @@ public class ContainerFurnaceDouble extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.tileFurnace.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java index 3d574671b..b22544c21 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java @@ -43,11 +43,6 @@ public class ContainerGiantChest extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.tileChest.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 117; @@ -96,4 +91,9 @@ public class ContainerGiantChest extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.tileChest.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java index 6d9fcd1e5..086a8d78f 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java @@ -50,11 +50,6 @@ public class ContainerGrinder extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.tileGrinder.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = this.isDouble ? 6 : 3; @@ -121,4 +116,9 @@ public class ContainerGrinder extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.tileGrinder.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java index cd1963386..71703384c 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java @@ -54,22 +54,6 @@ public class ContainerInputter extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.tileInputter.isUseableByPlayer(player); - } - - @Override - public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer player){ - if(par1 >= 0 && par1 < this.inventorySlots.size() && this.getSlot(par1) instanceof SlotFilter){ - //Calls the Filter's SlotClick function - return ((SlotFilter)getSlot(par1)).slotClick(player, par2); - } - else{ - return super.slotClick(par1, par2, par3, player); - } - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = this.isAdvanced ? 25 : 1; @@ -118,4 +102,20 @@ public class ContainerInputter extends Container{ } return null; } + + @Override + public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer player){ + if(par1 >= 0 && par1 < this.inventorySlots.size() && this.getSlot(par1) instanceof SlotFilter){ + //Calls the Filter's SlotClick function + return ((SlotFilter)getSlot(par1)).slotClick(player, par2); + } + else{ + return super.slotClick(par1, par2, par3, player); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.tileInputter.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java index a90f8e5d0..42f660411 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java @@ -44,11 +44,6 @@ public class ContainerOilGenerator extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.generator.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 2; @@ -101,4 +96,9 @@ public class ContainerOilGenerator extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.generator.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOreMagnet.java index f25a5c546..497d2e495 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOreMagnet.java @@ -46,11 +46,6 @@ public class ContainerOreMagnet extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.magnet.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 3; @@ -103,4 +98,9 @@ public class ContainerOreMagnet extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.magnet.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java index 40aff5234..4b31aa261 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java @@ -43,11 +43,6 @@ public class ContainerPhantomPlacer extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.placer.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 9; @@ -96,4 +91,9 @@ public class ContainerPhantomPlacer extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.placer.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java index 2d2330470..ac23ab05c 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java @@ -41,11 +41,6 @@ public class ContainerRepairer extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.tileRepairer.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 2; @@ -98,4 +93,9 @@ public class ContainerRepairer extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.tileRepairer.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java index 9f9c431dc..bb2d00993 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerSmileyCloud.java @@ -16,13 +16,13 @@ import net.minecraft.item.ItemStack; public class ContainerSmileyCloud extends Container{ - @Override - public boolean canInteractWith(EntityPlayer player){ - return true; - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return true; + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java index 4b5aae67d..3de6f8969 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java @@ -40,11 +40,6 @@ public class ContainerXPSolidifier extends Container{ } } - @Override - public boolean canInteractWith(EntityPlayer player){ - return this.solidifier.isUseableByPlayer(player); - } - @Override public ItemStack transferStackInSlot(EntityPlayer player, int slot){ final int inventoryStart = 1; @@ -89,4 +84,9 @@ public class ContainerXPSolidifier extends Container{ } return null; } + + @Override + public boolean canInteractWith(EntityPlayer player){ + return this.solidifier.isUseableByPlayer(player); + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java index 41de14c8f..0df6a6b3e 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java @@ -178,12 +178,12 @@ public class GuiHandler implements IGuiHandler{ public boolean checkTileEntity; - GuiTypes(boolean checkTileEntity){ - this.checkTileEntity = checkTileEntity; - } - GuiTypes(){ this(true); } + + GuiTypes(boolean checkTileEntity){ + this.checkTileEntity = checkTileEntity; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java index 947b65a7c..dced1f3ca 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiBreaker.java @@ -34,6 +34,11 @@ public class GuiBreaker extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.breaker.getInventoryName()); @@ -49,9 +54,4 @@ public class GuiBreaker extends GuiContainer{ this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java index 1db1817d4..e494349d0 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCanolaPress.java @@ -37,6 +37,20 @@ public class GuiCanolaPress extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text1 = this.press.storage.getEnergyStored()+"/"+this.press.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + + String text2 = this.press.tank.getFluidAmount()+"/"+this.press.tank.getCapacity()+" mB "+StringUtil.localize("fluid.canolaoil"); + if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text2), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.press.getInventoryName()); @@ -67,18 +81,4 @@ public class GuiCanolaPress extends GuiContainer{ drawTexturedModalRect(this.guiLeft+83, this.guiTop+32, 176, 0, 12, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text1 = this.press.storage.getEnergyStored()+"/"+this.press.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - - String text2 = this.press.tank.getFluidAmount()+"/"+this.press.tank.getCapacity()+" mB "+StringUtil.localize("fluid.canolaoil"); - if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text2), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java index 5595ef7ff..2f88d52dc 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoalGenerator.java @@ -36,6 +36,15 @@ public class GuiCoalGenerator extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text1 = this.generator.storage.getEnergyStored()+"/"+this.generator.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.generator.getInventoryName()); @@ -61,13 +70,4 @@ public class GuiCoalGenerator extends GuiContainer{ this.drawTexturedModalRect(guiLeft+87, guiTop+27+12-i, 176, 96-i, 14, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text1 = this.generator.storage.getEnergyStored()+"/"+this.generator.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java index 495d2bc6c..9d9ef0e29 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiCoffeeMachine.java @@ -62,8 +62,22 @@ public class GuiCoffeeMachine extends GuiContainer{ } @Override - public void actionPerformed(GuiButton button){ - PacketHandler.theNetwork.sendToServer(new PacketGuiButton(x, y, z, world, button.id, Minecraft.getMinecraft().thePlayer)); + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + + String text1 = this.machine.storage.getEnergyStored()+"/"+this.machine.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+16 && y >= guiTop+5 && x <= guiLeft+23 && y <= guiTop+89){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + String text3 = this.machine.tank.getFluidAmount()+"/"+this.machine.tank.getCapacity()+" mB "+FluidRegistry.WATER.getLocalizedName(this.machine.tank.getFluid()); + if(x >= guiLeft+27 && y >= guiTop+5 && x <= guiLeft+33 && y <= guiTop+70){ + this.func_146283_a(Collections.singletonList(text3), x, y); + } + + String text2 = this.machine.coffeeCacheAmount+"/"+this.machine.coffeeCacheMaxAmount+" "+StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.coffee"); + if(x >= guiLeft+40 && y >= guiTop+25 && x <= guiLeft+49 && y <= guiTop+56){ + this.func_146283_a(Collections.singletonList(text2), x, y); + } } @Override @@ -105,21 +119,7 @@ public class GuiCoffeeMachine extends GuiContainer{ } @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - - String text1 = this.machine.storage.getEnergyStored()+"/"+this.machine.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+16 && y >= guiTop+5 && x <= guiLeft+23 && y <= guiTop+89){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - String text3 = this.machine.tank.getFluidAmount()+"/"+this.machine.tank.getCapacity()+" mB "+FluidRegistry.WATER.getLocalizedName(this.machine.tank.getFluid()); - if(x >= guiLeft+27 && y >= guiTop+5 && x <= guiLeft+33 && y <= guiTop+70){ - this.func_146283_a(Collections.singletonList(text3), x, y); - } - - String text2 = this.machine.coffeeCacheAmount+"/"+this.machine.coffeeCacheMaxAmount+" "+StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.coffee"); - if(x >= guiLeft+40 && y >= guiTop+25 && x <= guiLeft+49 && y <= guiTop+56){ - this.func_146283_a(Collections.singletonList(text2), x, y); - } + public void actionPerformed(GuiButton button){ + PacketHandler.theNetwork.sendToServer(new PacketGuiButton(x, y, z, world, button.id, Minecraft.getMinecraft().thePlayer)); } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java index 6d0a9af12..d346981cd 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiDropper.java @@ -34,6 +34,11 @@ public class GuiDropper extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.dropper.getInventoryName()); @@ -49,9 +54,4 @@ public class GuiDropper extends GuiContainer{ this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java index a7d3b8584..8523a76ae 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnergizer.java @@ -36,6 +36,15 @@ public class GuiEnergizer extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text1 = this.energizer.storage.getEnergyStored()+"/"+this.energizer.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+57 && y >= guiTop+6 && x <= guiLeft+72 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.energizer.getInventoryName()); @@ -56,13 +65,4 @@ public class GuiEnergizer extends GuiContainer{ drawTexturedModalRect(this.guiLeft+57, this.guiTop+89-i, 176, 0, 16, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text1 = this.energizer.storage.getEnergyStored()+"/"+this.energizer.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+57 && y >= guiTop+6 && x <= guiLeft+72 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java index d7b0e3caf..3da69fb75 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiEnervator.java @@ -36,6 +36,15 @@ public class GuiEnervator extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text1 = this.enervator.storage.getEnergyStored()+"/"+this.enervator.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+57 && y >= guiTop+6 && x <= guiLeft+72 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.enervator.getInventoryName()); @@ -56,13 +65,4 @@ public class GuiEnervator extends GuiContainer{ drawTexturedModalRect(this.guiLeft+57, this.guiTop+89-i, 176, 0, 16, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text1 = this.enervator.storage.getEnergyStored()+"/"+this.enervator.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+57 && y >= guiTop+6 && x <= guiLeft+72 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java index 36f9027bc..ab39d61d3 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFeeder.java @@ -39,6 +39,15 @@ public class GuiFeeder extends GuiContainer{ this.ySize = 70+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + if(x >= guiLeft+69 && y >= guiTop+30 && x <= guiLeft+69+10 && y <= guiTop+30+10){ + String[] array = new String[]{(this.tileFeeder.currentAnimalAmount+" "+StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.animals")), ((this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < ConfigIntValues.FEEDER_THRESHOLD.getValue()) ? StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.enoughToBreed") : (this.tileFeeder.currentAnimalAmount >= ConfigIntValues.FEEDER_THRESHOLD.getValue() ? StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.tooMany") : StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.notEnough")))}; + this.func_146283_a(Arrays.asList(array), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.tileFeeder.getInventoryName()); @@ -65,13 +74,4 @@ public class GuiFeeder extends GuiContainer{ this.drawTexturedModalRect(guiLeft+70, guiTop+31, 192, 24, 8, 8); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - if(x >= guiLeft+69 && y >= guiTop+30 && x <= guiLeft+69+10 && y <= guiTop+30+10){ - String[] array = new String[]{(this.tileFeeder.currentAnimalAmount+" "+StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.animals")), ((this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < ConfigIntValues.FEEDER_THRESHOLD.getValue()) ? StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.enoughToBreed") : (this.tileFeeder.currentAnimalAmount >= ConfigIntValues.FEEDER_THRESHOLD.getValue() ? StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.tooMany") : StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.notEnough")))}; - this.func_146283_a(Arrays.asList(array), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java index bd0bf818e..a30f15b5f 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFermentingBarrel.java @@ -37,6 +37,21 @@ public class GuiFermentingBarrel extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + + String text1 = this.press.canolaTank.getFluidAmount()+"/"+this.press.canolaTank.getCapacity()+" mB "+StringUtil.localize("fluid.canolaoil"); + if(x >= guiLeft+61 && y >= guiTop+6 && x <= guiLeft+76 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + + String text2 = this.press.oilTank.getFluidAmount()+"/"+this.press.oilTank.getCapacity()+" mB "+StringUtil.localize("fluid.oil"); + if(x >= guiLeft+99 && y >= guiTop+6 && x <= guiLeft+114 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text2), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.press.getInventoryName()); @@ -67,19 +82,4 @@ public class GuiFermentingBarrel extends GuiContainer{ drawTexturedModalRect(this.guiLeft+82, this.guiTop+34, 176, 0, 12, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - - String text1 = this.press.canolaTank.getFluidAmount()+"/"+this.press.canolaTank.getCapacity()+" mB "+StringUtil.localize("fluid.canolaoil"); - if(x >= guiLeft+61 && y >= guiTop+6 && x <= guiLeft+76 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - - String text2 = this.press.oilTank.getFluidAmount()+"/"+this.press.oilTank.getCapacity()+" mB "+StringUtil.localize("fluid.oil"); - if(x >= guiLeft+99 && y >= guiTop+6 && x <= guiLeft+114 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text2), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java index b8d8bf270..375515255 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFluidCollector.java @@ -36,6 +36,16 @@ public class GuiFluidCollector extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + + String text2 = this.collector.tank.getFluidAmount()+"/"+this.collector.tank.getCapacity()+" mB "+(this.collector.tank.getFluidAmount() > 0 ? this.collector.tank.getFluid().getLocalizedName() : ""); + if(x >= guiLeft+68 && y >= guiTop+6 && x <= guiLeft+83 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text2), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.collector.getInventoryName()); @@ -56,14 +66,4 @@ public class GuiFluidCollector extends GuiContainer{ drawTexturedModalRect(this.guiLeft+68, this.guiTop+89-i, 176, 0, 16, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - - String text2 = this.collector.tank.getFluidAmount()+"/"+this.collector.tank.getCapacity()+" mB "+(this.collector.tank.getFluidAmount() > 0 ? this.collector.tank.getFluid().getLocalizedName() : ""); - if(x >= guiLeft+68 && y >= guiTop+6 && x <= guiLeft+83 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text2), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java index a44bf3553..bb8810ec6 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiFurnaceDouble.java @@ -36,6 +36,15 @@ public class GuiFurnaceDouble extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text = this.tileFurnace.storage.getEnergyStored()+"/"+this.tileFurnace.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+28 && y >= guiTop+6 && x <= guiLeft+43 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.tileFurnace.getInventoryName()); @@ -64,13 +73,4 @@ public class GuiFurnaceDouble extends GuiContainer{ this.drawTexturedModalRect(this.guiLeft+101, this.guiTop+40, 176, 22, 24, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text = this.tileFurnace.storage.getEnergyStored()+"/"+this.tileFurnace.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+28 && y >= guiTop+6 && x <= guiLeft+43 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java index 80bd3c889..a0549f19c 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiGrinder.java @@ -30,6 +30,7 @@ public class GuiGrinder extends GuiContainer{ private static final ResourceLocation resLocDouble = AssetUtil.getGuiLocation("guiGrinderDouble"); private TileEntityGrinder tileGrinder; private boolean isDouble; + public GuiGrinder(InventoryPlayer inventoryPlayer, TileEntityBase tile){ this(inventoryPlayer, tile, false); } @@ -42,6 +43,15 @@ public class GuiGrinder extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text = this.tileGrinder.storage.getEnergyStored()+"/"+this.tileGrinder.storage.getMaxEnergyStored()+" RF"; + if((this.isDouble && x >= guiLeft+14 && y >= guiTop+6 && x <= guiLeft+29 && y <= guiTop+88) || (!this.isDouble && x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88)){ + this.func_146283_a(Collections.singletonList(text), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.tileGrinder.getInventoryName()); @@ -73,15 +83,6 @@ public class GuiGrinder extends GuiContainer{ } } - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text = this.tileGrinder.storage.getEnergyStored()+"/"+this.tileGrinder.storage.getMaxEnergyStored()+" RF"; - if((this.isDouble && x >= guiLeft+14 && y >= guiTop+6 && x <= guiLeft+29 && y <= guiTop+88) || (!this.isDouble && x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88)){ - this.func_146283_a(Collections.singletonList(text), x, y); - } - } - public static class GuiGrinderDouble extends GuiGrinder{ public GuiGrinderDouble(InventoryPlayer inventory, TileEntityBase tile){ super(inventory, tile, true); diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java index b50346922..7992081d8 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java @@ -76,21 +76,6 @@ public class GuiInputter extends GuiContainer{ this.isAdvanced = isAdvanced; } - @Override - public void drawGuiContainerForegroundLayer(int x, int y){ - AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.tileInputter.getInventoryName()); - } - - @Override - public void updateScreen(){ - super.updateScreen(); - - this.fieldPutStart.updateCursorCounter(); - this.fieldPutEnd.updateCursorCounter(); - this.fieldPullStart.updateCursorCounter(); - this.fieldPullEnd.updateCursorCounter(); - } - @SuppressWarnings("unchecked") @Override public void initGui(){ @@ -131,90 +116,6 @@ public class GuiInputter extends GuiContainer{ this.buttonList.add(new TinyButton(TileEntityInputter.OKAY_BUTTON_ID, guiLeft+84, guiTop+80+(isAdvanced ? OFFSET_ADVANCED : 0))); } - @Override - protected void mouseClicked(int par1, int par2, int par3){ - this.fieldPutStart.mouseClicked(par1, par2, par3); - this.fieldPutEnd.mouseClicked(par1, par2, par3); - this.fieldPullStart.mouseClicked(par1, par2, par3); - this.fieldPullEnd.mouseClicked(par1, par2, par3); - - super.mouseClicked(par1, par2, par3); - } - - @Override - public void keyTyped(char theChar, int key){ - if(key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER){ - if(this.fieldPutStart.isFocused()){ - this.setVariable(this.fieldPutStart, 0); - } - if(this.fieldPutEnd.isFocused()){ - this.setVariable(this.fieldPutEnd, 1); - } - if(this.fieldPullStart.isFocused()){ - this.setVariable(this.fieldPullStart, 2); - } - if(this.fieldPullEnd.isFocused()){ - this.setVariable(this.fieldPullEnd, 3); - } - } - else if(Character.isDigit(theChar) || key == Keyboard.KEY_BACK || key == Keyboard.KEY_DELETE || key == Keyboard.KEY_LEFT || key == Keyboard.KEY_RIGHT){ - this.fieldPutStart.textboxKeyTyped(theChar, key); - this.fieldPutEnd.textboxKeyTyped(theChar, key); - this.fieldPullStart.textboxKeyTyped(theChar, key); - this.fieldPullEnd.textboxKeyTyped(theChar, key); - } - else{ - super.keyTyped(theChar, key); - } - } - - public void setVariable(GuiTextField field, int sendInt){ - if(!field.getText().isEmpty()){ - this.sendPacket(parse(field.getText()), sendInt); - field.setText(""); - } - } - - private int parse(String theInt){ - try{ - return Integer.parseInt(theInt); - } - catch(Exception e){ - return -1; - } - } - - private void sendPacket(int text, int textID){ - PacketHandler.theNetwork.sendToServer(new PacketGuiNumber(x, y, z, world, text, textID, Minecraft.getMinecraft().thePlayer)); - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop+93+(isAdvanced ? OFFSET_ADVANCED : 0), 0, 0, 176, 86); - - this.mc.getTextureManager().bindTexture(this.isAdvanced ? resLocAdvanced : resLoc); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93+(isAdvanced ? OFFSET_ADVANCED : 0)); - - this.fontRendererObj.drawString(StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.pull"), guiLeft+22+3, guiTop+32+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.put"), guiLeft+107+3, guiTop+32+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - - this.fontRendererObj.drawString(sideString[tileInputter.sideToPull+1], guiLeft+24+1, guiTop+45+3+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - this.fontRendererObj.drawString(sideString[tileInputter.sideToPut+1], guiLeft+109+1, guiTop+45+3+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); - - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutStart), guiLeft+99, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutEnd), guiLeft+136, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullStart), guiLeft+14, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullEnd), guiLeft+51, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); - - this.fieldPutStart.drawTextBox(); - this.fieldPutEnd.drawTextBox(); - this.fieldPullStart.drawTextBox(); - this.fieldPullEnd.drawTextBox(); - } - @Override @SuppressWarnings("unchecked") public void drawScreen(int x, int y, float f){ @@ -257,6 +158,105 @@ public class GuiInputter extends GuiContainer{ } } + @Override + public void drawGuiContainerForegroundLayer(int x, int y){ + AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.tileInputter.getInventoryName()); + } + + @Override + public void drawGuiContainerBackgroundLayer(float f, int x, int y){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.drawTexturedModalRect(this.guiLeft, this.guiTop+93+(isAdvanced ? OFFSET_ADVANCED : 0), 0, 0, 176, 86); + + this.mc.getTextureManager().bindTexture(this.isAdvanced ? resLocAdvanced : resLoc); + this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93+(isAdvanced ? OFFSET_ADVANCED : 0)); + + this.fontRendererObj.drawString(StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.pull"), guiLeft+22+3, guiTop+32+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRendererObj.drawString(StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.put"), guiLeft+107+3, guiTop+32+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + + this.fontRendererObj.drawString(sideString[tileInputter.sideToPull+1], guiLeft+24+1, guiTop+45+3+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + this.fontRendererObj.drawString(sideString[tileInputter.sideToPut+1], guiLeft+109+1, guiTop+45+3+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_GRAY_TEXT); + + this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutStart), guiLeft+99, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPutEnd), guiLeft+136, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullStart), guiLeft+14, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + this.fontRendererObj.drawString(Integer.toString(this.tileInputter.slotToPullEnd), guiLeft+51, guiTop+67+(isAdvanced ? OFFSET_ADVANCED : 0), StringUtil.DECIMAL_COLOR_WHITE); + + this.fieldPutStart.drawTextBox(); + this.fieldPutEnd.drawTextBox(); + this.fieldPullStart.drawTextBox(); + this.fieldPullEnd.drawTextBox(); + } + + @Override + protected void mouseClicked(int par1, int par2, int par3){ + this.fieldPutStart.mouseClicked(par1, par2, par3); + this.fieldPutEnd.mouseClicked(par1, par2, par3); + this.fieldPullStart.mouseClicked(par1, par2, par3); + this.fieldPullEnd.mouseClicked(par1, par2, par3); + + super.mouseClicked(par1, par2, par3); + } + + @Override + public void keyTyped(char theChar, int key){ + if(key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER){ + if(this.fieldPutStart.isFocused()){ + this.setVariable(this.fieldPutStart, 0); + } + if(this.fieldPutEnd.isFocused()){ + this.setVariable(this.fieldPutEnd, 1); + } + if(this.fieldPullStart.isFocused()){ + this.setVariable(this.fieldPullStart, 2); + } + if(this.fieldPullEnd.isFocused()){ + this.setVariable(this.fieldPullEnd, 3); + } + } + else if(Character.isDigit(theChar) || key == Keyboard.KEY_BACK || key == Keyboard.KEY_DELETE || key == Keyboard.KEY_LEFT || key == Keyboard.KEY_RIGHT){ + this.fieldPutStart.textboxKeyTyped(theChar, key); + this.fieldPutEnd.textboxKeyTyped(theChar, key); + this.fieldPullStart.textboxKeyTyped(theChar, key); + this.fieldPullEnd.textboxKeyTyped(theChar, key); + } + else{ + super.keyTyped(theChar, key); + } + } + + @Override + public void updateScreen(){ + super.updateScreen(); + + this.fieldPutStart.updateCursorCounter(); + this.fieldPutEnd.updateCursorCounter(); + this.fieldPullStart.updateCursorCounter(); + this.fieldPullEnd.updateCursorCounter(); + } + + public void setVariable(GuiTextField field, int sendInt){ + if(!field.getText().isEmpty()){ + this.sendPacket(parse(field.getText()), sendInt); + field.setText(""); + } + } + + private void sendPacket(int text, int textID){ + PacketHandler.theNetwork.sendToServer(new PacketGuiNumber(x, y, z, world, text, textID, Minecraft.getMinecraft().thePlayer)); + } + + private int parse(String theInt){ + try{ + return Integer.parseInt(theInt); + } + catch(Exception e){ + return -1; + } + } + @Override public void actionPerformed(GuiButton button){ if(button.id == TileEntityInputter.OKAY_BUTTON_ID){ diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java index 21d8daeeb..fac78a7b0 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOilGenerator.java @@ -37,6 +37,19 @@ public class GuiOilGenerator extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text1 = this.generator.storage.getEnergyStored()+"/"+this.generator.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + String text2 = this.generator.tank.getFluidAmount()+"/"+this.generator.tank.getCapacity()+" mB "+StringUtil.localize("fluid.oil"); + if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text2), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.generator.getInventoryName()); @@ -67,17 +80,4 @@ public class GuiOilGenerator extends GuiContainer{ this.drawTexturedModalRect(guiLeft+72, guiTop+44+12-i, 176, 96-i, 14, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text1 = this.generator.storage.getEnergyStored()+"/"+this.generator.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - String text2 = this.generator.tank.getFluidAmount()+"/"+this.generator.tank.getCapacity()+" mB "+StringUtil.localize("fluid.oil"); - if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text2), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOreMagnet.java index 5ab5c9ecc..6990e7276 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiOreMagnet.java @@ -38,6 +38,23 @@ public class GuiOreMagnet extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text1 = this.magnet.storage.getEnergyStored()+"/"+this.magnet.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text1), x, y); + } + String text2 = this.magnet.tank.getFluidAmount()+"/"+this.magnet.tank.getCapacity()+" mB "+StringUtil.localize("fluid.oil"); + if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text2), x, y); + } + //TODO Upgrade Slot Joke + if(x >= guiLeft+70 && y >= guiTop+42 && x <= guiLeft+70+18 && y <= guiTop+42+18){ + this.func_146283_a(Arrays.asList("@SuppressWarnings(\"unused\")", "This slot is currently unused. Ignore it."), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.magnet.getInventoryName()); @@ -63,21 +80,4 @@ public class GuiOreMagnet extends GuiContainer{ drawTexturedModalRect(this.guiLeft+117, this.guiTop+89-i, 192, 0, 16, i); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text1 = this.magnet.storage.getEnergyStored()+"/"+this.magnet.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+43 && y >= guiTop+6 && x <= guiLeft+58 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text1), x, y); - } - String text2 = this.magnet.tank.getFluidAmount()+"/"+this.magnet.tank.getCapacity()+" mB "+StringUtil.localize("fluid.oil"); - if(x >= guiLeft+117 && y >= guiTop+6 && x <= guiLeft+132 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text2), x, y); - } - //TODO Upgrade Slot Joke - if(x >= guiLeft+70 && y >= guiTop+42 && x <= guiLeft+70+18 && y <= guiTop+42+18){ - this.func_146283_a(Arrays.asList("@SuppressWarnings(\"unused\")", "This slot is currently unused. Ignore it."), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java index e44f834a8..e2e8c1b33 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiPhantomPlacer.java @@ -34,6 +34,11 @@ public class GuiPhantomPlacer extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.placer.getInventoryName()); @@ -49,9 +54,4 @@ public class GuiPhantomPlacer extends GuiContainer{ this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java index fc11b46b1..46e8d7882 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiRepairer.java @@ -36,6 +36,15 @@ public class GuiRepairer extends GuiContainer{ this.ySize = 93+86; } + @Override + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + String text = this.tileRepairer.storage.getEnergyStored()+"/"+this.tileRepairer.storage.getMaxEnergyStored()+" RF"; + if(x >= guiLeft+28 && y >= guiTop+6 && x <= guiLeft+43 && y <= guiTop+88){ + this.func_146283_a(Collections.singletonList(text), x, y); + } + } + @Override public void drawGuiContainerForegroundLayer(int x, int y){ AssetUtil.displayNameString(this.fontRendererObj, xSize, -10, this.tileRepairer.getInventoryName()); @@ -60,13 +69,4 @@ public class GuiRepairer extends GuiContainer{ this.drawTexturedModalRect(this.guiLeft+73, this.guiTop+52, 176, 28, i, 16); } } - - @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - String text = this.tileRepairer.storage.getEnergyStored()+"/"+this.tileRepairer.storage.getMaxEnergyStored()+" RF"; - if(x >= guiLeft+28 && y >= guiTop+6 && x <= guiLeft+43 && y <= guiTop+88){ - this.func_146283_a(Collections.singletonList(text), x, y); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java index 2588b455d..abefd386b 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiSmileyCloud.java @@ -54,19 +54,6 @@ public class GuiSmileyCloud extends GuiContainer{ this.ySize = 20; } - @Override - public void drawGuiContainerForegroundLayer(int x, int y){ - String name = cloud.name == null || cloud.name.isEmpty() ? "" : EnumChatFormatting.GOLD+cloud.name+EnumChatFormatting.RESET+" "+StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.the")+" "; - String localizedName = name+StringUtil.localize("container."+ModUtil.MOD_ID_LOWER+".cloud.name"); - this.fontRendererObj.drawString(localizedName, xSize/2-this.fontRendererObj.getStringWidth(localizedName)/2, -10, StringUtil.DECIMAL_COLOR_WHITE); - } - - @Override - public void updateScreen(){ - super.updateScreen(); - this.nameField.updateCursorCounter(); - } - @SuppressWarnings("unchecked") @Override public void initGui(){ @@ -78,6 +65,29 @@ public class GuiSmileyCloud extends GuiContainer{ this.nameField.setFocused(true); } + @Override + @SuppressWarnings("unchecked") + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); + } + + @Override + public void drawGuiContainerForegroundLayer(int x, int y){ + String name = cloud.name == null || cloud.name.isEmpty() ? "" : EnumChatFormatting.GOLD+cloud.name+EnumChatFormatting.RESET+" "+StringUtil.localize("info."+ModUtil.MOD_ID_LOWER+".gui.the")+" "; + String localizedName = name+StringUtil.localize("container."+ModUtil.MOD_ID_LOWER+".cloud.name"); + this.fontRendererObj.drawString(localizedName, xSize/2-this.fontRendererObj.getStringWidth(localizedName)/2, -10, StringUtil.DECIMAL_COLOR_WHITE); + } + + @Override + public void drawGuiContainerBackgroundLayer(float f, int x, int y){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + this.mc.getTextureManager().bindTexture(resLoc); + this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); + + this.nameField.drawTextBox(); + } + @Override protected void mouseClicked(int par1, int par2, int par3){ this.nameField.mouseClicked(par1, par2, par3); @@ -99,6 +109,12 @@ public class GuiSmileyCloud extends GuiContainer{ } } + @Override + public void updateScreen(){ + super.updateScreen(); + this.nameField.updateCursorCounter(); + } + public void setVariable(GuiTextField field){ this.sendPacket(field.getText(), 0); field.setText(""); @@ -107,20 +123,4 @@ public class GuiSmileyCloud extends GuiContainer{ private void sendPacket(String text, int textID){ PacketHandler.theNetwork.sendToServer(new PacketGuiString(x, y, z, world, text, textID, Minecraft.getMinecraft().thePlayer)); } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int x, int y){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - this.mc.getTextureManager().bindTexture(resLoc); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); - - this.nameField.drawTextBox(); - } - - @Override - @SuppressWarnings("unchecked") - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java index 1aa8e824f..dd15dfee2 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiXPSolidifier.java @@ -75,9 +75,8 @@ public class GuiXPSolidifier extends GuiContainer{ } @Override - public void actionPerformed(GuiButton button){ - PacketHandler.theNetwork.sendToServer(new PacketGuiButton(x, y, z, world, button.id, Minecraft.getMinecraft().thePlayer)); - this.solidifier.onButtonPressed(button.id, Minecraft.getMinecraft().thePlayer); + public void drawScreen(int x, int y, float f){ + super.drawScreen(x, y, f); } @Override @@ -99,7 +98,8 @@ public class GuiXPSolidifier extends GuiContainer{ } @Override - public void drawScreen(int x, int y, float f){ - super.drawScreen(x, y, f); + public void actionPerformed(GuiButton button){ + PacketHandler.theNetwork.sendToServer(new PacketGuiButton(x, y, z, world, button.id, Minecraft.getMinecraft().thePlayer)); + this.solidifier.onButtonPressed(button.id, Minecraft.getMinecraft().thePlayer); } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java b/src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java index 2e758e15a..19401f441 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotImmovable.java @@ -21,6 +21,11 @@ public class SlotImmovable extends Slot{ super(inventory, id, x, y); } + @Override + public boolean isItemValid(ItemStack stack){ + return false; + } + @Override public void putStack(ItemStack stack){ @@ -35,9 +40,4 @@ public class SlotImmovable extends Slot{ public boolean canTakeStack(EntityPlayer player){ return false; } - - @Override - public boolean isItemValid(ItemStack stack){ - return false; - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java b/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java index 7ddab59bd..9229d96df 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java @@ -39,25 +39,19 @@ public class ItemArmorAA extends ItemArmor implements IActAddItemOrBlock{ this.setMaxDamage(material.getDurability(type)/10); } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.rare; } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; } @Override - public String getName(){ - return this.name; + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type){ + return this.textures[slot == 2 ? 1 : 0]; } @Override @@ -72,7 +66,13 @@ public class ItemArmorAA extends ItemArmor implements IActAddItemOrBlock{ } @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type){ - return this.textures[slot == 2 ? 1 : 0]; + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public String getName(){ + return this.name; } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java index 321200ead..cec653f67 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java @@ -33,17 +33,17 @@ public class ItemBattery extends ItemEnergy{ return EnumRarity.rare; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return name; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java index 8363f3978..f7cfb4dba 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java @@ -32,14 +32,14 @@ public class ItemBooklet extends Item implements IActAddItemOrBlock{ } @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ + player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BOOK.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); + return stack; } @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; } @Override @@ -49,13 +49,13 @@ public class ItemBooklet extends Item implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "itemBooklet"; + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ - player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BOOK.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); - return stack; + public String getName(){ + return "itemBooklet"; } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java index 510f2d3d8..fc642384c 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java @@ -37,17 +37,17 @@ public class ItemBucketAA extends ItemBucket implements IActAddItemOrBlock{ return EnumRarity.uncommon; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return this.name; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java index e3fef9d49..558c50db2 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java @@ -64,6 +64,10 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ registerIngredient(new Ingredient(new ItemStack(Items.fermented_spider_eye), new PotionEffect[]{new PotionEffect(Potion.invisibility.getId(), 25, 0)}, 2)); } + public static void registerIngredient(Ingredient ingredient){ + ingredients.add(ingredient); + } + public static Ingredient getIngredientFromStack(ItemStack stack){ for(Ingredient ingredient : ingredients){ if(ingredient.ingredient.copy().isItemEqual(stack)){ @@ -73,6 +77,41 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ return null; } + public static boolean addEffectToStack(ItemStack stack, Ingredient ingredient){ + boolean worked = false; + if(ingredient != null){ + PotionEffect[] effects = ingredient.getEffects(); + if(effects != null && effects.length > 0){ + for(PotionEffect effect : effects){ + PotionEffect effectHas = getSameEffectFromStack(stack, effect); + if(effectHas != null){ + if(effectHas.getAmplifier() < ingredient.maxAmplifier-1){ + addEffectProperties(stack, effect, false, true); + worked = true; + } + } + else{ + addEffectToStack(stack, effect); + worked = true; + } + } + } + } + return worked; + } + + public static PotionEffect getSameEffectFromStack(ItemStack stack, PotionEffect effect){ + PotionEffect[] effectsStack = getEffectsFromStack(stack); + if(effectsStack != null && effectsStack.length > 0){ + for(PotionEffect effectStack : effectsStack){ + if(effect.getPotionID() == effectStack.getPotionID()){ + return effectStack; + } + } + } + return null; + } + public static void addEffectProperties(ItemStack stack, PotionEffect effect, boolean addDur, boolean addAmp){ PotionEffect[] effects = getEffectsFromStack(stack); stack.setTagCompound(new NBTTagCompound()); @@ -103,29 +142,6 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ stack.setTagCompound(tag); } - public static boolean addEffectToStack(ItemStack stack, Ingredient ingredient){ - boolean worked = false; - if(ingredient != null){ - PotionEffect[] effects = ingredient.getEffects(); - if(effects != null && effects.length > 0){ - for(PotionEffect effect : effects){ - PotionEffect effectHas = getSameEffectFromStack(stack, effect); - if(effectHas != null){ - if(effectHas.getAmplifier() < ingredient.maxAmplifier-1){ - addEffectProperties(stack, effect, false, true); - worked = true; - } - } - else{ - addEffectToStack(stack, effect); - worked = true; - } - } - } - } - return worked; - } - public static PotionEffect[] getEffectsFromStack(ItemStack stack){ ArrayList effects = new ArrayList(); NBTTagCompound tag = stack.getTagCompound(); @@ -143,16 +159,18 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ return effects.size() > 0 ? effects.toArray(new PotionEffect[effects.size()]) : null; } - public static PotionEffect getSameEffectFromStack(ItemStack stack, PotionEffect effect){ - PotionEffect[] effectsStack = getEffectsFromStack(stack); - if(effectsStack != null && effectsStack.length > 0){ - for(PotionEffect effectStack : effectsStack){ - if(effect.getPotionID() == effectStack.getPotionID()){ - return effectStack; - } - } + @Override + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ + ItemStack theStack = stack.copy(); + super.onEaten(stack, world, player); + applyPotionEffectsFromStack(stack, player); + theStack.setItemDamage(theStack.getItemDamage()+1); + if(theStack.getMaxDamage()-theStack.getItemDamage() < 0){ + return new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()); + } + else{ + return theStack; } - return null; } public static void applyPotionEffectsFromStack(ItemStack stack, EntityPlayer player){ @@ -164,8 +182,24 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ } } - public static void registerIngredient(Ingredient ingredient){ - ingredients.add(ingredient); + @Override + public EnumAction getItemUseAction(ItemStack stack){ + return EnumAction.drink; + } + + @Override + public IIcon getIconFromDamage(int par1){ + return this.itemIcon; + } + + @Override + public int getMetadata(int damage){ + return damage; + } + + @Override + public boolean getShareTag(){ + return true; } @SuppressWarnings("unchecked") @@ -182,45 +216,11 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ } } - @Override - public boolean getShareTag(){ - return true; - } - - @Override - public EnumAction getItemUseAction(ItemStack stack){ - return EnumAction.drink; - } - @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.rare; } - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ - ItemStack theStack = stack.copy(); - super.onEaten(stack, world, player); - applyPotionEffectsFromStack(stack, player); - theStack.setItemDamage(theStack.getItemDamage()+1); - if(theStack.getMaxDamage()-theStack.getItemDamage() < 0){ - return new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()); - } - else{ - return theStack; - } - } - - @Override - public IIcon getIconFromDamage(int par1){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java index c0e8f25e3..77273a62c 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java @@ -34,14 +34,14 @@ public class ItemCoffeeBean extends ItemFood implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java index 7ddd5243d..8754e6030 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java @@ -30,17 +30,6 @@ public class ItemCrafterOnAStick extends Item implements IActAddItemOrBlock{ this.setMaxStackSize(1); } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } - @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ if(!world.isRemote){ @@ -54,6 +43,17 @@ public class ItemCrafterOnAStick extends Item implements IActAddItemOrBlock{ return EnumRarity.epic; } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemCrafterOnAStick"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index ed9a6464e..6490f1a91 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -90,6 +90,77 @@ public class ItemDrill extends ItemEnergy{ return false; } + /** + * Checks if a certain Upgrade is installed and returns it as an ItemStack + * + * @param stack The Drill + * @param upgrade The Upgrade to be checked + * @return The Upgrade, if it's installed + */ + public ItemStack getHasUpgradeAsStack(ItemStack stack, ItemDrillUpgrade.UpgradeType upgrade){ + NBTTagCompound compound = stack.getTagCompound(); + if(compound == null){ + return null; + } + + ItemStack[] slots = this.getSlotsFromNBT(stack); + if(slots != null && slots.length > 0){ + for(ItemStack slotStack : slots){ + if(slotStack != null && slotStack.getItem() instanceof ItemDrillUpgrade){ + if(((ItemDrillUpgrade)slotStack.getItem()).type == upgrade){ + return slotStack; + } + } + } + } + return null; + } + + /** + * Gets all of the Slots from NBT + * + * @param stack The Drill + * @return All of the Slots + */ + public ItemStack[] getSlotsFromNBT(ItemStack stack){ + NBTTagCompound compound = stack.getTagCompound(); + if(compound == null){ + return null; + } + + int slotAmount = compound.getInteger("SlotAmount"); + ItemStack[] slots = new ItemStack[slotAmount]; + + if(slots.length > 0){ + NBTTagList tagList = compound.getTagList("Items", 10); + for(int i = 0; i < tagList.tagCount(); i++){ + NBTTagCompound tagCompound = tagList.getCompoundTagAt(i); + byte slotIndex = tagCompound.getByte("Slot"); + if(slotIndex >= 0 && slotIndex < slots.length){ + slots[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound); + } + } + } + return slots; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ + if(!world.isRemote && player.isSneaking() && stack == player.getCurrentEquippedItem()){ + player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); + } + return stack; + } + + @Override + public boolean hitEntity(ItemStack stack, EntityLivingBase entity1, EntityLivingBase entity2){ + int use = this.getEnergyUsePerBlock(stack); + if(this.getEnergyStored(stack) >= use){ + this.extractEnergy(stack, use, false); + } + return true; + } + //Checks for Energy Containers in the Upgrade Slots and charges the Drill from them @Override public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ @@ -112,28 +183,90 @@ public class ItemDrill extends ItemEnergy{ } } - /** - * Gets the Mining Speed of the Drill - * - * @param stack The Drill - * @return The Mining Speed depending on the Speed Upgrades - */ - public float getEfficiencyFromUpgrade(ItemStack stack){ - float efficiency = ConfigFloatValues.DRILL_DAMAGE.getValue(); - if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED)){ - if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_II)){ - if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_III)){ - efficiency += 37.0F; + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public String getName(){ + return "itemDrill"; + } + + @Override + public Multimap getAttributeModifiers(ItemStack stack){ + Multimap map = super.getAttributeModifiers(stack); + map.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Drill Modifier", this.getEnergyStored(stack) >= ConfigIntValues.DRILL_ENERGY_USE.getValue() ? 8.0F : 0.0F, 0)); + return map; + } + + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta){ + return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) ? (this.hasExtraWhitelist(block) || block.getHarvestTool(meta) == null || block.getHarvestTool(meta).isEmpty() || this.getToolClasses(stack).contains(block.getHarvestTool(meta)) ? this.getEfficiencyFromUpgrade(stack) : 1.0F) : 0.0F; + } + + @Override + public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player){ + boolean toReturn = true; + int use = this.getEnergyUsePerBlock(stack); + if(this.getEnergyStored(stack) >= use){ + //Enchants the Drill depending on the Upgrades it has + if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SILK_TOUCH)){ + ItemUtil.addEnchantment(stack, Enchantment.silkTouch, 1); + } + else{ + if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE)){ + ItemUtil.addEnchantment(stack, Enchantment.fortune, this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE_II) ? 3 : 1); + } + } + + //Breaks the Blocks + if(!player.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){ + if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)){ + toReturn = this.breakBlocks(stack, 2, player.worldObj, x, y, z, player); } else{ - efficiency += 25.0F; + toReturn = this.breakBlocks(stack, 1, player.worldObj, x, y, z, player); } } else{ - efficiency += 8.0F; + toReturn = this.breakBlocks(stack, 0, player.worldObj, x, y, z, player); } + + //Removes Enchantments added above + ItemUtil.removeEnchantment(stack, Enchantment.silkTouch); + ItemUtil.removeEnchantment(stack, Enchantment.fortune); } - return efficiency; + return toReturn; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + + @Override + public boolean canHarvestBlock(Block block, ItemStack stack){ + return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && (this.hasExtraWhitelist(block) || block.getMaterial().isToolNotRequired() || (block == Blocks.snow_layer || block == Blocks.snow || (block == Blocks.obsidian ? ToolMaterial.EMERALD.getHarvestLevel() == 3 : (block != Blocks.diamond_block && block != Blocks.diamond_ore ? (block != Blocks.emerald_ore && block != Blocks.emerald_block ? (block != Blocks.gold_block && block != Blocks.gold_ore ? (block != Blocks.iron_block && block != Blocks.iron_ore ? (block != Blocks.lapis_block && block != Blocks.lapis_ore ? (block != Blocks.redstone_ore && block != Blocks.lit_redstone_ore ? (block.getMaterial() == Material.rock || (block.getMaterial() == Material.iron || block.getMaterial() == Material.anvil)) : ToolMaterial.EMERALD.getHarvestLevel() >= 2) : ToolMaterial.EMERALD.getHarvestLevel() >= 1) : ToolMaterial.EMERALD.getHarvestLevel() >= 1) : ToolMaterial.EMERALD.getHarvestLevel() >= 2) : ToolMaterial.EMERALD.getHarvestLevel() >= 2) : ToolMaterial.EMERALD.getHarvestLevel() >= 2)))); + } + + @Override + public Set getToolClasses(ItemStack stack){ + HashSet hashSet = new HashSet(); + hashSet.add("pickaxe"); + hashSet.add("shovel"); + return hashSet; + } + + @Override + public int getHarvestLevel(ItemStack stack, String toolClass){ + return ToolMaterial.EMERALD.getHarvestLevel(); } /** @@ -180,11 +313,6 @@ public class ItemDrill extends ItemEnergy{ return use; } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - /** * Checks if a certain Upgrade is applied * @@ -197,40 +325,27 @@ public class ItemDrill extends ItemEnergy{ } /** - * Checks if a certain Upgrade is installed and returns it as an ItemStack + * Gets the Mining Speed of the Drill * - * @param stack The Drill - * @param upgrade The Upgrade to be checked - * @return The Upgrade, if it's installed + * @param stack The Drill + * @return The Mining Speed depending on the Speed Upgrades */ - public ItemStack getHasUpgradeAsStack(ItemStack stack, ItemDrillUpgrade.UpgradeType upgrade){ - NBTTagCompound compound = stack.getTagCompound(); - if(compound == null){ - return null; - } - - ItemStack[] slots = this.getSlotsFromNBT(stack); - if(slots != null && slots.length > 0){ - for(ItemStack slotStack : slots){ - if(slotStack != null && slotStack.getItem() instanceof ItemDrillUpgrade){ - if(((ItemDrillUpgrade)slotStack.getItem()).type == upgrade){ - return slotStack; - } + public float getEfficiencyFromUpgrade(ItemStack stack){ + float efficiency = ConfigFloatValues.DRILL_DAMAGE.getValue(); + if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED)){ + if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_II)){ + if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SPEED_III)){ + efficiency += 37.0F; + } + else{ + efficiency += 25.0F; } } + else{ + efficiency += 8.0F; + } } - return null; - } - - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + return efficiency; } /** @@ -261,35 +376,6 @@ public class ItemDrill extends ItemEnergy{ stack.setTagCompound(compound); } - - /** - * Gets all of the Slots from NBT - * - * @param stack The Drill - * @return All of the Slots - */ - public ItemStack[] getSlotsFromNBT(ItemStack stack){ - NBTTagCompound compound = stack.getTagCompound(); - if(compound == null){ - return null; - } - - int slotAmount = compound.getInteger("SlotAmount"); - ItemStack[] slots = new ItemStack[slotAmount]; - - if(slots.length > 0){ - NBTTagList tagList = compound.getTagList("Items", 10); - for(int i = 0; i < tagList.tagCount(); i++){ - NBTTagCompound tagCompound = tagList.getCompoundTagAt(i); - byte slotIndex = tagCompound.getByte("Slot"); - if(slotIndex >= 0 && slotIndex < slots.length){ - slots[slotIndex] = ItemStack.loadItemStackFromNBT(tagCompound); - } - } - } - return slots; - } - /** * Breaks Blocks in a certain Radius * Has to be called on both Server and Client @@ -388,55 +474,6 @@ public class ItemDrill extends ItemEnergy{ return false; } - @Override - public String getName(){ - return "itemDrill"; - } - - @Override - public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player){ - boolean toReturn = true; - int use = this.getEnergyUsePerBlock(stack); - if(this.getEnergyStored(stack) >= use){ - //Enchants the Drill depending on the Upgrades it has - if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SILK_TOUCH)){ - ItemUtil.addEnchantment(stack, Enchantment.silkTouch, 1); - } - else{ - if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE)){ - ItemUtil.addEnchantment(stack, Enchantment.fortune, this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE_II) ? 3 : 1); - } - } - - //Breaks the Blocks - if(!player.isSneaking() && this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.THREE_BY_THREE)){ - if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FIVE_BY_FIVE)){ - toReturn = this.breakBlocks(stack, 2, player.worldObj, x, y, z, player); - } - else{ - toReturn = this.breakBlocks(stack, 1, player.worldObj, x, y, z, player); - } - } - else{ - toReturn = this.breakBlocks(stack, 0, player.worldObj, x, y, z, player); - } - - //Removes Enchantments added above - ItemUtil.removeEnchantment(stack, Enchantment.silkTouch); - ItemUtil.removeEnchantment(stack, Enchantment.fortune); - } - return toReturn; - } - - @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entity1, EntityLivingBase entity2){ - int use = this.getEnergyUsePerBlock(stack); - if(this.getEnergyStored(stack) >= use){ - this.extractEnergy(stack, use, false); - } - return true; - } - private boolean hasExtraWhitelist(Block block){ String name = Block.blockRegistry.getNameForObject(block); if(name != null){ @@ -448,42 +485,4 @@ public class ItemDrill extends ItemEnergy{ } return false; } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta){ - return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) ? (this.hasExtraWhitelist(block) || block.getHarvestTool(meta) == null || block.getHarvestTool(meta).isEmpty() || this.getToolClasses(stack).contains(block.getHarvestTool(meta)) ? this.getEfficiencyFromUpgrade(stack) : 1.0F) : 0.0F; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack){ - return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && (this.hasExtraWhitelist(block) || block.getMaterial().isToolNotRequired() || (block == Blocks.snow_layer || block == Blocks.snow || (block == Blocks.obsidian ? ToolMaterial.EMERALD.getHarvestLevel() == 3 : (block != Blocks.diamond_block && block != Blocks.diamond_ore ? (block != Blocks.emerald_ore && block != Blocks.emerald_block ? (block != Blocks.gold_block && block != Blocks.gold_ore ? (block != Blocks.iron_block && block != Blocks.iron_ore ? (block != Blocks.lapis_block && block != Blocks.lapis_ore ? (block != Blocks.redstone_ore && block != Blocks.lit_redstone_ore ? (block.getMaterial() == Material.rock || (block.getMaterial() == Material.iron || block.getMaterial() == Material.anvil)) : ToolMaterial.EMERALD.getHarvestLevel() >= 2) : ToolMaterial.EMERALD.getHarvestLevel() >= 1) : ToolMaterial.EMERALD.getHarvestLevel() >= 1) : ToolMaterial.EMERALD.getHarvestLevel() >= 2) : ToolMaterial.EMERALD.getHarvestLevel() >= 2) : ToolMaterial.EMERALD.getHarvestLevel() >= 2)))); - } - - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ - if(!world.isRemote && player.isSneaking() && stack == player.getCurrentEquippedItem()){ - player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.DRILL.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ); - } - return stack; - } - - @Override - public int getHarvestLevel(ItemStack stack, String toolClass){ - return ToolMaterial.EMERALD.getHarvestLevel(); - } - - @Override - public Set getToolClasses(ItemStack stack){ - HashSet hashSet = new HashSet(); - hashSet.add("pickaxe"); - hashSet.add("shovel"); - return hashSet; - } - - @Override - public Multimap getAttributeModifiers(ItemStack stack){ - Multimap map = super.getAttributeModifiers(stack); - map.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Drill Modifier", this.getEnergyStored(stack) >= ConfigIntValues.DRILL_ENERGY_USE.getValue() ? 8.0F : 0.0F, 0)); - return map; - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java index 9a6fc3c85..ec2dd8463 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java @@ -26,6 +26,7 @@ public class ItemDrillUpgrade extends Item implements IActAddItemOrBlock{ public UpgradeType type; public String unlocalizedName; + public ItemDrillUpgrade(UpgradeType type, String unlocName){ this.type = type; this.unlocalizedName = unlocName; @@ -59,17 +60,17 @@ public class ItemDrillUpgrade extends Item implements IActAddItemOrBlock{ stack.setTagCompound(compound); } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return this.unlocalizedName; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java index 6bccb0f4f..7731f2d7c 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java @@ -33,13 +33,19 @@ public class ItemDust extends Item implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "itemDust"; + public int getMetadata(int damage){ + return damage; } @Override - public int getMetadata(int damage){ - return damage; + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName()+(stack.getItemDamage() >= allDusts.length ? " ERROR!" : allDusts[stack.getItemDamage()].getName()); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass){ + return stack.getItemDamage() >= allDusts.length ? 0 : allDusts[stack.getItemDamage()].color; } @Override @@ -56,24 +62,18 @@ public class ItemDust extends Item implements IActAddItemOrBlock{ } @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allDusts.length ? " ERROR!" : allDusts[stack.getItemDamage()].getName()); + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public String getName(){ + return "itemDust"; } @Override public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int pass){ - return stack.getItemDamage() >= allDusts.length ? 0 : allDusts[stack.getItemDamage()].color; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemEnergy.java b/src/main/java/ellpeck/actuallyadditions/items/ItemEnergy.java index 4ca067e2b..07c0dd638 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemEnergy.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemEnergy.java @@ -32,14 +32,7 @@ public abstract class ItemEnergy extends ItemEnergyContainer implements IActAddI } @Override - public double getDurabilityForDisplay(ItemStack stack){ - double energyDif = getMaxEnergyStored(stack)-getEnergyStored(stack); - double maxAmount = getMaxEnergyStored(stack); - return energyDif/maxAmount; - } - - @Override - public boolean showDurabilityBar(ItemStack itemStack){ + public boolean getShareTag(){ return true; } @@ -48,17 +41,6 @@ public abstract class ItemEnergy extends ItemEnergyContainer implements IActAddI this.setEnergy(stack, 0); } - @Override - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack, int pass){ - return false; - } - - @Override - public boolean getShareTag(){ - return true; - } - @Override @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @@ -72,6 +54,24 @@ public abstract class ItemEnergy extends ItemEnergyContainer implements IActAddI list.add(stackEmpty); } + @Override + public boolean showDurabilityBar(ItemStack itemStack){ + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack){ + double energyDif = getMaxEnergyStored(stack)-getEnergyStored(stack); + double maxAmount = getMaxEnergyStored(stack); + return energyDif/maxAmount; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack stack, int pass){ + return false; + } + public void setEnergy(ItemStack stack, int energy){ NBTTagCompound compound = stack.getTagCompound(); if(compound == null){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java index 35089c742..e4fceb846 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java @@ -41,17 +41,17 @@ public class ItemFertilizer extends Item implements IActAddItemOrBlock{ return EnumRarity.rare; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemFertilizer"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java index eba591489..457f3dfe2 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java @@ -37,49 +37,6 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ TheFoods.setReturnItems(); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allFoods.length ? EnumRarity.common : allFoods[stack.getItemDamage()].rarity; - } - - @Override - public int func_150905_g(ItemStack stack){ - return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].healAmount; - } - - @Override - public float func_150906_h(ItemStack stack){ - return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].saturation; - } - - @Override - public EnumAction getItemUseAction(ItemStack stack){ - return stack.getItemDamage() >= allFoods.length ? EnumAction.eat : (allFoods[stack.getItemDamage()].getsDrunken ? EnumAction.drink : EnumAction.eat); - } - - @Override - public int getMaxItemUseDuration(ItemStack stack){ - return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].useDuration; - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @SuppressWarnings("all") - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ - for(int j = 0; j < allFoods.length; j++){ - list.add(new ItemStack(this, 1, j)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allFoods.length ? " ERROR!" : allFoods[stack.getItemDamage()].getName()); - } - @Override public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ ItemStack stackToReturn = super.onEaten(stack, world, player); @@ -96,11 +53,54 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ return stackToReturn; } + @Override + public int getMaxItemUseDuration(ItemStack stack){ + return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].useDuration; + } + + @Override + public EnumAction getItemUseAction(ItemStack stack){ + return stack.getItemDamage() >= allFoods.length ? EnumAction.eat : (allFoods[stack.getItemDamage()].getsDrunken ? EnumAction.drink : EnumAction.eat); + } + + @Override + public int func_150905_g(ItemStack stack){ + return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].healAmount; + } + + @Override + public float func_150906_h(ItemStack stack){ + return stack.getItemDamage() >= allFoods.length ? 0 : allFoods[stack.getItemDamage()].saturation; + } + @Override public IIcon getIconFromDamage(int par1){ return par1 >= textures.length ? null : textures[par1]; } + @Override + public int getMetadata(int damage){ + return damage; + } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName()+(stack.getItemDamage() >= allFoods.length ? " ERROR!" : allFoods[stack.getItemDamage()].getName()); + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allFoods.length ? EnumRarity.common : allFoods[stack.getItemDamage()].rarity; + } + + @SuppressWarnings("all") + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list){ + for(int j = 0; j < allFoods.length; j++){ + list.add(new ItemStack(this, 1, j)); + } + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java index 9d30c5e2c..91f1d8826 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java @@ -104,17 +104,17 @@ public class ItemGrowthRing extends ItemEnergy{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemGrowthRing"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java b/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java index ab425122c..efd342d74 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java @@ -53,17 +53,17 @@ public class ItemHairyBall extends Item implements IActAddItemOrBlock{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemHairyBall"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java index 4939e1b1f..c2a94e942 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java @@ -41,34 +41,11 @@ public class ItemJams extends ItemFood implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allJams.length ? EnumRarity.common : allJams[stack.getItemDamage()].rarity; - } - - @Override - public int func_150905_g(ItemStack stack){ - return stack.getItemDamage() >= allJams.length ? 0 : allJams[stack.getItemDamage()].healAmount; - } - - @Override - public float func_150906_h(ItemStack stack){ - return stack.getItemDamage() >= allJams.length ? 0 : allJams[stack.getItemDamage()].saturation; - } - @Override public int getMetadata(int damage){ return damage; } - @SuppressWarnings("all") - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list){ - for(int j = 0; j < allJams.length; j++){ - list.add(new ItemStack(this, 1, j)); - } - } - @Override public String getUnlocalizedName(ItemStack stack){ return this.getUnlocalizedName()+(stack.getItemDamage() >= allJams.length ? " ERROR!" : allJams[stack.getItemDamage()].getName()); @@ -80,6 +57,42 @@ public class ItemJams extends ItemFood implements IActAddItemOrBlock{ return pass > 0 ? (stack.getItemDamage() >= allJams.length ? 0 : allJams[stack.getItemDamage()].color) : super.getColorFromItemStack(stack, pass); } + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allJams.length ? EnumRarity.common : allJams[stack.getItemDamage()].rarity; + } + + @Override + public boolean requiresMultipleRenderPasses(){ + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(int damage, int pass){ + return pass > 0 ? this.overlayIcon : super.getIconFromDamageForRenderPass(damage, pass); + } + + @SuppressWarnings("all") + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list){ + for(int j = 0; j < allJams.length; j++){ + list.add(new ItemStack(this, 1, j)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.overlayIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Overlay"); + } + + @Override + public String getName(){ + return "itemJam"; + } + @Override public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ ItemStack stackToReturn = super.onEaten(stack, world, player); @@ -102,25 +115,12 @@ public class ItemJams extends ItemFood implements IActAddItemOrBlock{ } @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamageForRenderPass(int damage, int pass){ - return pass > 0 ? this.overlayIcon : super.getIconFromDamageForRenderPass(damage, pass); + public int func_150905_g(ItemStack stack){ + return stack.getItemDamage() >= allJams.length ? 0 : allJams[stack.getItemDamage()].healAmount; } @Override - public boolean requiresMultipleRenderPasses(){ - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - this.overlayIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Overlay"); - } - - @Override - public String getName(){ - return "itemJam"; + public float func_150906_h(ItemStack stack){ + return stack.getItemDamage() >= allJams.length ? 0 : allJams[stack.getItemDamage()].saturation; } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java index ea65decba..7ae823edd 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java @@ -32,32 +32,19 @@ public class ItemKnife extends Item implements IActAddItemOrBlock{ this.setContainerItem(this); } - @Override - public ItemStack getContainerItem(ItemStack stack){ - ItemStack theStack = stack.copy(); - theStack.setItemDamage(theStack.getItemDamage()+1); - theStack.stackSize = 1; - return theStack; - } - @Override public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack){ return false; } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - @Override public boolean getShareTag(){ return true; } @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; } @Override @@ -78,4 +65,17 @@ public class ItemKnife extends Item implements IActAddItemOrBlock{ map.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Knife Modifier", 3, 0)); return map; } + + @Override + public ItemStack getContainerItem(ItemStack stack){ + ItemStack theStack = stack.copy(); + theStack.setItemDamage(theStack.getItemDamage()+1); + theStack.stackSize = 1; + return theStack; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java index 3951dbbc9..e29ffae57 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java @@ -42,6 +42,34 @@ public class ItemLeafBlower extends Item implements IActAddItemOrBlock{ this.setMaxStackSize(1); } + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + return stack; + } + + @Override + public EnumAction getItemUseAction(ItemStack stack){ + return EnumAction.bow; + } + + @Override + public int getMaxItemUseDuration(ItemStack stack){ + //Cuz you won't hold it for that long right-clicking anyways + return Integer.MAX_VALUE; + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return this.isAdvanced ? EnumRarity.epic : EnumRarity.rare; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int time){ if(!player.worldObj.isRemote){ @@ -102,39 +130,11 @@ public class ItemLeafBlower extends Item implements IActAddItemOrBlock{ } } - @Override - public int getMaxItemUseDuration(ItemStack stack){ - //Cuz you won't hold it for that long right-clicking anyways - return Integer.MAX_VALUE; - } - - @Override - public EnumAction getItemUseAction(ItemStack stack){ - return EnumAction.bow; - } - - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); - return stack; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return this.isAdvanced ? EnumRarity.epic : EnumRarity.rare; - } - @Override public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } - @Override public String getName(){ return this.isAdvanced ? "itemLeafBlowerAdvanced" : "itemLeafBlower"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java index 839a32687..eeb235bec 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java @@ -68,17 +68,17 @@ public class ItemMagnetRing extends ItemEnergy{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemSuctionRing"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java index 9c9d94980..6216af189 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java @@ -34,13 +34,8 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "itemMisc"; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.common : allMiscItems[stack.getItemDamage()].rarity; + public IIcon getIconFromDamage(int par1){ + return par1 >= textures.length ? null : textures[par1]; } @Override @@ -48,6 +43,16 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ return damage; } + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscItems.length ? " ERROR!" : allMiscItems[stack.getItemDamage()].getName()); + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allMiscItems.length ? EnumRarity.common : allMiscItems[stack.getItemDamage()].rarity; + } + @SuppressWarnings("all") @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list){ @@ -56,16 +61,6 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ } } - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscItems.length ? " ERROR!" : allMiscItems[stack.getItemDamage()].getName()); - } - - @Override - public IIcon getIconFromDamage(int par1){ - return par1 >= textures.length ? null : textures[par1]; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ @@ -73,4 +68,9 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscItems[i].getName()); } } + + @Override + public String getName(){ + return "itemMisc"; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java index 8537acb5c..c34a43179 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java @@ -73,13 +73,6 @@ public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{ } } - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ - if(this.getStoredPosition(stack) == null){ - this.clearStorage(stack); - } - } - public WorldPos getStoredPosition(ItemStack stack){ NBTTagCompound tag = stack.getTagCompound(); if(tag != null){ @@ -94,6 +87,10 @@ public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{ return null; } + public void clearStorage(ItemStack stack){ + stack.setTagCompound(new NBTTagCompound()); + } + public void storeConnection(ItemStack stack, int x, int y, int z, World world){ NBTTagCompound tag = stack.getTagCompound(); if(tag == null){ @@ -108,8 +105,16 @@ public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{ stack.setTagCompound(tag); } - public void clearStorage(ItemStack stack){ - stack.setTagCompound(new NBTTagCompound()); + @Override + public boolean getShareTag(){ + return true; + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ + if(this.getStoredPosition(stack) == null){ + this.clearStorage(stack); + } } @Override @@ -117,11 +122,6 @@ public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ @@ -129,12 +129,12 @@ public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "itemPhantomConnector"; + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; } @Override - public boolean getShareTag(){ - return true; + public String getName(){ + return "itemPhantomConnector"; } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java index 2f9307acd..8fd3ae0ba 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java @@ -41,6 +41,22 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ this.isAdvanced = isAdvanced; } + @Override + public int getMetadata(int damage){ + return damage; + } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName()+(stack.getItemDamage() >= allRings.length ? " ERROR!" : allRings[stack.getItemDamage()].getName().substring("potion".length())); + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass){ + return stack.getItemDamage() >= allRings.length ? 0 : allRings[stack.getItemDamage()].color; + } + @Override @SuppressWarnings("unchecked") public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ @@ -67,13 +83,13 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ } @Override - public String getName(){ - return this.isAdvanced ? "itemPotionRingAdvanced" : "itemPotionRing"; - } - - @Override - public int getMetadata(int damage){ - return damage; + public String getItemStackDisplayName(ItemStack stack){ + String standardName = StringUtil.localize(this.getUnlocalizedName()+".name"); + if(stack.getItemDamage() < allRings.length){ + String effect = StringUtil.localize(allRings[stack.getItemDamage()].getName()); + return standardName+" "+effect; + } + return standardName; } @Override @@ -89,22 +105,6 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ } } - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allRings.length ? " ERROR!" : allRings[stack.getItemDamage()].getName().substring("potion".length())); - } - - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int pass){ - return stack.getItemDamage() >= allRings.length ? 0 : allRings[stack.getItemDamage()].color; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ @@ -112,12 +112,12 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ } @Override - public String getItemStackDisplayName(ItemStack stack){ - String standardName = StringUtil.localize(this.getUnlocalizedName()+".name"); - if(stack.getItemDamage() < allRings.length){ - String effect = StringUtil.localize(allRings[stack.getItemDamage()].getName()); - return standardName+" "+effect; - } - return standardName; + public String getName(){ + return this.isAdvanced ? "itemPotionRingAdvanced" : "itemPotionRing"; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java index d4c4814de..b4daf9607 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java @@ -38,17 +38,17 @@ public class ItemResonantRice extends Item implements IActAddItemOrBlock{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemResonantRice"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java index 30b2668c6..ea2bf912d 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java @@ -46,15 +46,20 @@ public class ItemSeed extends ItemSeeds implements IActAddItemOrBlock{ return EnumRarity.rare; } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + @Override public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + public String getName(){ + return this.name; } @Override @@ -66,9 +71,4 @@ public class ItemSeed extends ItemSeeds implements IActAddItemOrBlock{ public int getPlantMetadata(IBlockAccess world, int x, int y, int z){ return 0; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java index 041666915..cf6beea09 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java @@ -38,6 +38,11 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ this.setHasSubtypes(true); } + @Override + public IIcon getIconFromDamage(int par1){ + return par1 >= textures.length ? null : textures[par1]; + } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ if(!world.isRemote){ @@ -60,8 +65,13 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ } @Override - public String getName(){ - return "itemSpecial"; + public int getMetadata(int damage){ + return damage; + } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName()+(stack.getItemDamage() >= allDrops.length ? " ERROR!" : allDrops[stack.getItemDamage()].getName()); } @Override @@ -69,11 +79,6 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ return stack.getItemDamage() >= allDrops.length ? EnumRarity.common : allDrops[stack.getItemDamage()].rarity; } - @Override - public int getMetadata(int damage){ - return damage; - } - @SuppressWarnings("all") @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list){ @@ -82,16 +87,6 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ } } - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allDrops.length ? " ERROR!" : allDrops[stack.getItemDamage()].getName()); - } - - @Override - public IIcon getIconFromDamage(int par1){ - return par1 >= textures.length ? null : textures[par1]; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ @@ -99,4 +94,9 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allDrops[i].getName()); } } + + @Override + public String getName(){ + return "itemSpecial"; + } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java b/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java index 9589a79fc..6a0fd1f18 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java @@ -34,56 +34,6 @@ public class ItemTeleStaff extends ItemEnergy{ super(500000, 10000); } - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - - @Override - public String getName(){ - return "itemTeleStaff"; - } - - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ - int time = this.getWaitTime(stack); - if(time > 0){ - this.setWaitTime(stack, time-1); - } - } - - private void setWaitTime(ItemStack stack, int time){ - NBTTagCompound compound = stack.getTagCompound(); - if(compound == null){ - compound = new NBTTagCompound(); - } - - compound.setInteger("waitTime", time); - - stack.setTagCompound(compound); - } - - private int getWaitTime(ItemStack stack){ - NBTTagCompound compound = stack.getTagCompound(); - if(compound == null){ - return 0; - } - else{ - return compound.getInteger("waitTime"); - } - } - @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ if(!world.isRemote){ @@ -115,4 +65,54 @@ public class ItemTeleStaff extends ItemEnergy{ player.swingItem(); return stack; } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ + int time = this.getWaitTime(stack); + if(time > 0){ + this.setWaitTime(stack, time-1); + } + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public String getName(){ + return "itemTeleStaff"; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + + private int getWaitTime(ItemStack stack){ + NBTTagCompound compound = stack.getTagCompound(); + if(compound == null){ + return 0; + } + else{ + return compound.getInteger("waitTime"); + } + } + + private void setWaitTime(ItemStack stack, int time){ + NBTTagCompound compound = stack.getTagCompound(); + if(compound == null){ + compound = new NBTTagCompound(); + } + + compound.setInteger("waitTime", time); + + stack.setTagCompound(compound); + } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java index 2d56f5b10..8c348b9cd 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java @@ -77,17 +77,17 @@ public class ItemWaterRemovalRing extends ItemEnergy{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemWaterRemovalRing"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java b/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java index 8f40478b0..40ece5a05 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java @@ -51,6 +51,13 @@ public class ItemWingsOfTheBats extends Item implements IActAddItemOrBlock{ return wingedPlayers.contains(player.getUniqueID()+(player.worldObj.isRemote ? "-Remote" : "")); } + /** + * Same as above, but Remote Checking is done automatically + */ + public static void removeWingsFromPlayer(EntityPlayer player){ + removeWingsFromPlayer(player, player.worldObj.isRemote); + } + /** * Removes the Player from the List of Players that have Wings * @@ -61,13 +68,6 @@ public class ItemWingsOfTheBats extends Item implements IActAddItemOrBlock{ wingedPlayers.remove(player.getUniqueID()+(worldRemote ? "-Remote" : "")); } - /** - * Same as above, but Remote Checking is done automatically - */ - public static void removeWingsFromPlayer(EntityPlayer player){ - removeWingsFromPlayer(player, player.worldObj.isRemote); - } - /** * Adds the Player to the List of Players that have Wings * @@ -97,17 +97,17 @@ public class ItemWingsOfTheBats extends Item implements IActAddItemOrBlock{ return EnumRarity.epic; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return "itemWingsOfTheBats"; diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java index d54d8c709..19e187278 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java @@ -45,6 +45,7 @@ public enum TheFoods implements IActAddItemOrBlock{ public final int useDuration; public final EnumRarity rarity; public ItemStack returnItem; + TheFoods(String name, int healAmount, float saturation, boolean getsDrunken, int useDuration, EnumRarity rarity){ this.name = name; this.getsDrunken = getsDrunken; diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java index 7bbbe5b15..bc5d1d3a3 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java @@ -51,28 +51,6 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ this.setMaxDamage(this.getMaxDamage()*4); } - private boolean hasExtraWhitelist(Block block){ - String name = Block.blockRegistry.getNameForObject(block); - if(name != null){ - for(String list : ConfigValues.paxelExtraMiningWhitelist){ - if(list.equals(name)){ - return true; - } - } - } - return false; - } - - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta){ - return this.hasExtraWhitelist(block) || block.getHarvestTool(meta) == null || block.getHarvestTool(meta).isEmpty() || this.getToolClasses(stack).contains(block.getHarvestTool(meta)) ? this.efficiencyOnProperMaterial : 1.0F; - } - - @Override - public boolean canHarvestBlock(Block block, ItemStack stack){ - return this.hasExtraWhitelist(block) || block.getMaterial().isToolNotRequired() || (block == Blocks.snow_layer || block == Blocks.snow || (block == Blocks.obsidian ? this.toolMaterial.getHarvestLevel() == 3 : (block != Blocks.diamond_block && block != Blocks.diamond_ore ? (block != Blocks.emerald_ore && block != Blocks.emerald_block ? (block != Blocks.gold_block && block != Blocks.gold_ore ? (block != Blocks.iron_block && block != Blocks.iron_ore ? (block != Blocks.lapis_block && block != Blocks.lapis_ore ? (block != Blocks.redstone_ore && block != Blocks.lit_redstone_ore ? (block.getMaterial() == Material.rock || (block.getMaterial() == Material.iron || block.getMaterial() == Material.anvil)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2))); - } - @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ){ if(!player.canPlayerEdit(x, y, z, side, stack)){ @@ -106,6 +84,32 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ } } + @Override + public EnumRarity getRarity(ItemStack stack){ + return this.rarity; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + } + + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + + @Override + public boolean canHarvestBlock(Block block, ItemStack stack){ + return this.hasExtraWhitelist(block) || block.getMaterial().isToolNotRequired() || (block == Blocks.snow_layer || block == Blocks.snow || (block == Blocks.obsidian ? this.toolMaterial.getHarvestLevel() == 3 : (block != Blocks.diamond_block && block != Blocks.diamond_ore ? (block != Blocks.emerald_ore && block != Blocks.emerald_block ? (block != Blocks.gold_block && block != Blocks.gold_ore ? (block != Blocks.iron_block && block != Blocks.iron_ore ? (block != Blocks.lapis_block && block != Blocks.lapis_ore ? (block != Blocks.redstone_ore && block != Blocks.lit_redstone_ore ? (block.getMaterial() == Material.rock || (block.getMaterial() == Material.iron || block.getMaterial() == Material.anvil)) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 1) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2) : this.toolMaterial.getHarvestLevel() >= 2))); + } + + @Override + public String getName(){ + return name; + } + @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ int[] idsStack = OreDictionary.getOreIDs(stack); @@ -117,27 +121,6 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ return false; } - @Override - public EnumRarity getRarity(ItemStack stack){ - return this.rarity; - } - - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } - - @Override - public String getName(){ - return name; - } - @Override public Set getToolClasses(ItemStack stack){ HashSet hashSet = new HashSet(); @@ -146,4 +129,21 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ hashSet.add("shovel"); return hashSet; } + + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta){ + return this.hasExtraWhitelist(block) || block.getHarvestTool(meta) == null || block.getHarvestTool(meta).isEmpty() || this.getToolClasses(stack).contains(block.getHarvestTool(meta)) ? this.efficiencyOnProperMaterial : 1.0F; + } + + private boolean hasExtraWhitelist(Block block){ + String name = Block.blockRegistry.getNameForObject(block); + if(name != null){ + for(String list : ConfigValues.paxelExtraMiningWhitelist){ + if(list.equals(name)){ + return true; + } + } + } + return false; + } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java index 7a2063b74..957ca5a4b 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java @@ -46,8 +46,8 @@ public class ItemAxeAA extends ItemAxe implements IActAddItemOrBlock{ } @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; + public EnumRarity getRarity(ItemStack stack){ + return this.rarity; } @Override @@ -57,8 +57,8 @@ public class ItemAxeAA extends ItemAxe implements IActAddItemOrBlock{ } @Override - public EnumRarity getRarity(ItemStack stack){ - return this.rarity; + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java index afdd511ba..0d6907ae3 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java @@ -36,6 +36,11 @@ public class ItemHoeAA extends ItemHoe implements IActAddItemOrBlock{ this.oredictName = name; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return this.rarity; + } + @Override public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack){ int[] idsStack = OreDictionary.getOreIDs(stack); @@ -48,8 +53,9 @@ public class ItemHoeAA extends ItemHoe implements IActAddItemOrBlock{ } @Override - public EnumRarity getRarity(ItemStack stack){ - return this.rarity; + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } @Override @@ -57,12 +63,6 @@ public class ItemHoeAA extends ItemHoe implements IActAddItemOrBlock{ return this.itemIcon; } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconReg){ - this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); - } - @Override public String getName(){ return name; diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java index 7d49142ad..4811282a2 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java @@ -45,11 +45,6 @@ public class ItemPickaxeAA extends ItemPickaxe implements IActAddItemOrBlock{ return false; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; @@ -61,6 +56,11 @@ public class ItemPickaxeAA extends ItemPickaxe implements IActAddItemOrBlock{ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return name; diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java index 4c1eeb1d1..34f570275 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java @@ -52,17 +52,17 @@ public class ItemShovelAA extends ItemSpade implements IActAddItemOrBlock{ return this.rarity; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return name; diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java index 1322b4f84..1ba255897 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java @@ -52,17 +52,17 @@ public class ItemSwordAA extends ItemSword implements IActAddItemOrBlock{ return this.rarity; } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - return this.itemIcon; - } - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); } + @Override + public IIcon getIcon(ItemStack stack, int pass){ + return this.itemIcon; + } + @Override public String getName(){ return name; diff --git a/src/main/java/ellpeck/actuallyadditions/nei/CoffeeMachineRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/CoffeeMachineRecipeHandler.java index 51f5fdc3a..2e435e5e1 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/CoffeeMachineRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/CoffeeMachineRecipeHandler.java @@ -46,27 +46,12 @@ public class CoffeeMachineRecipeHandler extends TemplateRecipeHandler implements return new ItemStack(InitBlocks.blockCoffeeMachine); } - @Override - public int recipiesPerPage(){ - return 1; - } - @Override public void loadTransferRects(){ transferRects.add(new RecipeTransferRect(new Rectangle(20, 39, 20, 16), NAME)); transferRects.add(new RecipeTransferRect(new Rectangle(64, 42, 23, 10), NAME)); } - @Override - public Class getGuiClass(){ - return GuiCoffeeMachine.class; - } - - @Override - public String getRecipeName(){ - return StringUtil.localize("container.nei."+NAME+".name"); - } - @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(NAME) && getClass() == CoffeeMachineRecipeHandler.class){ @@ -109,10 +94,8 @@ public class CoffeeMachineRecipeHandler extends TemplateRecipeHandler implements } @Override - public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 126, 88); + public String getOverlayIdentifier(){ + return NAME; } @Override @@ -133,8 +116,25 @@ public class CoffeeMachineRecipeHandler extends TemplateRecipeHandler implements } @Override - public String getOverlayIdentifier(){ - return NAME; + public Class getGuiClass(){ + return GuiCoffeeMachine.class; + } + + @Override + public void drawBackground(int recipeIndex){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 126, 88); + } + + @Override + public int recipiesPerPage(){ + return 1; + } + + @Override + public String getRecipeName(){ + return StringUtil.localize("container.nei."+NAME+".name"); } public class CachedCoffee extends CachedRecipe{ @@ -161,6 +161,11 @@ public class CoffeeMachineRecipeHandler extends TemplateRecipeHandler implements this.result = new PositionedStack(result.copy(), 45, 70); } + @Override + public PositionedStack getResult(){ + return result; + } + @Override public List getIngredients(){ ArrayList list = new ArrayList(); @@ -169,10 +174,5 @@ public class CoffeeMachineRecipeHandler extends TemplateRecipeHandler implements list.add(this.coffeeBeans); return list; } - - @Override - public PositionedStack getResult(){ - return result; - } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/nei/CompostRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/CompostRecipeHandler.java index 0bf6a50ff..318657df1 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/CompostRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/CompostRecipeHandler.java @@ -42,16 +42,6 @@ public class CompostRecipeHandler extends TemplateRecipeHandler implements INeiR return new ItemStack(InitBlocks.blockCompost); } - @Override - public int recipiesPerPage(){ - return 2; - } - - @Override - public Class getGuiClass(){ - return null; - } - @Override public String getRecipeName(){ return StringUtil.localize("container.nei."+NAME+".name"); @@ -93,6 +83,16 @@ public class CompostRecipeHandler extends TemplateRecipeHandler implements INeiR return ModUtil.MOD_ID_LOWER+":textures/gui/guiNEISimple.png"; } + @Override + public String getOverlayIdentifier(){ + return NAME; + } + + @Override + public Class getGuiClass(){ + return null; + } + @Override public void drawBackground(int recipeIndex){ GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -101,8 +101,8 @@ public class CompostRecipeHandler extends TemplateRecipeHandler implements INeiR } @Override - public String getOverlayIdentifier(){ - return NAME; + public int recipiesPerPage(){ + return 2; } public class CachedCompostRecipe extends CachedRecipe{ @@ -116,14 +116,14 @@ public class CompostRecipeHandler extends TemplateRecipeHandler implements INeiR this.input = new PositionedStack(input, 5+32, 19); } - @Override - public PositionedStack getIngredient(){ - return input; - } - @Override public PositionedStack getResult(){ return result; } + + @Override + public PositionedStack getIngredient(){ + return input; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java index 9f01d1807..6360f5516 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java @@ -40,26 +40,11 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler implements INeiR return new ItemStack(InitBlocks.blockGrinder); } - @Override - public int recipiesPerPage(){ - return 1; - } - @Override public void loadTransferRects(){ transferRects.add(new RecipeTransferRect(new Rectangle(80, 40, 24, 22), this.getName())); } - @Override - public Class getGuiClass(){ - return GuiGrinder.class; - } - - @Override - public String getRecipeName(){ - return StringUtil.localize("container.nei."+this.getName()+".name"); - } - @Override public void loadCraftingRecipes(String outputId, Object... results){ if(outputId.equals(this.getName()) && (getClass() == CrusherRecipeHandler.class || getClass() == CrusherDoubleRecipeHandler.class)){ @@ -101,10 +86,8 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler implements INeiR } @Override - public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(60, 13, 60, 13, 56, 79); + public String getOverlayIdentifier(){ + return this.getName(); } @Override @@ -114,12 +97,20 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler implements INeiR } @Override - public String getOverlayIdentifier(){ - return this.getName(); + public Class getGuiClass(){ + return GuiGrinder.class; } - protected String getName(){ - return "actuallyadditions."+(this instanceof CrusherDoubleRecipeHandler ? "crushingDouble" : "crushing"); + @Override + public void drawBackground(int recipeIndex){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(60, 13, 60, 13, 56, 79); + } + + @Override + public int recipiesPerPage(){ + return 1; } protected void drawChanceString(int x, int y, int recipe){ @@ -131,6 +122,15 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler implements INeiR } } + protected String getName(){ + return "actuallyadditions."+(this instanceof CrusherDoubleRecipeHandler ? "crushingDouble" : "crushing"); + } + + @Override + public String getRecipeName(){ + return StringUtil.localize("container.nei."+this.getName()+".name"); + } + public static class CrusherDoubleRecipeHandler extends CrusherRecipeHandler{ @Override @@ -138,17 +138,17 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler implements INeiR return new ItemStack(InitBlocks.blockGrinderDouble); } - @Override - public Class getGuiClass(){ - return GuiGrinder.GuiGrinderDouble.class; - } - @Override public void loadTransferRects(){ transferRects.add(new RecipeTransferRect(new Rectangle(51, 40, 24, 22), this.getName())); transferRects.add(new RecipeTransferRect(new Rectangle(101, 40, 24, 22), this.getName())); } + @Override + public Class getGuiClass(){ + return GuiGrinder.GuiGrinderDouble.class; + } + @Override public String getGuiTexture(){ return ModUtil.MOD_ID_LOWER+":textures/gui/guiGrinderDouble.png"; @@ -187,13 +187,13 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler implements INeiR } @Override - public List getIngredients(){ - return getCycledIngredients(cycleticks/48, Collections.singletonList(ingredient)); + public PositionedStack getResult(){ + return resultOne; } @Override - public PositionedStack getResult(){ - return resultOne; + public List getIngredients(){ + return getCycledIngredients(cycleticks/48, Collections.singletonList(ingredient)); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/nei/FurnaceDoubleRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/FurnaceDoubleRecipeHandler.java index 91013df1b..83407942a 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/FurnaceDoubleRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/FurnaceDoubleRecipeHandler.java @@ -42,44 +42,12 @@ public class FurnaceDoubleRecipeHandler extends TemplateRecipeHandler implements return new ItemStack(InitBlocks.blockFurnaceDouble); } - @Override - public Class getGuiClass(){ - return GuiFurnaceDouble.class; - } - @Override public void loadTransferRects(){ transferRects.add(new RecipeTransferRect(new Rectangle(51, 40, 24, 22), NAME)); transferRects.add(new RecipeTransferRect(new Rectangle(101, 40, 24, 22), NAME)); } - @Override - public String getGuiTexture(){ - return ModUtil.MOD_ID_LOWER+":textures/gui/guiFurnaceDouble.png"; - } - - @Override - public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(46, 20, 46, 20, 84, 70); - } - - @Override - public void drawExtras(int recipe){ - drawProgressBar(51, 40, 176, 0, 24, 23, 48, 1); - } - - @Override - public int recipiesPerPage(){ - return 1; - } - - @Override - public String getRecipeName(){ - return StringUtil.localize("container.nei."+NAME+".name"); - } - @SuppressWarnings("unchecked") @Override public void loadCraftingRecipes(String outputId, Object... results){ @@ -118,11 +86,43 @@ public class FurnaceDoubleRecipeHandler extends TemplateRecipeHandler implements } } + @Override + public String getGuiTexture(){ + return ModUtil.MOD_ID_LOWER+":textures/gui/guiFurnaceDouble.png"; + } + @Override public String getOverlayIdentifier(){ return NAME; } + @Override + public void drawExtras(int recipe){ + drawProgressBar(51, 40, 176, 0, 24, 23, 48, 1); + } + + @Override + public Class getGuiClass(){ + return GuiFurnaceDouble.class; + } + + @Override + public void drawBackground(int recipeIndex){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(46, 20, 46, 20, 84, 70); + } + + @Override + public int recipiesPerPage(){ + return 1; + } + + @Override + public String getRecipeName(){ + return StringUtil.localize("container.nei."+NAME+".name"); + } + public class CachedFurn extends CachedRecipe{ public PositionedStack ingredient; @@ -134,14 +134,14 @@ public class FurnaceDoubleRecipeHandler extends TemplateRecipeHandler implements this.resultOne = new PositionedStack(resultOne, 50, 69); } - @Override - public List getIngredients(){ - return getCycledIngredients(cycleticks/48, Collections.singletonList(ingredient)); - } - @Override public PositionedStack getResult(){ return resultOne; } + + @Override + public List getIngredients(){ + return getCycledIngredients(cycleticks/48, Collections.singletonList(ingredient)); + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java index c8d2a93c0..f15fc2259 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/HairyBallRecipeHandler.java @@ -41,16 +41,6 @@ public class HairyBallRecipeHandler extends TemplateRecipeHandler implements INe return null; } - @Override - public int recipiesPerPage(){ - return 2; - } - - @Override - public Class getGuiClass(){ - return null; - } - @Override public String getRecipeName(){ return StringUtil.localize("container.nei."+NAME+".name"); @@ -102,10 +92,8 @@ public class HairyBallRecipeHandler extends TemplateRecipeHandler implements INe } @Override - public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); + public String getOverlayIdentifier(){ + return NAME; } @Override @@ -119,8 +107,20 @@ public class HairyBallRecipeHandler extends TemplateRecipeHandler implements INe } @Override - public String getOverlayIdentifier(){ - return NAME; + public Class getGuiClass(){ + return null; + } + + @Override + public void drawBackground(int recipeIndex){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); + } + + @Override + public int recipiesPerPage(){ + return 2; } public class CachedBallRecipe extends CachedRecipe{ @@ -135,14 +135,14 @@ public class HairyBallRecipeHandler extends TemplateRecipeHandler implements INe this.input = new PositionedStack(input, 5+32, 19); } - @Override - public PositionedStack getIngredient(){ - return input; - } - @Override public PositionedStack getResult(){ return result; } + + @Override + public PositionedStack getIngredient(){ + return input; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java index 08b1c7695..6ac960306 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java @@ -41,16 +41,6 @@ public class TreasureChestRecipeHandler extends TemplateRecipeHandler implements return new ItemStack(InitBlocks.blockTreasureChest); } - @Override - public int recipiesPerPage(){ - return 2; - } - - @Override - public Class getGuiClass(){ - return null; - } - @Override public String getRecipeName(){ return StringUtil.localize("container.nei."+NAME+".name"); @@ -102,10 +92,8 @@ public class TreasureChestRecipeHandler extends TemplateRecipeHandler implements } @Override - public void drawBackground(int recipeIndex){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(getGuiTexture()); - GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); + public String getOverlayIdentifier(){ + return NAME; } @Override @@ -117,8 +105,20 @@ public class TreasureChestRecipeHandler extends TemplateRecipeHandler implements } @Override - public String getOverlayIdentifier(){ - return NAME; + public Class getGuiClass(){ + return null; + } + + @Override + public void drawBackground(int recipeIndex){ + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(getGuiTexture()); + GuiDraw.drawTexturedModalRect(32, 0, 0, 0, 96, 60); + } + + @Override + public int recipiesPerPage(){ + return 2; } public class CachedTreasure extends CachedRecipe{ @@ -137,14 +137,14 @@ public class TreasureChestRecipeHandler extends TemplateRecipeHandler implements this.maxAmount = maxAmount; } - @Override - public PositionedStack getIngredient(){ - return input; - } - @Override public PositionedStack getResult(){ return result; } + + @Override + public PositionedStack getIngredient(){ + return input; + } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java index eea95d46c..635c4a5d7 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java @@ -19,15 +19,6 @@ public class CrusherRecipeAutoRegistry{ public static ArrayList searchCases = new ArrayList(); - private static boolean hasException(String name){ - for(String except : ConfigValues.crusherRecipeExceptions){ - if(except.equals(name)){ - return true; - } - } - return false; - } - public static void registerFinally(){ String[] names = OreDictionary.getOreNames(); for(String inputName : names){ @@ -55,20 +46,29 @@ public class CrusherRecipeAutoRegistry{ } } + private static boolean hasException(String name){ + for(String except : ConfigValues.crusherRecipeExceptions){ + if(except.equals(name)){ + return true; + } + } + return false; + } + public static class SearchCase{ public final String name; public final int resultAmount; public final String replacer; + public SearchCase(String name, int resultAmount){ + this(name, resultAmount, "dust"); + } + public SearchCase(String name, int resultAmount, String replacer){ this.name = name; this.resultAmount = resultAmount; this.replacer = replacer; } - - public SearchCase(String name, int resultAmount){ - this(name, resultAmount, "dust"); - } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java index bfdaaab42..4e5f9b4cf 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java @@ -22,12 +22,6 @@ public class CrusherRecipeManualRegistry{ public static ArrayList recipes = new ArrayList(); - public static void registerRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int secondChance){ - if(!hasRecipe(input, outputOne, outputTwo)){ - recipes.add(new CrusherRecipe(input, outputOne, outputTwo, secondChance)); - } - } - public static void registerRecipe(String input, String outputOne, int outputOneAmount){ registerRecipe(input, outputOne, "", 0, outputOneAmount, 0); } @@ -70,17 +64,10 @@ public class CrusherRecipeManualRegistry{ } } - public static void registerRecipe(ItemStack input, ItemStack outputOne){ - registerRecipe(input, outputOne, null, 0); - } - - public static ItemStack getOutput(ItemStack input, boolean wantSecond){ - for(CrusherRecipe recipe : recipes){ - if(recipe.input.isItemEqual(input) || (recipe.input.getItem() == input.getItem() && recipe.input.getItemDamage() == Util.WILDCARD)){ - return wantSecond ? recipe.secondOutput : recipe.firstOutput; - } + public static void registerRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int secondChance){ + if(!hasRecipe(input, outputOne, outputTwo)){ + recipes.add(new CrusherRecipe(input, outputOne, outputTwo, secondChance)); } - return null; } public static boolean hasRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo){ @@ -94,6 +81,19 @@ public class CrusherRecipeManualRegistry{ return false; } + public static void registerRecipe(ItemStack input, ItemStack outputOne){ + registerRecipe(input, outputOne, null, 0); + } + + public static ItemStack getOutput(ItemStack input, boolean wantSecond){ + for(CrusherRecipe recipe : recipes){ + if(recipe.input.isItemEqual(input) || (recipe.input.getItem() == input.getItem() && recipe.input.getItemDamage() == Util.WILDCARD)){ + return wantSecond ? recipe.secondOutput : recipe.firstOutput; + } + } + return null; + } + public static int getSecondChance(ItemStack input){ for(CrusherRecipe recipe : recipes){ if(recipe.input.isItemEqual(input) || (recipe.input.getItem() == input.getItem() && recipe.input.getItemDamage() == Util.WILDCARD)){ diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/FuelHandler.java b/src/main/java/ellpeck/actuallyadditions/recipe/FuelHandler.java index d1e6e478e..e82daf214 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/FuelHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/FuelHandler.java @@ -29,12 +29,6 @@ public class FuelHandler implements IFuelHandler{ private static HashMap, Integer> fuelList = new HashMap, Integer>(); - public static void setFuelValues(){ - addFuel(InitItems.itemMisc, TheMiscItems.TINY_CHAR.ordinal(), 200); - addFuel(InitItems.itemMisc, TheMiscItems.TINY_COAL.ordinal(), 200); - addFuel(InitBlocks.blockMisc, TheMiscBlocks.CHARCOAL_BLOCK.ordinal(), 16000); - } - public static void init(){ ModUtil.LOGGER.info("Initializing Fuelstuffs..."); @@ -42,6 +36,12 @@ public class FuelHandler implements IFuelHandler{ setFuelValues(); } + public static void setFuelValues(){ + addFuel(InitItems.itemMisc, TheMiscItems.TINY_CHAR.ordinal(), 200); + addFuel(InitItems.itemMisc, TheMiscItems.TINY_COAL.ordinal(), 200); + addFuel(InitBlocks.blockMisc, TheMiscBlocks.CHARCOAL_BLOCK.ordinal(), 16000); + } + private static void addFuel(Item item, int metadata, int value){ fuelList.put(Pair.of(item, metadata), value); } @@ -50,6 +50,11 @@ public class FuelHandler implements IFuelHandler{ addFuel(Item.getItemFromBlock(block), metadata, value); } + @Override + public int getBurnTime(ItemStack fuel){ + return getFuelValue(fuel); + } + private static int getFuelValue(ItemStack stack){ if(stack != null && stack.getItem() != null){ Pair pair = Pair.of(stack.getItem(), stack.getItemDamage()); @@ -66,9 +71,4 @@ public class FuelHandler implements IFuelHandler{ } return 0; } - - @Override - public int getBurnTime(ItemStack fuel){ - return getFuelValue(fuel); - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java index 9cd7b34a0..4a71f311c 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java @@ -56,11 +56,6 @@ public class TileEntityCompost extends TileEntityInventoryBase{ } } - @Override - public int getInventoryStackLimit(){ - return ConfigIntValues.COMPOST_AMOUNT.getValue(); - } - @Override public void writeToNBT(NBTTagCompound compound){ super.writeToNBT(compound); @@ -73,6 +68,11 @@ public class TileEntityCompost extends TileEntityInventoryBase{ this.conversionTime = compound.getInteger("ConversionTime"); } + @Override + public int getInventoryStackLimit(){ + return ConfigIntValues.COMPOST_AMOUNT.getValue(); + } + @Override public boolean isItemValidForSlot(int i, ItemStack stack){ return stack.getItem() instanceof ItemMisc && stack.getItemDamage() == TheMiscItems.MASHED_FOOD.ordinal(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java index 568c41a90..314c28e2d 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityDropper.java @@ -46,18 +46,6 @@ public class TileEntityDropper extends TileEntityInventoryBase{ } } - @Override - public void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - compound.setInteger("CurrentTime", this.currentTime); - } - - @Override - public void readFromNBT(NBTTagCompound compound){ - super.readFromNBT(compound); - this.currentTime = compound.getInteger("CurrentTime"); - } - public ItemStack removeFromInventory(boolean actuallyDo){ for(int i = 0; i < this.slots.length; i++){ if(this.slots[i] != null){ @@ -74,6 +62,18 @@ public class TileEntityDropper extends TileEntityInventoryBase{ return null; } + @Override + public void writeToNBT(NBTTagCompound compound){ + super.writeToNBT(compound); + compound.setInteger("CurrentTime", this.currentTime); + } + + @Override + public void readFromNBT(NBTTagCompound compound){ + super.readFromNBT(compound); + this.currentTime = compound.getInteger("CurrentTime"); + } + @Override public boolean isItemValidForSlot(int i, ItemStack stack){ return true; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java index e90cca98b..8bfcc550b 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityEnervator.java @@ -77,6 +77,11 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne super.readFromNBT(compound); } + @Override + public boolean isItemValidForSlot(int i, ItemStack stack){ + return i == 0 && stack.getItem() instanceof IEnergyContainerItem; + } + @Override public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate){ return this.storage.extractEnergy(maxExtract, simulate); @@ -102,11 +107,6 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne return this.storage.getEnergyStored()*i/this.storage.getMaxEnergyStored(); } - @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return i == 0 && stack.getItem() instanceof IEnergyContainerItem; - } - @Override public boolean canInsertItem(int slot, ItemStack stack, int side){ return this.isItemValidForSlot(slot, stack); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java index 73394ed36..d3b29a431 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFermentingBarrel.java @@ -76,16 +76,6 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen } } - @Override - public void writeToNBT(NBTTagCompound compound){ - compound.setInteger("ProcessTime", this.currentProcessTime); - this.canolaTank.writeToNBT(compound); - NBTTagCompound tag = new NBTTagCompound(); - this.oilTank.writeToNBT(tag); - compound.setTag("OilTank", tag); - super.writeToNBT(compound); - } - @SideOnly(Side.CLIENT) public int getProcessScaled(int i){ return this.currentProcessTime*i/ConfigIntValues.BARREL_PROCESSING_TIME.getValue(); @@ -99,6 +89,21 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen super.readFromNBT(compound); } + @Override + public void writeToNBT(NBTTagCompound compound){ + compound.setInteger("ProcessTime", this.currentProcessTime); + this.canolaTank.writeToNBT(compound); + NBTTagCompound tag = new NBTTagCompound(); + this.oilTank.writeToNBT(tag); + compound.setTag("OilTank", tag); + super.writeToNBT(compound); + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack stack){ + return (i == 0 && FluidContainerRegistry.containsFluid(stack, new FluidStack(InitBlocks.fluidCanolaOil, FluidContainerRegistry.BUCKET_VOLUME))) || (i == 2 && stack.getItem() == Items.bucket); + } + @SideOnly(Side.CLIENT) public int getOilTankScaled(int i){ return this.oilTank.getFluidAmount()*i/this.oilTank.getCapacity(); @@ -109,11 +114,6 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen return this.canolaTank.getFluidAmount()*i/this.canolaTank.getCapacity(); } - @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return (i == 0 && FluidContainerRegistry.containsFluid(stack, new FluidStack(InitBlocks.fluidCanolaOil, FluidContainerRegistry.BUCKET_VOLUME))) || (i == 2 && stack.getItem() == Items.bucket); - } - @Override public boolean canInsertItem(int slot, ItemStack stack, int side){ return this.isItemValidForSlot(slot, stack); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java index 5599633ff..04527a6f7 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFishingNet.java @@ -27,6 +27,18 @@ public class TileEntityFishingNet extends TileEntityBase{ public int timeUntilNextDrop; + @Override + public void readFromNBT(NBTTagCompound compound){ + super.readFromNBT(compound); + this.timeUntilNextDrop = compound.getInteger("TimeUntilNextDrop"); + } + + @Override + public void writeToNBT(NBTTagCompound compound){ + super.writeToNBT(compound); + compound.setInteger("TimeUntilNextDrop", this.timeUntilNextDrop); + } + @Override public void updateEntity(){ if(!worldObj.isRemote){ @@ -73,16 +85,4 @@ public class TileEntityFishingNet extends TileEntityBase{ } } } - - @Override - public void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - compound.setInteger("TimeUntilNextDrop", this.timeUntilNextDrop); - } - - @Override - public void readFromNBT(NBTTagCompound compound){ - super.readFromNBT(compound); - this.timeUntilNextDrop = compound.getInteger("TimeUntilNextDrop"); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java index 677838a82..a29041213 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFluidCollector.java @@ -180,13 +180,6 @@ public class TileEntityFluidCollector extends TileEntityInventoryBase implements return this.tank.getFluidAmount()*i/this.tank.getCapacity(); } - @Override - public void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - compound.setInteger("CurrentTime", this.currentTime); - this.tank.writeToNBT(compound); - } - @Override public void readFromNBT(NBTTagCompound compound){ super.readFromNBT(compound); @@ -194,6 +187,13 @@ public class TileEntityFluidCollector extends TileEntityInventoryBase implements this.tank.readFromNBT(compound); } + @Override + public void writeToNBT(NBTTagCompound compound){ + super.writeToNBT(compound); + compound.setInteger("CurrentTime", this.currentTime); + this.tank.writeToNBT(compound); + } + @Override public boolean isItemValidForSlot(int i, ItemStack stack){ if(i == 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java index 9cbcca159..97c20ad95 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java @@ -147,6 +147,11 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements this.storage.readFromNBT(compound); } + @Override + public boolean isItemValidForSlot(int i, ItemStack stack){ + return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && FurnaceRecipes.smelting().getSmeltingResult(stack) != null; + } + @SideOnly(Side.CLIENT) public int getEnergyScaled(int i){ return this.storage.getEnergyStored()*i/this.storage.getMaxEnergyStored(); @@ -162,11 +167,6 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements return this.secondSmeltTime*i/ConfigIntValues.FURNACE_DOUBLE_SMELT_TIME.getValue(); } - @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && FurnaceRecipes.smelting().getSmeltingResult(stack) != null; - } - @Override public boolean canInsertItem(int slot, ItemStack stack, int side){ return this.isItemValidForSlot(slot, stack); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java index 4d5b0082d..fd77b2d4d 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceSolar.java @@ -41,6 +41,18 @@ public class TileEntityFurnaceSolar extends TileEntityBase implements IEnergyPro return from != ForgeDirection.UP; } + @Override + public void readFromNBT(NBTTagCompound compound){ + this.storage.readFromNBT(compound); + super.readFromNBT(compound); + } + + @Override + public void writeToNBT(NBTTagCompound compound){ + this.storage.writeToNBT(compound); + super.writeToNBT(compound); + } + @Override public void updateEntity(){ if(!worldObj.isRemote){ @@ -60,16 +72,4 @@ public class TileEntityFurnaceSolar extends TileEntityBase implements IEnergyPro } } } - - @Override - public void writeToNBT(NBTTagCompound compound){ - this.storage.writeToNBT(compound); - super.writeToNBT(compound); - } - - @Override - public void readFromNBT(NBTTagCompound compound){ - this.storage.readFromNBT(compound); - super.readFromNBT(compound); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java index 2bf7ff7e5..45ffd3adc 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java @@ -25,13 +25,13 @@ public class TileEntityGiantChest extends TileEntityInventoryBase{ } @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return true; + public boolean canInsertItem(int slot, ItemStack stack, int side){ + return this.isItemValidForSlot(slot, stack); } @Override - public boolean canInsertItem(int slot, ItemStack stack, int side){ - return this.isItemValidForSlot(slot, stack); + public boolean isItemValidForSlot(int i, ItemStack stack){ + return true; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java index e64a388e9..443d0ec95 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java @@ -39,9 +39,11 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg private int lastEnergy; private int lastFirstCrush; private int lastSecondCrush; + public TileEntityGrinder(int slots, String name){ super(slots, name); } + public TileEntityGrinder(){ super(3, "grinder"); this.isDouble = false; @@ -84,14 +86,6 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg PacketSyncerToClient.sendPacket(this); } - private int getMaxCrushTime(){ - return this.isDouble ? ConfigIntValues.GRINDER_DOUBLE_CRUSH_TIME.getValue() : ConfigIntValues.GRINDER_CRUSH_TIME.getValue(); - } - - private int getEnergyUse(){ - return this.isDouble ? ConfigIntValues.GRINDER_DOUBLE_ENERGY_USED.getValue() : ConfigIntValues.GRINDER_ENERGY_USED.getValue(); - } - @Override @SuppressWarnings("unchecked") public void updateEntity(){ @@ -173,6 +167,14 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg return false; } + private int getEnergyUse(){ + return this.isDouble ? ConfigIntValues.GRINDER_DOUBLE_ENERGY_USED.getValue() : ConfigIntValues.GRINDER_ENERGY_USED.getValue(); + } + + private int getMaxCrushTime(){ + return this.isDouble ? ConfigIntValues.GRINDER_DOUBLE_CRUSH_TIME.getValue() : ConfigIntValues.GRINDER_CRUSH_TIME.getValue(); + } + public void finishCrushing(int theInput, int theFirstOutput, int theSecondOutput){ ItemStack outputOnFirst = CrusherRecipeManualRegistry.getOutput(this.slots[theInput], false); if(outputOnFirst != null){ @@ -220,6 +222,11 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg super.readFromNBT(compound); } + @Override + public boolean isItemValidForSlot(int i, ItemStack stack){ + return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && CrusherRecipeManualRegistry.getOutput(stack, false) != null; + } + @SideOnly(Side.CLIENT) public int getEnergyScaled(int i){ return this.storage.getEnergyStored()*i/this.storage.getMaxEnergyStored(); @@ -235,11 +242,6 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg return this.secondCrushTime*i/this.getMaxCrushTime(); } - @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && CrusherRecipeManualRegistry.getOutput(stack, false) != null; - } - @Override public boolean canInsertItem(int slot, ItemStack stack, int side){ return this.isItemValidForSlot(slot, stack); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java index 7d62f332e..2deb47bfb 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java @@ -27,21 +27,8 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements this.name = "container."+ModUtil.MOD_ID_LOWER+"."+name; } - @Override - public void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - if(this.slots.length > 0){ - NBTTagList tagList = new NBTTagList(); - for(int currentIndex = 0; currentIndex < slots.length; currentIndex++){ - if(slots[currentIndex] != null){ - NBTTagCompound tagCompound = new NBTTagCompound(); - tagCompound.setByte("Slot", (byte)currentIndex); - slots[currentIndex].writeToNBT(tagCompound); - tagList.appendTag(tagCompound); - } - } - compound.setTag("Items", tagList); - } + public void initializeSlots(int itemAmount){ + this.slots = new ItemStack[itemAmount]; } @Override @@ -60,11 +47,38 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } @Override + public void writeToNBT(NBTTagCompound compound){ + super.writeToNBT(compound); + if(this.slots.length > 0){ + NBTTagList tagList = new NBTTagList(); + for(int currentIndex = 0; currentIndex < slots.length; currentIndex++){ + if(slots[currentIndex] != null){ + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte)currentIndex); + slots[currentIndex].writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + compound.setTag("Items", tagList); + } + } @Override public int getInventoryStackLimit(){ return 64; } @Override + public int[] getAccessibleSlotsFromSide(int side){ + if(this.slots.length > 0){ + int[] theInt = new int[slots.length]; + for(int i = 0; i < theInt.length; i++){ + theInt[i] = i; + } + return theInt; + } + else{ + return new int[0]; + } + } @Override public boolean isUseableByPlayer(EntityPlayer player){ return player.getDistanceSq(xCoord+0.5D, yCoord+0.5D, zCoord+0.5D) <= 64; } @@ -120,9 +134,7 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements return null; } - public void initializeSlots(int itemAmount){ - this.slots = new ItemStack[itemAmount]; - } + @Override public String getInventoryName(){ @@ -144,17 +156,5 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements } - @Override - public int[] getAccessibleSlotsFromSide(int side){ - if(this.slots.length > 0){ - int[] theInt = new int[slots.length]; - for(int i = 0; i < theInt.length; i++){ - theInt[i] = i; - } - return theInt; - } - else{ - return new int[0]; - } - } + } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java index 620b374d6..596697fa6 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityItemRepairer.java @@ -34,10 +34,6 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I super(2, "repairer"); } - public static boolean canBeRepaired(ItemStack stack){ - return stack != null && stack.getItem().isRepairable(); - } - @Override @SuppressWarnings("unchecked") public void updateEntity(){ @@ -70,6 +66,10 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I } } + public static boolean canBeRepaired(ItemStack stack){ + return stack != null && stack.getItem().isRepairable(); + } + @Override public void writeToNBT(NBTTagCompound compound){ compound.setInteger("NextRepairTick", this.nextRepairTick); @@ -84,6 +84,11 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I this.storage.readFromNBT(compound); } + @Override + public boolean isItemValidForSlot(int i, ItemStack stack){ + return i == SLOT_INPUT; + } + @SideOnly(Side.CLIENT) public int getEnergyScaled(int i){ return this.storage.getEnergyStored()*i/this.storage.getMaxEnergyStored(); @@ -97,11 +102,6 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I return 0; } - @Override - public boolean isItemValidForSlot(int i, ItemStack stack){ - return i == SLOT_INPUT; - } - @Override public boolean canInsertItem(int slot, ItemStack stack, int side){ return this.isItemValidForSlot(slot, stack); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java index 3f72e19d1..6c6eb4bee 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLavaFactoryController.java @@ -30,6 +30,20 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I public EnergyStorage storage = new EnergyStorage(3000000); private int currentWorkTime; + @Override + public void readFromNBT(NBTTagCompound compound){ + this.storage.readFromNBT(compound); + this.currentWorkTime = compound.getInteger("WorkTime"); + super.readFromNBT(compound); + } + + @Override + public void writeToNBT(NBTTagCompound compound){ + this.storage.writeToNBT(compound); + compound.setInteger("WorkTime", this.currentWorkTime); + super.writeToNBT(compound); + } + @Override @SuppressWarnings("unchecked") public void updateEntity(){ @@ -60,20 +74,6 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I return NOT_MULTI; } - @Override - public void writeToNBT(NBTTagCompound compound){ - this.storage.writeToNBT(compound); - compound.setInteger("WorkTime", this.currentWorkTime); - super.writeToNBT(compound); - } - - @Override - public void readFromNBT(NBTTagCompound compound){ - this.storage.readFromNBT(compound); - this.currentWorkTime = compound.getInteger("WorkTime"); - super.readFromNBT(compound); - } - @Override public int receiveEnergy(ForgeDirection from, int maxExtract, boolean simulate){ return from != ForgeDirection.UP ? this.storage.receiveEnergy(maxExtract, simulate) : 0; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java index 11d2308be..e15571f9f 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLeafGenerator.java @@ -28,6 +28,18 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr private int nextUseCounter; + @Override + public void readFromNBT(NBTTagCompound compound){ + this.storage.readFromNBT(compound); + super.readFromNBT(compound); + } + + @Override + public void writeToNBT(NBTTagCompound compound){ + this.storage.writeToNBT(compound); + super.writeToNBT(compound); + } + @Override @SuppressWarnings("unchecked") public void updateEntity(){ @@ -81,18 +93,6 @@ public class TileEntityLeafGenerator extends TileEntityBase implements IEnergyPr } } - @Override - public void writeToNBT(NBTTagCompound compound){ - this.storage.writeToNBT(compound); - super.writeToNBT(compound); - } - - @Override - public void readFromNBT(NBTTagCompound compound){ - this.storage.readFromNBT(compound); - super.readFromNBT(compound); - } - @Override public int extractEnergy(ForgeDirection from, int maxReceive, boolean simulate){ return this.storage.extractEnergy(maxReceive, simulate); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOreMagnet.java index e4f385800..c251f2106 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityOreMagnet.java @@ -137,6 +137,18 @@ public class TileEntityOreMagnet extends TileEntityInventoryBase implements IEne } } + private boolean hasExtraWhitelist(Block block){ + String name = Block.blockRegistry.getNameForObject(block); + if(name != null){ + for(String list : ConfigValues.oreMagnetExtraWhitelist){ + if(list.equals(name)){ + return true; + } + } + } + return false; + } + private void removeBlock(int x, int y, int z, Block block, int meta, int toPlaceY){ //Remove the Block worldObj.setBlockToAir(xCoord+x, y, zCoord+z); @@ -159,18 +171,6 @@ public class TileEntityOreMagnet extends TileEntityInventoryBase implements IEne return false; } - private boolean hasExtraWhitelist(Block block){ - String name = Block.blockRegistry.getNameForObject(block); - if(name != null){ - for(String list : ConfigValues.oreMagnetExtraWhitelist){ - if(list.equals(name)){ - return true; - } - } - } - return false; - } - @SideOnly(Side.CLIENT) public int getEnergyScaled(int i){ return this.storage.getEnergyStored()*i/this.storage.getMaxEnergyStored(); diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java index c036b3363..994187102 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java @@ -137,18 +137,6 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements return this.range; } - @Override - public void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - compound.setInteger("Time", currentTime); - if(this.hasBoundPosition()){ - compound.setInteger("XCoordOfTileStored", boundPosition.getX()); - compound.setInteger("YCoordOfTileStored", boundPosition.getY()); - compound.setInteger("ZCoordOfTileStored", boundPosition.getZ()); - compound.setInteger("WorldOfTileStored", boundPosition.getWorld().provider.dimensionId); - } - } - @Override public void readFromNBT(NBTTagCompound compound){ super.readFromNBT(compound); @@ -162,6 +150,18 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements } } + @Override + public void writeToNBT(NBTTagCompound compound){ + super.writeToNBT(compound); + compound.setInteger("Time", currentTime); + if(this.hasBoundPosition()){ + compound.setInteger("XCoordOfTileStored", boundPosition.getX()); + compound.setInteger("YCoordOfTileStored", boundPosition.getY()); + compound.setInteger("ZCoordOfTileStored", boundPosition.getZ()); + compound.setInteger("WorldOfTileStored", boundPosition.getWorld().provider.dimensionId); + } + } + @Override public boolean isItemValidForSlot(int i, ItemStack stack){ return !this.isBreaker; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java index 523b2b8a2..57165a154 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java @@ -48,20 +48,6 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP super(0, name); } - public static int upgradeRange(int defaultRange, World world, int x, int y, int z){ - int newRange = defaultRange; - for(int i = 0; i < 3; i++){ - Block block = world.getBlock(x, y+1+i, z); - if(block == InitBlocks.blockPhantomBooster){ - newRange = newRange*2; - } - else{ - break; - } - } - return newRange; - } - @Override public void updateEntity(){ if(!worldObj.isRemote){ @@ -80,38 +66,18 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } } - @Override - public void writeToNBT(NBTTagCompound compound){ - super.writeToNBT(compound); - if(this.hasBoundPosition()){ - compound.setInteger("XCoordOfTileStored", boundPosition.getX()); - compound.setInteger("YCoordOfTileStored", boundPosition.getY()); - compound.setInteger("ZCoordOfTileStored", boundPosition.getZ()); - compound.setInteger("WorldOfTileStored", boundPosition.getWorld().provider.dimensionId); + public static int upgradeRange(int defaultRange, World world, int x, int y, int z){ + int newRange = defaultRange; + for(int i = 0; i < 3; i++){ + Block block = world.getBlock(x, y+1+i, z); + if(block == InitBlocks.blockPhantomBooster){ + newRange = newRange*2; + } + else{ + break; + } } - } - - @Override - public void readFromNBT(NBTTagCompound compound){ - super.readFromNBT(compound); - int x = compound.getInteger("XCoordOfTileStored"); - int y = compound.getInteger("YCoordOfTileStored"); - int z = compound.getInteger("ZCoordOfTileStored"); - World world = DimensionManager.getWorld(compound.getInteger("WorldOfTileStored")); - if(x != 0 && y != 0 && z != 0 && world != null){ - this.boundPosition = new WorldPos(world, x, y, z); - this.markDirty(); - } - } - - @Override - public boolean canInsertItem(int slot, ItemStack stack, int side){ - return false; - } - - @Override - public boolean canExtractItem(int slot, ItemStack stack, int side){ - return false; + return newRange; } @Override @@ -164,6 +130,40 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP return this.range; } + @Override + public void writeToNBT(NBTTagCompound compound){ + super.writeToNBT(compound); + if(this.hasBoundPosition()){ + compound.setInteger("XCoordOfTileStored", boundPosition.getX()); + compound.setInteger("YCoordOfTileStored", boundPosition.getY()); + compound.setInteger("ZCoordOfTileStored", boundPosition.getZ()); + compound.setInteger("WorldOfTileStored", boundPosition.getWorld().provider.dimensionId); + } + } + + @Override + public void readFromNBT(NBTTagCompound compound){ + super.readFromNBT(compound); + int x = compound.getInteger("XCoordOfTileStored"); + int y = compound.getInteger("YCoordOfTileStored"); + int z = compound.getInteger("ZCoordOfTileStored"); + World world = DimensionManager.getWorld(compound.getInteger("WorldOfTileStored")); + if(x != 0 && y != 0 && z != 0 && world != null){ + this.boundPosition = new WorldPos(world, x, y, z); + this.markDirty(); + } + } + + @Override + public boolean canInsertItem(int slot, ItemStack stack, int side){ + return false; + } + + @Override + public boolean canExtractItem(int slot, ItemStack stack, int side){ + return false; + } + public static class TileEntityPhantomLiquiface extends TileEntityPhantomface implements IFluidHandler{ public TileEntityPhantomLiquiface(){ @@ -187,6 +187,16 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } } + public IFluidHandler getHandler(){ + if(this.boundPosition != null && this.boundPosition.getWorld() != null){ + TileEntity tile = boundPosition.getWorld().getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()); + if(tile instanceof IFluidHandler){ + return (IFluidHandler)tile; + } + } + return null; + } + private void pushFluid(ForgeDirection side){ TileEntity tile = WorldUtil.getTileEntityFromSide(side, worldObj, xCoord, yCoord, zCoord); if(tile != null && tile instanceof IFluidHandler && this.getTankInfo(side) != null && this.getTankInfo(side).length > 0 && ((IFluidHandler)tile).getTankInfo(side.getOpposite()) != null && ((IFluidHandler)tile).getTankInfo(side.getOpposite()).length > 0){ @@ -204,23 +214,11 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } } } - } - - @Override + } @Override public boolean isBoundThingInRange(){ return super.isBoundThingInRange() && this.boundPosition.getWorld().getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()) instanceof IFluidHandler; } - public IFluidHandler getHandler(){ - if(this.boundPosition != null && this.boundPosition.getWorld() != null){ - TileEntity tile = boundPosition.getWorld().getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()); - if(tile instanceof IFluidHandler){ - return (IFluidHandler)tile; - } - } - return null; - } - @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill){ if(this.isBoundThingInRange()){ @@ -262,6 +260,8 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } return new FluidTankInfo[0]; } + + } public static class TileEntityPhantomEnergyface extends TileEntityPhantomface implements IEnergyHandler{ @@ -272,11 +272,17 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate){ + return this.isBoundThingInRange() && this.getReceiver() != null ? this.getReceiver().receiveEnergy(from, maxReceive, simulate) : 0; + } @Override public boolean isBoundThingInRange(){ return super.isBoundThingInRange() && (this.boundPosition.getWorld().getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()) instanceof IEnergyReceiver || this.boundPosition.getWorld().getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()) instanceof IEnergyProvider); } @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate){ + return this.isBoundThingInRange() && this.getProvider() != null ? this.getProvider().extractEnergy(from, maxExtract, simulate) : 0; + } @Override public void updateEntity(){ super.updateEntity(); @@ -292,7 +298,18 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } } - private void pushEnergy(ForgeDirection side){ + @Override + public int getEnergyStored(ForgeDirection from){ + if(this.isBoundThingInRange()){ + if(this.getProvider() != null){ + return this.getProvider().getEnergyStored(from); + } + if(this.getReceiver() != null){ + return this.getReceiver().getEnergyStored(from); + } + } + return 0; + } private void pushEnergy(ForgeDirection side){ TileEntity tile = WorldUtil.getTileEntityFromSide(side, worldObj, xCoord, yCoord, zCoord); if(tile != null && tile instanceof IEnergyReceiver && this.getProvider().getEnergyStored(ForgeDirection.UNKNOWN) > 0){ if(((IEnergyReceiver)tile).canConnectEnergy(side.getOpposite()) && this.canConnectEnergy(side)){ @@ -303,7 +320,18 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } } - public IEnergyProvider getProvider(){ + @Override + public int getMaxEnergyStored(ForgeDirection from){ + if(this.isBoundThingInRange()){ + if(this.getProvider() != null){ + return this.getProvider().getMaxEnergyStored(from); + } + if(this.getReceiver() != null){ + return this.getReceiver().getMaxEnergyStored(from); + } + } + return 0; + } public IEnergyProvider getProvider(){ if(this.boundPosition != null && this.boundPosition.getWorld() != null){ TileEntity tile = boundPosition.getWorld().getTileEntity(boundPosition.getX(), boundPosition.getY(), boundPosition.getZ()); if(tile instanceof IEnergyProvider){ @@ -323,41 +351,13 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP return null; } - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate){ - return this.isBoundThingInRange() && this.getReceiver() != null ? this.getReceiver().receiveEnergy(from, maxReceive, simulate) : 0; - } - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate){ - return this.isBoundThingInRange() && this.getProvider() != null ? this.getProvider().extractEnergy(from, maxExtract, simulate) : 0; - } - @Override - public int getEnergyStored(ForgeDirection from){ - if(this.isBoundThingInRange()){ - if(this.getProvider() != null){ - return this.getProvider().getEnergyStored(from); - } - if(this.getReceiver() != null){ - return this.getReceiver().getEnergyStored(from); - } - } - return 0; - } - @Override - public int getMaxEnergyStored(ForgeDirection from){ - if(this.isBoundThingInRange()){ - if(this.getProvider() != null){ - return this.getProvider().getMaxEnergyStored(from); - } - if(this.getReceiver() != null){ - return this.getReceiver().getMaxEnergyStored(from); - } - } - return 0; - } + + + + @Override public boolean canConnectEnergy(ForgeDirection from){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java index cb112a089..1a916c5ec 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntitySmileyCloud.java @@ -30,14 +30,9 @@ public class TileEntitySmileyCloud extends TileEntityBase implements IPacketSync private String nameBefore; @Override - public void updateEntity(){ - if(!worldObj.isRemote){ - if(!Objects.equals(this.name, this.nameBefore)){ - this.nameBefore = this.name; - this.sendUpdate(); - this.markDirty(); - } - } + public void readFromNBT(NBTTagCompound compound){ + super.readFromNBT(compound); + this.name = compound.getString("Name"); } @Override @@ -49,9 +44,14 @@ public class TileEntitySmileyCloud extends TileEntityBase implements IPacketSync } @Override - public void readFromNBT(NBTTagCompound compound){ - super.readFromNBT(compound); - this.name = compound.getString("Name"); + public void updateEntity(){ + if(!worldObj.isRemote){ + if(!Objects.equals(this.name, this.nameBefore)){ + this.nameBefore = this.name; + this.sendUpdate(); + this.markDirty(); + } + } } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java index 099806849..7b098ac12 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java @@ -17,8 +17,9 @@ import net.minecraft.item.ItemBlock; public class BlockUtil{ - public static String createUnlocalizedName(Block block){ - return ModUtil.MOD_ID_LOWER+"."+((IActAddItemOrBlock)block).getName(); + @SuppressWarnings("unchecked") + public static void register(Block block){ + register(block, true); } @SuppressWarnings("unchecked") @@ -34,8 +35,7 @@ public class BlockUtil{ } } - @SuppressWarnings("unchecked") - public static void register(Block block){ - register(block, true); + public static String createUnlocalizedName(Block block){ + return ModUtil.MOD_ID_LOWER+"."+((IActAddItemOrBlock)block).getName(); } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java index ef03fc903..bbbb88628 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java @@ -89,18 +89,6 @@ public class ItemUtil{ } } - public static void removeEnchantment(ItemStack stack, Enchantment e){ - NBTTagList ench = stack.getEnchantmentTagList(); - if(ench != null){ - for(int i = 0; i < ench.tagCount(); i++){ - short id = ench.getCompoundTagAt(i).getShort("id"); - if(id == e.effectId){ - ench.removeTag(i); - } - } - } - } - public static boolean hasEnchantment(ItemStack stack, Enchantment e){ NBTTagList ench = stack.getEnchantmentTagList(); if(ench != null){ @@ -113,4 +101,16 @@ public class ItemUtil{ } return false; } + + public static void removeEnchantment(ItemStack stack, Enchantment e){ + NBTTagList ench = stack.getEnchantmentTagList(); + if(ench != null){ + for(int i = 0; i < ench.tagCount(); i++){ + short id = ench.getCompoundTagAt(i).getShort("id"); + if(id == e.effectId){ + ench.removeTag(i); + } + } + } + } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java b/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java index e1694d079..5fd5b7220 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java @@ -33,6 +33,10 @@ public class StringUtil{ return StatCollector.translateToLocalFormatted(text, replace); } + public static boolean equalsToLowerCase(String one, String two){ + return Objects.equals(toLowerCase(one), toLowerCase(two)); + } + public static String toLowerCase(String string){ if(string == null){ return null; @@ -41,8 +45,4 @@ public class StringUtil{ return string.toLowerCase(); } } - - public static boolean equalsToLowerCase(String one, String two){ - return Objects.equals(toLowerCase(one), toLowerCase(two)); - } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java b/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java index 404bbea48..40bd59acd 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java +++ b/src/main/java/ellpeck/actuallyadditions/util/WorldPos.java @@ -30,22 +30,6 @@ public class WorldPos{ this.z = z; } - public int getX(){ - return this.x; - } - - public int getY(){ - return this.y; - } - - public int getZ(){ - return this.z; - } - - public World getWorld(){ - return this.world; - } - public Block getBlock(){ return this.world != null ? this.world.getBlock(this.x, this.y, this.z) : null; } @@ -70,6 +54,22 @@ public class WorldPos{ return pos != null && this.x == pos.getX() && this.y == pos.getY() && this.z == pos.getZ() && this.world == pos.getWorld(); } + public int getX(){ + return this.x; + } + + public int getY(){ + return this.y; + } + + public int getZ(){ + return this.z; + } + + public World getWorld(){ + return this.world; + } + public WorldPos copy(){ return new WorldPos(this.world, this.x, this.y, this.z); } diff --git a/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java b/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java index ad2bb9a7a..4926782ea 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java @@ -48,13 +48,6 @@ public class WorldUtil{ */ public static final ForgeDirection[] CARDINAL_DIRECTIONS_ORDER = new ForgeDirection[]{ForgeDirection.NORTH, ForgeDirection.EAST, ForgeDirection.SOUTH, ForgeDirection.WEST}; - public static WorldPos getCoordsFromSide(ForgeDirection side, World world, int x, int y, int z){ - if(side == ForgeDirection.UNKNOWN){ - return null; - } - return new WorldPos(world, x+side.offsetX, y+side.offsetY, z+side.offsetZ); - } - public static void breakBlockAtSide(ForgeDirection side, World world, int x, int y, int z){ if(side == ForgeDirection.UNKNOWN){ world.setBlockToAir(x, y, z); @@ -66,6 +59,13 @@ public class WorldUtil{ } } + public static WorldPos getCoordsFromSide(ForgeDirection side, World world, int x, int y, int z){ + if(side == ForgeDirection.UNKNOWN){ + return null; + } + return new WorldPos(world, x+side.offsetX, y+side.offsetY, z+side.offsetZ); + } + public static void pushEnergy(World world, int x, int y, int z, ForgeDirection side, EnergyStorage storage){ TileEntity tile = getTileEntityFromSide(side, world, x, y, z); if(tile != null && tile instanceof IEnergyReceiver && storage.getEnergyStored() > 0){ @@ -76,6 +76,14 @@ public class WorldUtil{ } } + public static TileEntity getTileEntityFromSide(ForgeDirection side, World world, int x, int y, int z){ + WorldPos c = getCoordsFromSide(side, world, x, y, z); + if(c != null){ + return world.getTileEntity(c.getX(), c.getY(), c.getZ()); + } + return null; + } + /** * Checks if a given Block with a given Meta is present in given Positions * @@ -167,14 +175,6 @@ public class WorldUtil{ return false; } - public static TileEntity getTileEntityFromSide(ForgeDirection side, World world, int x, int y, int z){ - WorldPos c = getCoordsFromSide(side, world, x, y, z); - if(c != null){ - return world.getTileEntity(c.getX(), c.getY(), c.getZ()); - } - return null; - } - public static void fillBucket(FluidTank tank, ItemStack[] slots, int inputSlot, int outputSlot){ if(slots[inputSlot] != null && tank.getFluid() != null){ ItemStack filled = FluidContainerRegistry.fillFluidContainer(tank.getFluid(), slots[inputSlot].copy()); @@ -281,10 +281,6 @@ public class WorldUtil{ return getMovingObjectPosWithReachDistance(world, player, reach, false, false, true); } - public static MovingObjectPosition getNearestBlockWithDefaultReachDistance(World world, EntityPlayer player){ - return getMovingObjectPosWithReachDistance(world, player, player instanceof EntityPlayerMP ? ((EntityPlayerMP)player).theItemInWorldManager.getBlockReachDistance() : 5.0D, false, true, false); - } - private static MovingObjectPosition getMovingObjectPosWithReachDistance(World world, EntityPlayer player, double distance, boolean p1, boolean p2, boolean p3){ float f = 1.0F; float f1 = player.prevRotationPitch+(player.rotationPitch-player.prevRotationPitch)*f; @@ -303,6 +299,10 @@ public class WorldUtil{ return world.func_147447_a(vec3, vec31, p1, p2, p3); } + public static MovingObjectPosition getNearestBlockWithDefaultReachDistance(World world, EntityPlayer player){ + return getMovingObjectPosWithReachDistance(world, player, player instanceof EntityPlayerMP ? ((EntityPlayerMP)player).theItemInWorldManager.getBlockReachDistance() : 5.0D, false, true, false); + } + /** * Harvests a Block by a Player *