mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
more of project "FUN"
This commit is contained in:
1 parent
7d8f58ea88
commit
ad96fbfa61
17 files changed
+512
-500
No files matched your search
@@ -95,7 +95,7 @@ public class CastingChannelBlock extends BlockContainer
|
||||
@Override
|
||||
public void registerIcons (IIconRegister iconRegister)
|
||||
{
|
||||
this.blockIcon = iconRegister.registerIcon("tinker:searedstone");
|
||||
this.field_149761_L = iconRegister.registerIcon("tinker:searedstone");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.ArrayList;
|
||||
import mantle.blocks.MantleBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.*;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
@@ -17,7 +17,7 @@ import tconstruct.util.config.PHConstruct;
|
||||
|
||||
public class GlassBlockConnected extends MantleBlock
|
||||
{
|
||||
protected Icon[] icons = new Icon[16];
|
||||
protected IIcon[] icons = new IIcon[16];
|
||||
private boolean shouldRenderSelectionBox = true;
|
||||
protected String folder;
|
||||
private int renderPass;
|
||||
@@ -33,7 +33,7 @@ public class GlassBlockConnected extends MantleBlock
|
||||
}
|
||||
|
||||
//For FMP support
|
||||
public Icon[] getIcons ()
|
||||
public IIcon[] getIcons ()
|
||||
{
|
||||
return icons;
|
||||
}
|
||||
@@ -71,12 +71,12 @@ public class GlassBlockConnected extends MantleBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
public IIcon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons);
|
||||
}
|
||||
|
||||
public Icon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons)
|
||||
public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons)
|
||||
{
|
||||
if (PHConstruct.connectedTexturesMode == 0)
|
||||
{
|
||||
@@ -592,7 +592,7 @@ public class GlassBlockConnected extends MantleBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon (int par1, int par2)
|
||||
public IIcon getIcon (int par1, int par2)
|
||||
{
|
||||
return icons[0];
|
||||
}
|
||||
@@ -611,7 +611,7 @@ public class GlassBlockConnected extends MantleBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons (IconRegister par1IconRegister)
|
||||
public void registerIcons (IIconRegister par1IconRegister)
|
||||
{
|
||||
icons[0] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass");
|
||||
icons[1] = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_1_d");
|
||||
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.ColorizerGrass;
|
||||
@@ -28,7 +29,7 @@ public class SoilSlab extends SlabBase
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons (IIconRegister iconRegister)
|
||||
{
|
||||
this.blockIcon = iconRegister.registerIcon("tinker:grass_top");
|
||||
this.field_149761_L = iconRegister.registerIcon("tinker:grass_top");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -38,11 +39,11 @@ public class SoilSlab extends SlabBase
|
||||
switch (meta % 8)
|
||||
{
|
||||
case 0:
|
||||
return this.blockIcon;//Block.grass.getIcon(1, 0);
|
||||
return this.field_149761_L;//Block.grass.getIcon(1, 0);
|
||||
case 1:
|
||||
return Block.dirt.getIcon(side, 0);
|
||||
return Blocks.dirt.getIcon(side, 0);
|
||||
case 2:
|
||||
return Block.mycelium.getIcon(1, 0);
|
||||
return Blocks.mycelium.getIcon(1, 0);
|
||||
default:
|
||||
return TRepo.craftedSoil.getIcon(side, meta - 3);
|
||||
}
|
||||
|
||||
@@ -8,11 +8,13 @@ import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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 tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.ToolForgeLogic;
|
||||
import tconstruct.client.block.TableForgeRender;
|
||||
@@ -62,13 +64,13 @@ public class ToolForgeBlock extends InventoryBlock
|
||||
switch (meta)
|
||||
{
|
||||
case 0:
|
||||
return Block.blockIron.getIcon(side, 0);
|
||||
return Blocks.iron_block.getIcon(side, 0);
|
||||
case 1:
|
||||
return Block.blockGold.getIcon(side, 0);
|
||||
return Blocks.gold_block.getIcon(side, 0);
|
||||
case 2:
|
||||
return Block.blockDiamond.getIcon(side, 0);
|
||||
return Blocks.diamond_block.getIcon(side, 0);
|
||||
case 3:
|
||||
return Block.blockEmerald.getIcon(side, 0);
|
||||
return Blocks.emerald_block.getIcon(side, 0);
|
||||
default:
|
||||
return TRepo.metalBlock.getIcon(side, meta - 4);
|
||||
}
|
||||
@@ -127,11 +129,11 @@ public class ToolForgeBlock extends InventoryBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks (int id, CreativeTabs tab, List list)
|
||||
public void getSubBlocks (Block b, CreativeTabs tab, List list)
|
||||
{
|
||||
for (int iter = 0; iter < textureNames.length; iter++)
|
||||
{
|
||||
list.add(new ItemStack(id, 1, iter));
|
||||
list.add(new ItemStack(b, 1, iter));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,11 +14,11 @@ import net.minecraft.item.ItemTool;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.network.packet.Packet;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.packet.Packet132TileEntityData;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import tconstruct.inventory.FurnaceContainer;
|
||||
import mantle.blocks.abstracts.InventoryLogic;
|
||||
import mantle.blocks.iface.IActiveLogic;
|
||||
|
||||
@@ -106,7 +106,7 @@ public class Punji extends MantleBlock
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons (IIconRegister iconRegister)
|
||||
{
|
||||
this.blockIcon = iconRegister.registerIcon("tinker:punji");
|
||||
this.field_149761_L = iconRegister.registerIcon("tinker:punji");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user