diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
72 files changed, 709 insertions, 455 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index d370940b41..7f0a504a79 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -19,7 +19,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import appeng.core.CreativeTab; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -163,13 +165,13 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override @SideOnly(Side.CLIENT) - public final IIcon getIcon(final int aSide, final int aMeta) { - return mSidedTextureArray.get(aMeta).get(aSide).getIcon(); + public final IIcon getIcon(final int ordinalSide, final int aMeta) { + return mSidedTextureArray.get(aMeta).get(ForgeDirection.getOrientation(ordinalSide)).getIcon(); } @Override - public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { - return super.getIcon(aWorld, aX, aY, aZ, aSide); + public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) { + return super.getIcon(aWorld, aX, aY, aZ, ordinalSide); } @SideOnly(Side.CLIENT) @@ -178,8 +180,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + "."); // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode. - mSidedTextureArray = new AutoMap<CubicObject<SafeTexture>>(); - mSidedTexturePathArray = new AutoMap<CubicObject<String>>(); + mSidedTextureArray = new AutoMap<>(); + mSidedTexturePathArray = new AutoMap<>(); // Store them in forge order // DOWN, UP, NORTH, SOUTH, WEST, EAST @@ -325,10 +327,12 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement return l; } + @Override public Item getItemDropped(int meta, Random rand, int p_149650_3_) { return ItemUtils.getSimpleStack(this, 1).getItem(); } + @Override public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList<ItemStack> drops = new ArrayList<ItemStack>(); drops.add(ItemUtils.simpleMetaStack(this, metadata, 1)); diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index a0cdd88193..e992d01d60 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -66,8 +66,8 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side <= 1 ? this.textureArray[0] : this.textureArray[1]; + public IIcon getIcon(int ordinalSide, int meta) { + return ordinalSide <= 1 ? this.textureArray[0] : this.textureArray[1]; } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java index a3527059ab..08462c6c65 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java @@ -42,10 +42,10 @@ public abstract class BlockBaseNBT extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 ? this.textureTop - : (p_149691_1_ == 0 ? this.textureBottom - : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); + public IIcon getIcon(final int ordinalSide, final int meta) { + return ordinalSide == 1 ? this.textureTop + : (ordinalSide == 0 ? this.textureBottom + : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 88ee9a8986..c7d8866ec5 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -8,6 +8,7 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.OrePrefixes; @@ -80,12 +81,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } @Override - public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) { + public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) { return Blocks.stone.getIcon(0, 0); } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { return Blocks.stone.getIcon(0, 0); } @@ -96,11 +97,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { // .08 compat public static IIconContainer[] hiddenTextureArray; - public ITexture[] getTexture(byte arg0) { - return getTexture(null, arg0); + @Override + public ITexture[] getTexture(ForgeDirection side) { + return getTexture(null, side); } - public ITexture[] getTexture(Block block, byte side) { + @Override + public ITexture[] getTexture(Block block, ForgeDirection side) { if (this.blockMaterial != null) { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], @@ -140,19 +143,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel); } - /* - * @Override - * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon = - * iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); //this.base = - * iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(GTPlusPlus.ID + - * ":" + "blockOre_Overlay"); } - * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, - * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return - * this.blockColour; } - * @Override public int getRenderColor(final int aMeta) { if (this.blockColour == 0){ return - * MathUtils.generateSingularRandomHexValue(); } return this.blockColour; } - */ - @Override public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) { @@ -168,12 +158,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { } @Override - public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) { + public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) { return Blocks.stone.getIcon(0, 0); } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { return Blocks.stone.getIcon(0, 0); } @@ -184,11 +174,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { // .08 compat IIconContainer[] hiddenTextureArray; - public ITexture[] getTexture(byte arg0) { - return getTexture(null, arg0); + @Override + public ITexture[] getTexture(ForgeDirection side) { + return getTexture(null, side); } - public ITexture[] getTexture(Block block, byte side) { + @Override + public ITexture[] getTexture(Block block, ForgeDirection side) { if (this.blockMaterial != null) { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index 2966404a67..d80c056d65 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java @@ -67,7 +67,7 @@ public class BlockCompressedObsidian extends BlockObsidian { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int side, final int meta) { + public IIcon getIcon(final int ordinalSide, final int meta) { return this.textureArray[meta]; } diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index fee8176262..a9c309d5c7 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -41,7 +41,7 @@ public class BlockSuperLight extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { + public IIcon getIcon(final int ordinalSide, final int meta) { return this.blockIcon; } @@ -54,6 +54,7 @@ public class BlockSuperLight extends BlockContainer { /** * Returns a new instance of a block's tile entity class. Called on placing the block. */ + @Override public TileEntity createNewTileEntity(World aWorld, int p_149915_2_) { return new TileEntitySuperLight(); } @@ -75,6 +76,7 @@ public class BlockSuperLight extends BlockContainer { Logger.INFO("Created Super-Lamp"); } + @Override public void readFromNBT(NBTTagCompound aNBT) { super.readFromNBT(aNBT); mCreated = aNBT.getLong("mCreated"); @@ -90,6 +92,7 @@ public class BlockSuperLight extends BlockContainer { } } + @Override public void writeToNBT(NBTTagCompound aNBT) { super.writeToNBT(aNBT); aNBT.setLong("mCreated", mCreated); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 61e6b71b57..79b24e2405 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -48,10 +48,10 @@ public class BlockTankXpConverter extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 ? this.textureTop - : (p_149691_1_ == 0 ? this.textureBottom - : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); + public IIcon getIcon(final int ordinalSide, final int meta) { + return ordinalSide == 1 ? this.textureTop + : (ordinalSide == 0 ? this.textureBottom + : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 25210df133..e73c88bee0 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -220,7 +220,7 @@ public class FirePit extends BasicBlock { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { + public IIcon getIcon(final int ordinalSide, final int meta) { return FirePit.TEXTURE[0]; } diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index 6f4b033b4b..dbcd3ed57c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -49,10 +49,10 @@ public class FluidTankInfinite extends BlockContainer { */ @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) { - return p_149691_1_ == 1 ? this.textureTop - : (p_149691_1_ == 0 ? this.textureBottom - : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront)); + public IIcon getIcon(final int ordinalSide, final int meta) { + return ordinalSide == 1 ? this.textureTop + : (ordinalSide == 0 ? this.textureBottom + : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront)); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index 4ebd9c832b..1e864a13c8 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -426,7 +426,7 @@ public class HellFire extends BlockFire { */ @Override @SideOnly |