From 3218b8b326290162264c0f55a6695b208f22824e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 28 Oct 2015 14:46:04 +0100 Subject: [PATCH] So much fix server --- .../blocks/BlockBreaker.java | 4 +++ .../blocks/BlockCanolaPress.java | 2 ++ .../blocks/BlockCoalGenerator.java | 3 ++ .../blocks/BlockCoffeeMachine.java | 1 + .../blocks/BlockColoredLamp.java | 25 +++++++++------- .../blocks/BlockCompost.java | 1 + .../blocks/BlockDirectionalBreaker.java | 4 +++ .../blocks/BlockDropper.java | 4 +++ .../blocks/BlockEnergizer.java | 3 ++ .../actuallyadditions/blocks/BlockFeeder.java | 2 ++ .../blocks/BlockFermentingBarrel.java | 2 ++ .../blocks/BlockFishingNet.java | 1 + .../blocks/BlockFluidCollector.java | 4 +++ .../blocks/BlockFluidFlowing.java | 3 ++ .../blocks/BlockFurnaceDouble.java | 5 ++++ .../blocks/BlockFurnaceSolar.java | 1 + .../blocks/BlockGeneric.java | 1 + .../blocks/BlockGiantChest.java | 3 ++ .../blocks/BlockGreenhouseGlass.java | 1 + .../blocks/BlockGrinder.java | 4 +++ .../blocks/BlockHeatCollector.java | 3 ++ .../blocks/BlockInputter.java | 1 + .../blocks/BlockItemRepairer.java | 3 ++ .../blocks/BlockLampPowerer.java | 3 ++ .../blocks/BlockLaserRelay.java | 1 + .../blocks/BlockLavaFactoryController.java | 2 ++ .../blocks/BlockLeafGenerator.java | 3 ++ .../actuallyadditions/blocks/BlockMisc.java | 7 ++++- .../blocks/BlockOilGenerator.java | 3 ++ .../blocks/BlockOreMagnet.java | 3 ++ .../blocks/BlockPhantom.java | 2 ++ .../blocks/BlockPhantomBooster.java | 1 + .../actuallyadditions/blocks/BlockPlant.java | 5 +++- .../blocks/BlockRangedCollector.java | 1 + .../blocks/BlockSmileyCloud.java | 1 + .../blocks/BlockTreasureChest.java | 5 ++++ .../blocks/BlockWildPlant.java | 4 +-- .../blocks/BlockXPSolidifier.java | 4 +++ .../booklet/BookletChapter.java | 8 ++--- .../booklet/BookletIndexEntry.java | 10 +++---- .../items/InitForeignPaxels.java | 14 ++++----- .../actuallyadditions/items/ItemArmorAA.java | 1 + .../actuallyadditions/items/ItemBattery.java | 1 + .../actuallyadditions/items/ItemBucketAA.java | 1 + .../items/ItemChestToCrateUpgrade.java | 1 + .../actuallyadditions/items/ItemCoffee.java | 1 + .../items/ItemCrafterOnAStick.java | 1 + .../actuallyadditions/items/ItemDrill.java | 1 + .../items/ItemDrillUpgrade.java | 1 + .../actuallyadditions/items/ItemDust.java | 1 + .../items/ItemFertilizer.java | 1 + .../actuallyadditions/items/ItemFoods.java | 5 +++- .../items/ItemGrowthRing.java | 1 + .../items/ItemHairyBall.java | 1 + .../actuallyadditions/items/ItemJams.java | 1 + .../actuallyadditions/items/ItemKnife.java | 1 + .../items/ItemLaserWrench.java | 1 + .../items/ItemLeafBlower.java | 1 + .../items/ItemMagnetRing.java | 1 + .../actuallyadditions/items/ItemMisc.java | 5 +++- .../items/ItemPhantomConnector.java | 1 + .../items/ItemPotionRing.java | 1 + .../items/ItemResonantRice.java | 1 + .../actuallyadditions/items/ItemSeed.java | 1 + .../items/ItemSpecialDrop.java | 5 +++- .../items/ItemTeleStaff.java | 1 + .../items/ItemWaterRemovalRing.java | 1 + .../items/ItemWingsOfTheBats.java | 1 + .../items/tools/ItemAllToolAA.java | 17 ++++++----- .../items/tools/ItemAxeAA.java | 1 + .../items/tools/ItemHoeAA.java | 1 + .../items/tools/ItemPickaxeAA.java | 1 + .../items/tools/ItemShovelAA.java | 1 + .../items/tools/ItemSwordAA.java | 1 + .../actuallyadditions/misc/RenderSpecial.java | 2 +- .../tile/TileEntityInputter.java | 26 ++++++++-------- .../tile/TileEntityLaserRelay.java | 12 ++++---- .../tile/TileEntityPhantomface.java | 30 +++++++++---------- .../actuallyadditions/util/BlockUtil.java | 8 ++--- 79 files changed, 215 insertions(+), 82 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java index b5c4f7a12..0ce77d71e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java @@ -32,7 +32,9 @@ import net.minecraft.world.World; public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon frontIcon; + @SideOnly(Side.CLIENT) private IIcon topIcon; private boolean isPlacer; @@ -52,6 +54,7 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side != meta && (side == 0 || side == 1)){ @@ -64,6 +67,7 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 0 || side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java index 2a120a94a..910a43791 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java @@ -29,6 +29,7 @@ import net.minecraft.world.World; public class BlockCanolaPress extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; public BlockCanolaPress(){ @@ -45,6 +46,7 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side == 1 || side == 0 ? this.topIcon : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java index b76b4f162..aabe11828 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java @@ -32,7 +32,9 @@ import java.util.Random; public class BlockCoalGenerator extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockCoalGenerator(){ @@ -50,6 +52,7 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side <= 1 ? (side == 0 ? this.bottomIcon : this.topIcon) : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index 07ed3f308..c2c6d8ed1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -54,6 +54,7 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index 90d7931a6..d254c4f4f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -37,7 +37,8 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ public static TheColoredLampColors[] allLampTypes = TheColoredLampColors.values(); public boolean isOn; - private IIcon[] textures = new IIcon[allLampTypes.length]; + @SideOnly(Side.CLIENT) + private IIcon[] textures; public BlockColoredLamp(boolean isOn){ super(Material.redstoneLight); @@ -58,6 +59,7 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return meta >= allLampTypes.length ? null : textures[meta]; } @@ -127,6 +129,7 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ + this.textures = new IIcon[allLampTypes.length]; for(int i = 0; i < allLampTypes.length; i++){ this.textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+((IActAddItemOrBlock)InitBlocks.blockColoredLamp).getName()+allLampTypes[i].name+(isOn ? "On" : "")); } @@ -145,11 +148,6 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @Override - public int getMetadata(int damage){ - return damage; - } - @Override public String getItemStackDisplayName(ItemStack stack){ if(stack.getItemDamage() >= allLampTypes.length){ @@ -158,15 +156,20 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ return StringUtil.localize(this.getUnlocalizedName(stack)+".name")+(((BlockColoredLamp)this.field_150939_a).isOn ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".onSuffix.desc")+")" : ""); } + @Override + public String getUnlocalizedName(ItemStack stack){ + return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].name; + } + + @Override + public int getMetadata(int damage){ + return damage; + } + @Override public EnumRarity getRarity(ItemStack stack){ EnumRarity rarity = ((IActAddItemOrBlock)this.field_150939_a).getRarity(stack); return rarity == null ? EnumRarity.common : rarity; } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].name; - } } } \ 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 f30e32a6a..4727be853 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -57,6 +57,7 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java index 2b5157e47..badd8980b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java @@ -32,7 +32,9 @@ import net.minecraft.world.World; public class BlockDirectionalBreaker extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon frontIcon; + @SideOnly(Side.CLIENT) private IIcon topIcon; public BlockDirectionalBreaker(){ @@ -49,6 +51,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase implements IActA } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side != meta && (side == 0 || side == 1)){ @@ -61,6 +64,7 @@ public class BlockDirectionalBreaker extends BlockContainerBase implements IActA } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 0 || side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java index 508b29c38..0ddcfe509 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java @@ -32,7 +32,9 @@ import net.minecraft.world.World; public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon frontIcon; + @SideOnly(Side.CLIENT) private IIcon topIcon; public BlockDropper(){ @@ -49,6 +51,7 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side != meta && (side == 0 || side == 1)){ @@ -61,6 +64,7 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 0 || side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java index d79593005..45e0319ca 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java @@ -30,7 +30,9 @@ import net.minecraft.world.World; public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon sideIcon; private boolean isEnergizer; @@ -49,6 +51,7 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side == 1 ? this.topIcon : (side == 0 ? this.blockIcon : this.sideIcon); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index b4a65dc9f..7aaef3fbc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -29,6 +29,7 @@ import net.minecraft.world.World; public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; public BlockFeeder(){ @@ -45,6 +46,7 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return (side == 0 || side == 1) ? this.topIcon : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java index 1d67b3dfc..1f81b3b96 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java @@ -29,6 +29,7 @@ import net.minecraft.world.World; public class BlockFermentingBarrel extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon iconTop; public BlockFermentingBarrel(){ @@ -51,6 +52,7 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return side <= 1 ? this.iconTop : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index f027772b7..0845f3981 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -51,6 +51,7 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java index 7459967b5..1b331c073 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java @@ -32,7 +32,9 @@ import net.minecraft.world.World; public class BlockFluidCollector extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon frontIcon; + @SideOnly(Side.CLIENT) private IIcon topIcon; private boolean isPlacer; @@ -52,6 +54,7 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side != meta && (side == 0 || side == 1)){ @@ -64,6 +67,7 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 0 || side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java index 46c28cccf..bf9517eeb 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java @@ -26,7 +26,9 @@ import net.minecraftforge.fluids.Fluid; public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) public IIcon stillIcon; + @SideOnly(Side.CLIENT) public IIcon flowingIcon; private String name; @@ -48,6 +50,7 @@ public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemO } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side <= 1 ? this.stillIcon : this.flowingIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index 20e319a87..eee7c2878 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -35,8 +35,11 @@ import java.util.Random; public class BlockFurnaceDouble extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon onIcon; + @SideOnly(Side.CLIENT) private IIcon frontIcon; public BlockFurnaceDouble(){ @@ -54,6 +57,7 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side == 1){ @@ -69,6 +73,7 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index 9259da42d..f2d0a9d81 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -53,6 +53,7 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java index be67c0426..125403510 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java @@ -35,6 +35,7 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index 54775aa24..486eb1be3 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -29,7 +29,9 @@ import net.minecraft.world.World; public class BlockGiantChest extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockGiantChest(){ @@ -46,6 +48,7 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java index f838d0d6e..7eca03e4f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java @@ -48,6 +48,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index 11b6cfc58..e0a401b32 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -34,8 +34,11 @@ import java.util.Random; public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlock{ private final boolean isDouble; + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon onIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockGrinder(boolean isDouble){ @@ -54,6 +57,7 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 1 && meta != 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index d8d1648ab..8869ea63c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -27,7 +27,9 @@ import net.minecraft.world.World; public class BlockHeatCollector extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockHeatCollector(){ @@ -44,6 +46,7 @@ public class BlockHeatCollector extends BlockContainerBase implements IActAddIte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index 84d2737fb..c385a85e1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -54,6 +54,7 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java index 51c30c724..068276a25 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java @@ -30,7 +30,9 @@ import net.minecraft.world.World; public class BlockItemRepairer extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockItemRepairer(){ @@ -48,6 +50,7 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java index 679a1b89f..cb5b04752 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java @@ -30,6 +30,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon frontIcon; public BlockLampPowerer(){ @@ -41,6 +42,7 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side == meta){ @@ -50,6 +52,7 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 3){ return this.frontIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java index 9b79eb1f2..ab5545c1a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java @@ -45,6 +45,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IActAddItemOr } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java index 531428eac..43eaf9d52 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java @@ -28,6 +28,7 @@ import net.minecraft.world.World; public class BlockLavaFactoryController extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; public BlockLavaFactoryController(){ @@ -44,6 +45,7 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side == 1 ? this.topIcon : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java index b60cbe6c5..5a06cda2d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java @@ -28,7 +28,9 @@ import net.minecraft.world.World; public class BlockLeafGenerator extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockLeafGenerator(){ @@ -45,6 +47,7 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side <= 1 ? (side == 0 ? this.bottomIcon : this.topIcon) : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 8608cf29f..9074dc03e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -31,9 +31,12 @@ import java.util.List; public class BlockMisc extends Block implements IActAddItemOrBlock{ public static final TheMiscBlocks[] allMiscBlocks = TheMiscBlocks.values(); - public IIcon[] textures = new IIcon[allMiscBlocks.length]; + @SideOnly(Side.CLIENT) + public IIcon[] textures; + @SideOnly(Side.CLIENT) private IIcon stoneCasingSeasonalTop; + @SideOnly(Side.CLIENT) private IIcon stoneCasingSeasonal; public BlockMisc(){ @@ -44,6 +47,7 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ if(ClientProxy.jingleAllTheWay && metadata == TheMiscBlocks.STONE_CASING.ordinal() && side != 0){ return side == 1 ? this.stoneCasingSeasonalTop : this.stoneCasingSeasonal; @@ -67,6 +71,7 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ + this.textures = new IIcon[allMiscBlocks.length]; for(int i = 0; i < textures.length; i++){ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscBlocks[i].name); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java index 1afcd85d6..5fba34347 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java @@ -32,7 +32,9 @@ import java.util.Random; public class BlockOilGenerator extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockOilGenerator(){ @@ -50,6 +52,7 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return side <= 1 ? (side == 0 ? this.bottomIcon : this.topIcon) : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java index 5a0a0332e..de2264fab 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java @@ -29,7 +29,9 @@ import net.minecraft.world.World; public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; public BlockOreMagnet(){ @@ -46,6 +48,7 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return (side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon)); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java index 6cc4b063f..fc557c1a3 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java @@ -37,6 +37,7 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo public Type type; public int range; + @SideOnly(Side.CLIENT) private IIcon iconSeasonal; public BlockPhantom(Type type){ @@ -80,6 +81,7 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return (this.type == Type.FACE && ClientProxy.pumpkinBlurPumpkinBlur && side > 1) ? this.iconSeasonal : this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index f9d37a8b7..fde34920c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -48,6 +48,7 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java index 37cfd1176..088321f3d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java @@ -31,14 +31,16 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ public Item seedItem; public Item returnItem; public int returnMeta; + @SideOnly(Side.CLIENT) private IIcon[] textures; + private int stages; private String name; private int minDropAmount; private int addDropAmount; public BlockPlant(String name, int stages, int minDropAmount, int addDropAmount){ this.name = name; - this.textures = new IIcon[stages]; + this.stages = stages; this.minDropAmount = minDropAmount; this.addDropAmount = addDropAmount; } @@ -80,6 +82,7 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ + this.textures = new IIcon[this.stages]; for(int i = 0; i < this.textures.length; i++){ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Stage"+(i+1)); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java index 7f8de83d2..d321f5046 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java @@ -43,6 +43,7 @@ public class BlockRangedCollector extends BlockContainerBase implements IActAddI } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java index bbae639d8..fdc89a61b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java @@ -51,6 +51,7 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return this.blockIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java index 0872cfbc9..9e6a62e98 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java @@ -36,8 +36,11 @@ import java.util.Random; public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon bottomIcon; + @SideOnly(Side.CLIENT) private IIcon frontIcon; public BlockTreasureChest(){ @@ -50,6 +53,7 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); if(side == 1){ @@ -65,6 +69,7 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 1){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index 284c4909b..51a09a3a0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -33,7 +33,6 @@ import java.util.List; public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ public static final TheWildPlants[] allWildPlants = TheWildPlants.values(); - public IIcon[] textures = new IIcon[allWildPlants.length]; public BlockWildPlant(){ this.setStepSound(soundTypeGrass); @@ -45,6 +44,7 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ return metadata >= allWildPlants.length ? null : allWildPlants[metadata].wildVersionOf.getIcon(0, 7); } @@ -98,8 +98,8 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ this.setMaxDamage(0); } - @SideOnly(Side.CLIENT) @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta){ return this.field_150939_a.getIcon(0, meta); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java index b8e5a4feb..036541aa3 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java @@ -35,7 +35,9 @@ import net.minecraft.world.World; public class BlockXPSolidifier extends BlockContainerBase implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon topIcon; + @SideOnly(Side.CLIENT) private IIcon frontIcon; public BlockXPSolidifier(){ @@ -52,6 +54,7 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem } @Override + @SideOnly(Side.CLIENT) 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){ @@ -64,6 +67,7 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta){ if(side == 1 || side == 0){ return this.topIcon; diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java b/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java index c611f05ce..3399dbae1 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/BookletChapter.java @@ -44,14 +44,14 @@ public class BookletChapter{ return this.unlocalizedName; } - public String getLocalizedName(){ - return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.unlocalizedName+".name"); - } - public String getNameWithColor(){ return this.color+this.getLocalizedName(); } + public String getLocalizedName(){ + return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".chapter."+this.unlocalizedName+".name"); + } + public BookletChapter setImportant(){ this.color = EnumChatFormatting.DARK_GREEN; return this; diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java b/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java index 140d7259b..3ad7bd543 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/BookletIndexEntry.java @@ -19,8 +19,8 @@ import java.util.ArrayList; public class BookletIndexEntry{ private final String unlocalizedName; - private EnumChatFormatting color; public ArrayList chapters = new ArrayList(); + private EnumChatFormatting color; public BookletIndexEntry(String unlocalizedName){ this.unlocalizedName = unlocalizedName; @@ -37,14 +37,14 @@ public class BookletIndexEntry{ this.chapters.add(chapter); } - public String getLocalizedName(){ - return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".indexEntry."+this.unlocalizedName+".name"); - } - public String getNameWithColor(){ return this.color+this.getLocalizedName(); } + public String getLocalizedName(){ + return StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".indexEntry."+this.unlocalizedName+".name"); + } + public BookletIndexEntry setImportant(){ this.color = EnumChatFormatting.DARK_GREEN; return this; diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java b/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java index 0199ee876..47d3b927d 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitForeignPaxels.java @@ -27,25 +27,23 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public class InitForeignPaxels{ - //MekanismTools - private static final String MEKANISM_TOOLS = "MekanismTools"; public static final int[] MT_COLORS = new int[]{4166, 2248890, 8882649, 12410135, 11451392, 3684412}; public static final String[] MT_NAMES = new String[]{"Obsidian", "LapisLazuli", "Osmium", "Bronze", "Glowstone", "Steel"}; + public static final int[] TF_COLORS = new int[]{13332762, 5407943, 5407895, 5394789, 12960613, 12960653, 12410135, 2999795, 10143162}; + public static final int[] SO_COLORS = new int[]{9409450, 2040021, 5714944, 526344, 545032}; + //MekanismTools + private static final String MEKANISM_TOOLS = "MekanismTools"; private static final String[] MT_REPAIR_NAMES = new String[]{"ingotRefinedObsidian", "gemLapis", "ingotOsmium", "ingotBronze", "ingotRefinedGlowstone", "ingotSteel"}; - private static Item[] mtPaxels = new Item[6]; - //ThermalFoundation private static final String THERMAL_FOUNDATION = "ThermalFoundation"; - public static final int[] TF_COLORS = new int[]{13332762, 5407943, 5407895, 5394789, 12960613, 12960653, 12410135, 2999795, 10143162}; private static final String[] TF_NAMES = new String[]{"Copper", "Tin", "Silver", "Lead", "Nickel", "Electrum", "Bronze", "Platinum", "Invar"}; - public static Item[] tfPaxels = new Item[9]; - //SimpleOres private static final String SIMPLE_ORES = "simpleores"; - public static final int[] SO_COLORS = new int[]{9409450, 2040021, 5714944, 526344, 545032}; private static final String[] SO_NAMES = new String[]{"tin", "mythril", "copper", "onyx", "adamantium"}; private static final String[] SO_REPAIR_NAMES = new String[]{"ingotTin", "ingotMythril", "ingotCopper", "gemOnyx", "ingotAdamantium"}; + public static Item[] tfPaxels = new Item[9]; public static Item[] soPaxels = new Item[5]; + private static Item[] mtPaxels = new Item[6]; public static void init(){ //SimpleOres diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java b/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java index 9229d96df..a7f9d1077 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java @@ -45,6 +45,7 @@ public class ItemArmorAA extends ItemArmor implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java index cec653f67..6c4850cbe 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java @@ -40,6 +40,7 @@ public class ItemBattery extends ItemEnergy{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java index fc642384c..08ceb4c10 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java @@ -44,6 +44,7 @@ public class ItemBucketAA extends ItemBucket implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java b/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java index cb58a1ead..55c5b3980 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java @@ -86,6 +86,7 @@ public class ItemChestToCrateUpgrade extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java index 558c50db2..1b9c9e3e6 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java @@ -188,6 +188,7 @@ public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java index 8754e6030..ca4692a84 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java @@ -50,6 +50,7 @@ public class ItemCrafterOnAStick extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index a6d04ecc7..2fa3df505 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -247,6 +247,7 @@ public class ItemDrill extends ItemEnergy{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java index ec2dd8463..8614f6e1e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java @@ -67,6 +67,7 @@ public class ItemDrillUpgrade extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java index 4f0eaf00b..1925aed89 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java @@ -73,6 +73,7 @@ public class ItemDust extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java index e4fceb846..47abf04d0 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java @@ -48,6 +48,7 @@ public class ItemFertilizer extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java index f2b4608cf..369c88874 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java @@ -28,7 +28,8 @@ import java.util.List; public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ public static final TheFoods[] allFoods = TheFoods.values(); - public IIcon[] textures = new IIcon[allFoods.length]; + @SideOnly(Side.CLIENT) + public IIcon[] textures; public ItemFoods(){ super(0, 0.0F, false); @@ -74,6 +75,7 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1){ return par1 >= textures.length ? null : textures[par1]; } @@ -104,6 +106,7 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ + this.textures = new IIcon[allFoods.length]; for(int i = 0; i < textures.length; i++){ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allFoods[i].name); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java index 91f1d8826..d515ff346 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java @@ -111,6 +111,7 @@ public class ItemGrowthRing extends ItemEnergy{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java b/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java index efd342d74..4b5349052 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java @@ -60,6 +60,7 @@ public class ItemHairyBall extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java index 0206b62ec..ad7b5c851 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java @@ -33,6 +33,7 @@ import java.util.List; public class ItemJams extends ItemFood implements IActAddItemOrBlock{ public static final TheJams[] allJams = TheJams.values(); + @SideOnly(Side.CLIENT) public IIcon overlayIcon; public ItemJams(){ diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java index 7ae823edd..26f54bafc 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java @@ -75,6 +75,7 @@ public class ItemKnife extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemLaserWrench.java b/src/main/java/ellpeck/actuallyadditions/items/ItemLaserWrench.java index 1ca546064..ee3d3f1e2 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemLaserWrench.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemLaserWrench.java @@ -107,6 +107,7 @@ public class ItemLaserWrench extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) 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 e29ffae57..5418e8309 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java @@ -131,6 +131,7 @@ public class ItemLeafBlower extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java index eeb235bec..510eca331 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java @@ -75,6 +75,7 @@ public class ItemMagnetRing extends ItemEnergy{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java index 703ec328b..eecaa168a 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java @@ -27,13 +27,15 @@ import java.util.List; public class ItemMisc extends Item implements IActAddItemOrBlock{ public static final TheMiscItems[] allMiscItems = TheMiscItems.values(); - public IIcon[] textures = new IIcon[allMiscItems.length]; + @SideOnly(Side.CLIENT) + public IIcon[] textures; public ItemMisc(){ this.setHasSubtypes(true); } @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1){ return par1 >= textures.length ? null : textures[par1]; } @@ -64,6 +66,7 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ + this.textures = new IIcon[allMiscItems.length]; for(int i = 0; i < textures.length; i++){ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscItems[i].name); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java index 12f0005a1..f49c715dc 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java @@ -146,6 +146,7 @@ public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java index f1c93079f..905785632 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java @@ -117,6 +117,7 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) 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 b4daf9607..b6b7f82c6 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java @@ -45,6 +45,7 @@ public class ItemResonantRice extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java index ea2bf912d..59ab0ddbe 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java @@ -53,6 +53,7 @@ public class ItemSeed extends ItemSeeds implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java index b5904d646..b7e0d088c 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java @@ -32,13 +32,15 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ public static final int SOLID_XP_AMOUNT = 8; public static final TheSpecialDrops[] allDrops = TheSpecialDrops.values(); - public IIcon[] textures = new IIcon[allDrops.length]; + @SideOnly(Side.CLIENT) + public IIcon[] textures; public ItemSpecialDrop(){ this.setHasSubtypes(true); } @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1){ return par1 >= textures.length ? null : textures[par1]; } @@ -90,6 +92,7 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ + this.textures = new IIcon[allDrops.length]; for(int i = 0; i < textures.length; i++){ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allDrops[i].name); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java b/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java index 6a0fd1f18..20964ad39 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java @@ -91,6 +91,7 @@ public class ItemTeleStaff extends ItemEnergy{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java index 8c348b9cd..398ca3a22 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java @@ -84,6 +84,7 @@ public class ItemWaterRemovalRing extends ItemEnergy{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java b/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java index 40ece5a05..4bb255738 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java @@ -104,6 +104,7 @@ public class ItemWingsOfTheBats extends Item implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java index 4120c08b5..69b7a6ee4 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java @@ -37,6 +37,7 @@ import java.util.Set; @SuppressWarnings("unchecked") public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ + @SideOnly(Side.CLIENT) private IIcon overlayIcon; private int color; @@ -88,15 +89,20 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ } } + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass){ + return pass > 0 ? this.color : super.getColorFromItemStack(stack, pass); + } + @Override public EnumRarity getRarity(ItemStack stack){ return this.rarity; } @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int pass){ - return pass > 0 ? this.color : super.getColorFromItemStack(stack, pass); + public boolean requiresMultipleRenderPasses(){ + return true; } @Override @@ -112,11 +118,6 @@ public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{ this.overlayIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":itemPaxelOverlay"); } - @Override - public boolean requiresMultipleRenderPasses(){ - return true; - } - @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))); diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java index 957ca5a4b..32aa628c8 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java @@ -57,6 +57,7 @@ public class ItemAxeAA extends ItemAxe implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java index 0d6907ae3..d20113a47 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java @@ -59,6 +59,7 @@ public class ItemHoeAA extends ItemHoe implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java index 4811282a2..fd2c7cef6 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java @@ -57,6 +57,7 @@ public class ItemPickaxeAA extends ItemPickaxe implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java index 34f570275..eddc57e64 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java @@ -59,6 +59,7 @@ public class ItemShovelAA extends ItemSpade implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java index 1ba255897..7fb6bdf86 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java @@ -59,6 +59,7 @@ public class ItemSwordAA extends ItemSword implements IActAddItemOrBlock{ } @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass){ return this.itemIcon; } diff --git a/src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java b/src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java index e803629a5..91afbee47 100644 --- a/src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java +++ b/src/main/java/ellpeck/actuallyadditions/misc/RenderSpecial.java @@ -42,7 +42,7 @@ public class RenderSpecial{ } if(ClientProxy.pumpkinBlurPumpkinBlur){ - this.theThingToRender = new ItemStack(Calendar.getInstance().get(Calendar.DAY_OF_MONTH) % 2 == 0 ? Blocks.lit_pumpkin : Blocks.pumpkin); + this.theThingToRender = new ItemStack(Calendar.getInstance().get(Calendar.DAY_OF_MONTH)%2 == 0 ? Blocks.lit_pumpkin : Blocks.pumpkin); size = 0.3F; offsetUp = 0; } diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java index ca9179606..b52d0ca85 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java @@ -400,19 +400,6 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt this.markDirty(); } - @Override - public void readSyncableNBT(NBTTagCompound compound, boolean sync){ - this.sideToPut = compound.getInteger("SideToPut"); - this.slotToPutStart = compound.getInteger("SlotToPut"); - this.slotToPutEnd = compound.getInteger("SlotToPutEnd"); - this.sideToPull = compound.getInteger("SideToPull"); - this.slotToPullStart = compound.getInteger("SlotToPull"); - this.slotToPullEnd = compound.getInteger("SlotToPullEnd"); - this.isPullWhitelist = compound.getBoolean("PullWhitelist"); - this.isPutWhitelist = compound.getBoolean("PutWhitelist"); - super.readSyncableNBT(compound, sync); - } - @Override public void writeSyncableNBT(NBTTagCompound compound, boolean sync){ super.writeSyncableNBT(compound, sync); @@ -426,6 +413,19 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt compound.setBoolean("PutWhitelist", this.isPutWhitelist); } + @Override + public void readSyncableNBT(NBTTagCompound compound, boolean sync){ + this.sideToPut = compound.getInteger("SideToPut"); + this.slotToPutStart = compound.getInteger("SlotToPut"); + this.slotToPutEnd = compound.getInteger("SlotToPutEnd"); + this.sideToPull = compound.getInteger("SideToPull"); + this.slotToPullStart = compound.getInteger("SlotToPull"); + this.slotToPullEnd = compound.getInteger("SlotToPullEnd"); + this.isPullWhitelist = compound.getBoolean("PullWhitelist"); + this.isPutWhitelist = compound.getBoolean("PutWhitelist"); + super.readSyncableNBT(compound, sync); + } + @Override public boolean isItemValidForSlot(int i, ItemStack stack){ return i == 0; diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java index 4c2795d89..b13be45cb 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityLaserRelay.java @@ -28,12 +28,6 @@ import java.util.ArrayList; public class TileEntityLaserRelay extends TileEntityBase implements IEnergyReceiver{ - @Override - public void invalidate(){ - super.invalidate(); - LaserRelayConnectionHandler.getInstance().removeRelayFromNetwork(new WorldPos(this.worldObj, this.xCoord, this.yCoord, this.zCoord)); - } - @Override public void updateEntity(){ if(this.worldObj.isRemote){ @@ -41,6 +35,12 @@ public class TileEntityLaserRelay extends TileEntityBase implements IEnergyRecei } } + @Override + public void invalidate(){ + super.invalidate(); + LaserRelayConnectionHandler.getInstance().removeRelayFromNetwork(new WorldPos(this.worldObj, this.xCoord, this.yCoord, this.zCoord)); + } + @SideOnly(Side.CLIENT) public void renderParticles(){ if(this.worldObj.rand.nextInt(2) == 0){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java index 8bfab305a..8c868bbb5 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java @@ -61,21 +61,6 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP } } - @SideOnly(Side.CLIENT) - public void renderParticles(){ - if(this.worldObj.rand.nextInt(2) == 0){ - double d1 = (double)((float)this.boundPosition.getY()+worldObj.rand.nextFloat()); - int i1 = worldObj.rand.nextInt(2)*2-1; - int j1 = worldObj.rand.nextInt(2)*2-1; - double d4 = ((double)worldObj.rand.nextFloat()-0.5D)*0.125D; - double d2 = (double)this.boundPosition.getZ()+0.5D+0.25D*(double)j1; - double d5 = (double)(worldObj.rand.nextFloat()*1.0F*(float)j1); - double d0 = (double)this.boundPosition.getX()+0.5D+0.25D*(double)i1; - double d3 = (double)(worldObj.rand.nextFloat()*1.0F*(float)i1); - worldObj.spawnParticle("portal", d0, d1, d2, d3, d4, d5); - } - } - public static int upgradeRange(int defaultRange, World world, int x, int y, int z){ int newRange = defaultRange; for(int i = 0; i < 3; i++){ @@ -102,6 +87,21 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP return false; } + @SideOnly(Side.CLIENT) + public void renderParticles(){ + if(this.worldObj.rand.nextInt(2) == 0){ + double d1 = (double)((float)this.boundPosition.getY()+worldObj.rand.nextFloat()); + int i1 = worldObj.rand.nextInt(2)*2-1; + int j1 = worldObj.rand.nextInt(2)*2-1; + double d4 = ((double)worldObj.rand.nextFloat()-0.5D)*0.125D; + double d2 = (double)this.boundPosition.getZ()+0.5D+0.25D*(double)j1; + double d5 = (double)(worldObj.rand.nextFloat()*1.0F*(float)j1); + double d0 = (double)this.boundPosition.getX()+0.5D+0.25D*(double)i1; + double d3 = (double)(worldObj.rand.nextFloat()*1.0F*(float)i1); + worldObj.spawnParticle("portal", d0, d1, d2, d3, d4, d5); + } + } + @Override public boolean isBoundThingInRange(){ if(this.hasBoundPosition()){ diff --git a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java index a435df838..66fa60af2 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java @@ -18,6 +18,10 @@ import net.minecraft.item.ItemBlock; public class BlockUtil{ + public static void register(Block block){ + register(block, ItemBlockBase.class); + } + public static void register(Block block, Class itemBlock){ block.setCreativeTab(CreativeTab.instance); block.setBlockName(createUnlocalizedName(block)); @@ -27,8 +31,4 @@ public class BlockUtil{ public static String createUnlocalizedName(Block block){ return ModUtil.MOD_ID_LOWER+"."+((IActAddItemOrBlock)block).getName(); } - - public static void register(Block block){ - register(block, ItemBlockBase.class); - } }