etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed a bunch of side-onlys that were causing a server crash

This commit is contained in:
Adubbz 2013-04-22 16:51:39 +10:00
parent 1e20a0e961
commit be1a80107a
15 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java
View File

@ -24,7 +24,6 @@ import net.minecraftforge.common.IShearable;
public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
{
@SideOnly(Side.CLIENT)
private Icon[][] textures;
int[] adjacentTreeBlocks;
@ -40,7 +39,6 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[2][4];
@ -53,7 +51,6 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
return textures[(!isOpaqueCube() ? 0 : 1)][meta & 3];
@ -66,7 +63,6 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
list.add(new ItemStack(blockID, 1, 0));

6
src/minecraft/biomesoplenty/blocks/BlockBOPColorizedLeaves.java
View File

@ -23,7 +23,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearable
{
private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow"};
@SideOnly(Side.CLIENT)
private Icon[][] textures;
int[] adjacentTreeBlocks;
@ -39,7 +38,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[2][leaves.length];
@ -52,7 +50,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
@SideOnly(Side.CLIENT)
public int getBlockColor()
{
double temperature = 0.5D;
@ -61,7 +58,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderColor(int par1)
{
switch (par1)
@ -78,7 +74,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
@SideOnly(Side.CLIENT)
public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4)
{
int var6 = 0;
@ -100,7 +95,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
return textures[(!isOpaqueCube() ? 0 : 1)][getTypeFromMeta(meta)];

3
src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java
View File

@ -24,7 +24,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPColorizedSapling extends BlockSapling
{
private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private static final int TYPES = 15;
@ -37,7 +36,6 @@ public class BlockBOPColorizedSapling extends BlockSapling
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[saplings.length];
@ -58,7 +56,6 @@ public class BlockBOPColorizedSapling extends BlockSapling
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < saplings.length; ++i)

3
src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java
View File

@ -21,7 +21,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower extends BlockFlower
{
private static final String[] plants = new String[] {"tinyflower", "swampflower", "deadbloom", "glowflower", "hydrangea", "orangeflower", "pinkflower", "purpleflower", "violet", "whiteflower", "toadstool", "cactus"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
protected BlockBOPFlower(int blockID, Material material)
@ -39,7 +38,6 @@ public class BlockBOPFlower extends BlockFlower
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[plants.length];
@ -49,7 +47,6 @@ public class BlockBOPFlower extends BlockFlower
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length)

4
src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java
View File

@ -26,7 +26,6 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable
{
private static final String[] foliageTypes = new String[] {"algae", "shortgrass", "mediumgrass", "highgrassbottom", "bush", "sprout", "highgrasstop"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private static final int GRASSTOP = 6;
@ -45,7 +44,6 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[foliageTypes.length];
@ -55,7 +53,6 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta >= textures.length)
@ -65,7 +62,6 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs par2CreativeTabs, List list)
{

3
src/minecraft/biomesoplenty/blocks/BlockBOPGeneric.java
View File

@ -20,7 +20,6 @@ public class BlockBOPGeneric extends Block
ASH_STONE, HARD_SAND, HARD_DIRT, HARD_ICE, HOLY_STONE, AMETHYST_ORE, AMETHYST_BLOCK, BAMBOO_THATCHING, DRIED_DIRT, CRAG_ROCK, MUD_BRICK;
}
@SideOnly(Side.CLIENT)
private Icon texture;
private BlockType type;
@ -82,7 +81,6 @@ public class BlockBOPGeneric extends Block
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
switch (type)
@ -137,7 +135,6 @@ public class BlockBOPGeneric extends Block
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
return texture;

4
src/minecraft/biomesoplenty/blocks/BlockBOPLeaves.java
View File

@ -27,7 +27,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
}
private static final String[] leaves = new String[] {"autumn", "bamboo", "blue", "dark", "dead", "fir", "holy", "orange", "origin", "pink", "red", "white"};
@SideOnly(Side.CLIENT)
private Icon[][] textures;
private final LeafCategory category;
int[] adjacentTreeBlocks;
@ -45,7 +44,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[2][leaves.length];
@ -58,7 +56,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
return textures[(!isOpaqueCube() ? 0 : 1)][getTypeFromMeta(meta) + (this.category.ordinal() * 8)];
@ -71,7 +68,6 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < 8; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPLog.java
View File

@ -22,7 +22,6 @@ public class BlockBOPLog extends Block
}
private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead", "bigflowerstem"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private Icon[] logHearts;
@ -40,7 +39,6 @@ public class BlockBOPLog extends Block
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[types.length];
@ -57,7 +55,6 @@ public class BlockBOPLog extends Block
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
int pos = meta & 12;
@ -67,7 +64,6 @@ public class BlockBOPLog extends Block
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < 4; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPPetals.java
View File

@ -20,7 +20,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPPetals extends BlockLeavesBase implements IShearable
{
private static final String[] petals = new String[] {"bigflowerred", "bigfloweryellow"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
public BlockBOPPetals(int blockID)
@ -35,7 +34,6 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[petals.length];
@ -45,7 +43,6 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length)
@ -55,7 +52,6 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < textures.length; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPPlank.java
View File

@ -16,7 +16,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPPlank extends Block
{
private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
public BlockBOPPlank(int blockID)
@ -28,7 +27,6 @@ public class BlockBOPPlank extends Block
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[woodTypes.length];
@ -38,7 +36,6 @@ public class BlockBOPPlank extends Block
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length)
@ -48,7 +45,6 @@ public class BlockBOPPlank extends Block
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < woodTypes.length; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java
View File

@ -26,7 +26,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPPlant extends BlockFlower implements IShearable
{
private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
public BlockBOPPlant(int par1)
@ -42,7 +41,6 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[plants.length];
@ -52,7 +50,6 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length)
@ -84,7 +81,6 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < plants.length; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java
View File

@ -17,7 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPRedRock extends Block
{
private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"};
@SideOnly(Side.CLIENT)
private Icon[] textures = {null, null, null};
public BlockBOPRedRock(int par1)
@ -37,7 +36,6 @@ public class BlockBOPRedRock extends Block
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length)
@ -46,14 +44,12 @@ public class BlockBOPRedRock extends Block
return textures[meta];
}
@SideOnly(Side.CLIENT)
@Override
public int getDamageValue(World world, int x, int y, int z) {
return world.getBlockMetadata(x, y, z);
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < types.length; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java
View File

@ -33,7 +33,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPSapling extends BlockSapling
{
private static final String[] saplings = new String[] {"apple", "yellow", "bamboo", "magic", "dark", "brown", "fir", "holy", "orange", "origin", "pink", "red", "white"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private static final int TYPES = 15;
@ -46,7 +45,6 @@ public class BlockBOPSapling extends BlockSapling
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[saplings.length];
@ -57,7 +55,6 @@ public class BlockBOPSapling extends BlockSapling
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= saplings.length)
@ -67,7 +64,6 @@ public class BlockBOPSapling extends BlockSapling
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < saplings.length; ++i)

4
src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java
View File

@ -24,7 +24,6 @@ public class BlockBOPSlab extends BlockHalfSlab
}
private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"};
private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private final SlabCategory category;
@ -48,7 +47,6 @@ public class BlockBOPSlab extends BlockHalfSlab
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
if (category == SlabCategory.STONE)
@ -68,7 +66,6 @@ public class BlockBOPSlab extends BlockHalfSlab
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
if (category == SlabCategory.STONE)
@ -78,7 +75,6 @@ public class BlockBOPSlab extends BlockHalfSlab
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
int max = 0;

3
src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java
View File

@ -17,7 +17,6 @@ public class BlockBOPStairs extends BlockStairs
}
private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "redcobble", "redbrick", "mudbrick"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private final Category category;
@ -31,7 +30,6 @@ public class BlockBOPStairs extends BlockStairs
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[types.length];
@ -45,7 +43,6 @@ public class BlockBOPStairs extends BlockStairs
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int side, int meta)
{
return textures[category.ordinal()];