Skip to content

Commit

Permalink
Fix Some of the rendering errors/Tree errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bculkin2442
Alexander authored and bculkin2442 committed Feb 21, 2014
1 parent 4268f5a commit 4dca16c
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 92 deletions.
70 changes: 31 additions & 39 deletions src/main/java/tconstruct/blocks/OreberryBush.java
View file
Expand Up @@ -3,6 +3,10 @@
import java.util.List;
import java.util.Random;

import tconstruct.client.block.OreberryRender;
import tconstruct.common.TRepo;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.AbilityHelper;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
import net.minecraft.block.material.Material;
Expand All @@ -21,10 +25,6 @@
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.util.ForgeDirection;
import tconstruct.client.block.OreberryRender;
import tconstruct.common.TRepo;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.AbilityHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

Expand All @@ -37,8 +37,6 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
public String[] oreTypes;
public int itemMeat;
private int subitems;
@SideOnly(Side.CLIENT)
protected int field_150127_b;

public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes)
{
Expand All @@ -50,7 +48,7 @@ public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes)
this.setTickRandomly(true);
random = new Random();
this.setHardness(0.3F);
this.setStepSound(soundTypeMetal);
this.setStepSound(Block.soundTypeMetal);
this.setCreativeTab(TConstructRegistry.blockTab);
}

Expand All @@ -74,10 +72,9 @@ public void registerBlockIcons (IIconRegister iconRegister)
}

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int metadata)
{
if (net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics)
if (field_150121_P)
{
if (metadata < 12)
{
Expand Down Expand Up @@ -200,9 +197,8 @@ public void onBlockClicked (World world, int x, int y, int z, EntityPlayer playe
@Override
public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9)
{
/*
* if (world.isRemote) return false;
*/
/*if (world.isRemote)
return false;*/

int meta = world.getBlockMetadata(x, y, z);
if (meta >= 12)
Expand All @@ -226,6 +222,11 @@ public boolean isOpaqueCube ()
return false;
}

public void setGraphicsLevel (boolean flag)
{
field_150121_P = flag;
}

@Override
public boolean renderAsNormalBlock ()
{
Expand All @@ -239,10 +240,9 @@ public int getRenderType ()
}

@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int x, int y, int z, int meta)
{
if (meta > 7 || net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics)
if (meta > 7 || field_150121_P)
{
return super.shouldSideBeRendered(iblockaccess, x, y, z, meta);
}
Expand All @@ -262,8 +262,7 @@ public void updateTick (World world, int x, int y, int z, Random random1)
return;
}

if (random1.nextInt(20) == 0)// && world.getBlockLightValue(x, y, z) <=
// 8)
if (random1.nextInt(20) == 0)// && world.getBlockLightValue(x, y, z) <= 8)
{
if (world.getFullBlockLightValue(x, y, z) < 10)
{
Expand All @@ -273,10 +272,10 @@ public void updateTick (World world, int x, int y, int z, Random random1)
world.setBlock(x, y, z, this, meta + 4, 3);
}
}
/*
* else if (meta < 8) { world.setBlock(x, y, z, blockID, meta + 4,
* 3); }
*/
/*else if (meta < 8)
{
world.setBlock(x, y, z, blockID, meta + 4, 3);
}*/
}
}

Expand All @@ -295,20 +294,27 @@ public boolean canPlaceBlockAt (World world, int x, int y, int z)
return false;
}

/* Resistance to fire */

/**
* returns a list of items with the same ID, but different meta (eg: dye
* returns 16 items)
* returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
*/
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List)
public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3List)
{
for (int var4 = 8; var4 < 8 + subitems; ++var4)
{
par3List.add(new ItemStack(b, 1, var4));
par3List.add(new ItemStack(par1, 1, var4));
}
}

@Override
public EnumPlantType getPlantType (IBlockAccess world, int x, int y, int z)
{
return EnumPlantType.Cave;
}

@Override
public Block getPlant (IBlockAccess world, int x, int y, int z)
{
Expand All @@ -327,18 +333,4 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity
if (!(entity instanceof EntityItem))
entity.attackEntityFrom(DamageSource.cactus, 1);
}

@Override
public EnumPlantType getPlantType (IBlockAccess world, int x, int y, int z)
{
return EnumPlantType.Cave;
}

@SideOnly(Side.CLIENT)
public void setGraphicsLevel (boolean p_150122_1_)
{
this.field_150121_P = p_150122_1_;
this.field_150127_b = (p_150122_1_ ? 0 : 1);
}

}
}
3 changes: 2 additions & 1 deletion src/main/java/tconstruct/blocks/TankAirBlock.java
View file
Expand Up @@ -40,8 +40,9 @@ public int getRenderType ()
return TankAirRender.model;
}

@Override
@SideOnly(Side.CLIENT)
public void registerIcons (IIconRegister par1IconRegister)
public void registerBlockIcons (IIconRegister par1IconRegister)
{

}
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/tconstruct/blocks/slime/SlimeLeaves.java
View file
Expand Up @@ -74,23 +74,23 @@ public IIcon getIcon (int side, int meta)
{
int tex = meta % 4;

if (net.minecraft.client.Minecraft.getMinecraft().gameSettings.fancyGraphics)
if (this.field_150121_P)
return fancyIcons[tex];
else
return fastIcons[tex];
}

@Override
public void getSubBlocks (Item b, CreativeTabs tab, List list)
public void getSubBlocks (Item id, CreativeTabs tab, List list)
{
for (int iter = 0; iter < fastIcons.length; iter++)
{
list.add(new ItemStack(b, 1, iter));
list.add(new ItemStack(id, 1, iter));
}
}

@Override
public boolean isLeaves (IBlockAccess world, int x, int y, int z)
public boolean isLeaves(IBlockAccess world, int x, int y, int z)
{
return true;
}
Expand All @@ -101,14 +101,13 @@ public boolean isLeaves (IBlockAccess world, int x, int y, int z)
* Returns the ID of the items to drop on destruction.
*/
@Override
public Item getItemDropped (int par1, Random par2Random, int par3)
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
return new ItemStack(TRepo.slimeSapling).getItem();
return Item.getItemFromBlock(TRepo.slimeSapling);
}

/**
* Drops the block items with a specified chance of dropping the specified
* items
* Drops the block items with a specified chance of dropping the specified items
*/
@Override
public void dropBlockAsItemWithChance (World world, int x, int y, int z, int meta, float chance, int fortune)
Expand All @@ -117,9 +116,10 @@ public void dropBlockAsItemWithChance (World world, int x, int y, int z, int met
{
int dropChance = 35;

/*
* if ((meta & 3) == 3) { j1 = 40; }
*/
/*if ((meta & 3) == 3)
{
j1 = 40;
}*/

if (fortune > 0)
{
Expand Down Expand Up @@ -161,4 +161,4 @@ public String[] func_150125_e ()
{
return new String[] { "slime" };
}
}
}
15 changes: 8 additions & 7 deletions src/main/java/tconstruct/blocks/slime/SlimeSapling.java
View file
Expand Up @@ -31,7 +31,7 @@ public SlimeSapling()
float f = 0.4F;
setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f);
this.setHardness(0.0F);
this.stepSound = Block.soundTypeGrass;
this.setStepSound(Block.soundTypeGrass);
this.setCreativeTab(TConstructRegistry.blockTab);
}

Expand All @@ -47,9 +47,10 @@ public void registerBlockIcons (IIconRegister iconRegister)
}
}

public boolean canThisPlantGrowOnThisBlockID (Block b)
@Override
protected boolean canPlaceBlockOn(Block p_149854_1_)
{
return b == Blocks.grass || b == Blocks.dirt || b == TRepo.slimeGrass || b == TRepo.craftedSoil;
return p_149854_1_ == Blocks.grass || p_149854_1_ == Blocks.dirt || p_149854_1_ == TRepo.slimeGrass || p_149854_1_ == TRepo.craftedSoil;
}

@Override
Expand Down Expand Up @@ -112,7 +113,7 @@ public void growTree (World world, int x, int y, int z, Random random)
obj = new SlimeTreeGen(true, 5, 4, 1, 0);

if (!(obj.generate(world, random, x, y, z)))
world.setBlock(x, y, z, Blocks.air, md + 8, 3);
world.setBlock(x, y, z, this, md + 8, 3);
}

@Override
Expand All @@ -123,9 +124,9 @@ public int damageDropped (int i)

@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List)
public void getSubBlocks (Item par1, CreativeTabs par2CreativeTabs, List par3List)
{
for (int i = 0; i < 1; i++)
par3List.add(new ItemStack(b, 1, i));
par3List.add(new ItemStack(par1, 1, i));
}
}
}
25 changes: 9 additions & 16 deletions src/main/java/tconstruct/client/TClientTickHandler.java
View file
Expand Up @@ -6,31 +6,24 @@
import tconstruct.common.TRepo;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.Type;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class TClientTickHandler
{
Minecraft mc = Minecraft.getMinecraft();

TControls controlInstance = ((TProxyClient) TConstruct.proxy).controlInstance;

public TClientTickHandler()
{
}

@SideOnly(Side.CLIENT)
@SubscribeEvent
public void onTick (ClientTickEvent event)
public void tickEnd (ClientTickEvent event)
{

if (event.phase.equals(Phase.END) && event.type.equals(Type.RENDER))
{
TRepo.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P);
TRepo.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P);
TRepo.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P);
if (mc.thePlayer != null && mc.thePlayer.onGround)
controlInstance.landOnGround();
}
TRepo.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P);
TRepo.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P);
TRepo.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P);
if (mc.thePlayer != null && mc.thePlayer.onGround)
controlInstance.landOnGround();
}

/*
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/tconstruct/client/TProxyClient.java
View file
Expand Up @@ -149,6 +149,7 @@

import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.VillagerRegistry;

public class TProxyClient extends TProxyCommon
Expand Down Expand Up @@ -290,6 +291,7 @@ public static boolean classMatches (Object paramObject, String paramString)
@Override
public void registerTickHandler ()
{
FMLCommonHandler.instance().bus().register(new TClientTickHandler());
new TClientTickHandler();
// TickRegistry.registerTickHandler(new TimeTicker(), Side.CLIENT);
// TickRegistry.registerTickHandler(new TCommonTickHandler(),
Expand Down

0 comments on commit 4dca16c

Please sign in to comment.