Tool Table Model and Textures

src/main/java/ellpeck/actuallyadditions/blocks/BlockToolTable.java

@@ -16,43 +16,42 @@ import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityInventoryBase;
 import ellpeck.actuallyadditions.tile.TileEntityToolTable;
+import ellpeck.actuallyadditions.util.AssetUtil;
 import ellpeck.actuallyadditions.util.INameableItem;
-import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 public class BlockToolTable extends BlockContainerBase implements INameableItem{
 
-    private IIcon topIcon;
-    private IIcon frontIcon;
-
     public BlockToolTable(){
         super(Material.wood);
         this.setHarvestLevel("axe", 0);
         this.setHardness(1.5F);
         this.setResistance(5.0F);
         this.setStepSound(soundTypeWood);
+
+        this.setBlockBounds(0F, 0F, 0F, 1F, 1F-3/16, 1F);
     }
 
     @Override
     public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){
         int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;
 
-        if(rotation == 0) world.setBlockMetadataWithNotify(x, y, z, 0, 2);
+        if(rotation == 0) world.setBlockMetadataWithNotify(x, y, z, 2, 0);
-        if(rotation == 1) world.setBlockMetadataWithNotify(x, y, z, 3, 2);
+        if(rotation == 1) world.setBlockMetadataWithNotify(x, y, z, 1, 3);
-        if(rotation == 2) world.setBlockMetadataWithNotify(x, y, z, 1, 2);
+        if(rotation == 2) world.setBlockMetadataWithNotify(x, y, z, 0, 2);
-        if(rotation == 3) world.setBlockMetadataWithNotify(x, y, z, 2, 2);
+        if(rotation == 3) world.setBlockMetadataWithNotify(x, y, z, 3, 3);
     }
 
     @Override
@@ -61,26 +60,29 @@ public class BlockToolTable extends BlockContainerBase implements INameableItem{
     }
 
     @Override
-    public IIcon getIcon(int side, int meta){
+    public IIcon getIcon(int side, int metadata){
-        if(side == 1 || side == 0) return this.topIcon;
-        if(side == 3) return this.frontIcon;
-        return this.blockIcon;
-    }
-
-    @Override
-    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) return this.topIcon;
-        if(side == meta+2) return this.frontIcon;
         return this.blockIcon;
     }
 
     @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister iconReg){
-        this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName());
+        this.blockIcon = Blocks.planks.getIcon(0, 0);
-        this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top");
+    }
-        this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Front");
+
+    @Override
+    public boolean isOpaqueCube(){
+        return false;
+    }
+
+    @Override
+    public boolean renderAsNormalBlock(){
+        return false;
+    }
+
+    @Override
+    public int getRenderType(){
+        return AssetUtil.TOOL_TABLE_RENDER_ID;
     }
 
     @Override

src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java

@@ -12,6 +12,10 @@ package ellpeck.actuallyadditions.blocks.render;
 
 import net.minecraft.client.model.ModelRenderer;
 
+/**
+ * Made by Canitzp.
+ * Thanks.
+ */
 public class ModelCoffeeMachine extends ModelBaseAA{
 
     ModelRenderer p1;

src/main/java/ellpeck/actuallyadditions/blocks/render/ModelToolTable.java

@@ -0,0 +1,263 @@
+/*
+ * This file ("ModelToolTable.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2015 Ellpeck
+ */
+
+package ellpeck.actuallyadditions.blocks.render;
+
+import ellpeck.actuallyadditions.blocks.InitBlocks;
+import ellpeck.actuallyadditions.util.AssetUtil;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import org.lwjgl.opengl.GL11;
+
+/**
+ * Made by Canitzp.
+ * Thanks.
+ */
+public class ModelToolTable extends ModelBaseAA{
+
+    ModelRenderer leg1;
+    ModelRenderer leg2;
+    ModelRenderer leg3;
+    ModelRenderer lag4;
+    ModelRenderer tableTop;
+    ModelRenderer back1;
+    ModelRenderer back2;
+    ModelRenderer side1;
+    ModelRenderer side2;
+    ModelRenderer bottom;
+    ModelRenderer side3;
+    ModelRenderer onTop;
+    ModelRenderer random1;
+    ModelRenderer random2;
+    ModelRenderer random3;
+    ModelRenderer random4;
+    ModelRenderer random5;
+    ModelRenderer random6;
+    ModelRenderer random7;
+    ModelRenderer random8;
+    ModelRenderer random9;
+
+    public ModelToolTable(){
+        textureWidth = 128;
+        textureHeight = 128;
+
+        leg1 = new ModelRenderer(this, 0, 0);
+        leg1.addBox(0F, 0F, 0F, 2, 10, 2);
+        leg1.setRotationPoint(-8F, 14F, -8F);
+        leg1.setTextureSize(128, 128);
+        leg1.mirror = true;
+        setRotation(leg1, 0F, 0F, 0F);
+        leg2 = new ModelRenderer(this, 0, 0);
+        leg2.addBox(0F, 0F, 0F, 2, 10, 2);
+        leg2.setRotationPoint(6F, 14F, -8F);
+        leg2.setTextureSize(128, 128);
+        leg2.mirror = true;
+        setRotation(leg2, 0F, 0F, 0F);
+        leg3 = new ModelRenderer(this, 0, 0);
+        leg3.addBox(0F, 0F, 0F, 2, 10, 2);
+        leg3.setRotationPoint(-8F, 14F, 6F);
+        leg3.setTextureSize(128, 128);
+        leg3.mirror = true;
+        setRotation(leg3, 0F, 0F, 0F);
+        lag4 = new ModelRenderer(this, 0, 0);
+        lag4.addBox(0F, 0F, 0F, 2, 10, 2);
+        lag4.setRotationPoint(6F, 14F, 6F);
+        lag4.setTextureSize(128, 128);
+        lag4.mirror = true;
+        setRotation(lag4, 0F, 0F, 0F);
+        tableTop = new ModelRenderer(this, 0, 13);
+        tableTop.addBox(0F, 0F, 0F, 16, 2, 16);
+        tableTop.setRotationPoint(-8F, 12F, -8F);
+        tableTop.setTextureSize(128, 128);
+        tableTop.mirror = true;
+        setRotation(tableTop, 0F, 0F, 0F);
+        back1 = new ModelRenderer(this, 9, 0);
+        back1.addBox(0F, 0F, 0F, 12, 10, 1);
+        back1.setRotationPoint(-6F, 14F, 7F);
+        back1.setTextureSize(128, 128);
+        back1.mirror = true;
+        setRotation(back1, 0F, 0F, 0F);
+        back2 = new ModelRenderer(this, 0, 32);
+        back2.addBox(0F, 0F, 0F, 16, 16, 1);
+        back2.setRotationPoint(-8F, -4F, 7F);
+        back2.setTextureSize(128, 128);
+        back2.mirror = true;
+        setRotation(back2, 0F, 0F, 0F);
+        side1 = new ModelRenderer(this, 9, 0);
+        side1.addBox(0F, 0F, 0F, 12, 10, 1);
+        side1.setRotationPoint(-7F, 14F, 6F);
+        side1.setTextureSize(128, 128);
+        side1.mirror = true;
+        setRotation(side1, 0F, 1.579523F, 0F);
+        side2 = new ModelRenderer(this, 9, 0);
+        side2.addBox(0F, 0F, 0F, 12, 10, 1);
+        side2.setRotationPoint(6F, 14F, 6F);
+        side2.setTextureSize(128, 128);
+        side2.mirror = true;
+        setRotation(side2, 0F, 1.579523F, 0F);
+        bottom = new ModelRenderer(this, 36, 0);
+        bottom.addBox(0F, 0F, 0F, 8, 12, 1);
+        bottom.setRotationPoint(-6F, 24F, 6F);
+        bottom.setTextureSize(128, 128);
+        bottom.mirror = true;
+        setRotation(bottom, 1.579523F, 1.579523F, 0F);
+        side3 = new ModelRenderer(this, 9, 0);
+        side3.addBox(0F, 0F, 0F, 12, 9, 1);
+        side3.setRotationPoint(-6F, 14F, -2F);
+        side3.setTextureSize(128, 128);
+        side3.mirror = true;
+        setRotation(side3, 0F, 0F, 0F);
+        onTop = new ModelRenderer(this, 0, 50);
+        onTop.addBox(0F, 0F, 0F, 12, 1, 12);
+        onTop.setRotationPoint(-6F, 11.8F, -6F);
+        onTop.setTextureSize(128, 128);
+        onTop.mirror = true;
+        setRotation(onTop, 0F, 0F, 0F);
+        random1 = new ModelRenderer(this, 35, 32);
+        random1.addBox(0F, 0F, 0F, 1, 1, 1);
+        random1.setRotationPoint(-7.5F, 15F, 3F);
+        random1.setTextureSize(128, 128);
+        random1.mirror = true;
+        setRotation(random1, 0F, 0F, 0F);
+        random2 = new ModelRenderer(this, 35, 32);
+        random2.addBox(0F, 0F, 0F, 1, 1, 1);
+        random2.setRotationPoint(-7.5F, 15F, -4F);
+        random2.setTextureSize(128, 128);
+        random2.mirror = true;
+        setRotation(random2, 0F, 0F, 0F);
+        random3 = new ModelRenderer(this, 35, 32);
+        random3.addBox(0F, 0F, 0F, 1, 1, 1);
+        random3.setRotationPoint(6.5F, 15F, 3F);
+        random3.setTextureSize(128, 128);
+        random3.mirror = true;
+        setRotation(random3, 0F, 0F, 0F);
+        random4 = new ModelRenderer(this, 35, 32);
+        random4.addBox(0F, 0F, 0F, 1, 1, 1);
+        random4.setRotationPoint(6.5F, 15F, -4F);
+        random4.setTextureSize(128, 128);
+        random4.mirror = true;
+        setRotation(random4, 0F, 0F, 0F);
+        random5 = new ModelRenderer(this, 55, 0);
+        random5.addBox(0F, 0F, 0F, 1, 2, 1);
+        random5.setRotationPoint(-5F, 1F, 6F);
+        random5.setTextureSize(128, 128);
+        random5.mirror = true;
+        setRotation(random5, 0.5235988F, 0F, 0F);
+        random6 = new ModelRenderer(this, 55, 0);
+        random6.addBox(0F, 0F, 0F, 1, 2, 1);
+        random6.setRotationPoint(4F, 1F, 6F);
+        random6.setTextureSize(128, 128);
+        random6.mirror = true;
+        setRotation(random6, 0.5235988F, 0F, 0F);
+        random7 = new ModelRenderer(this, 0, 64);
+        random7.addBox(0F, 0F, 0F, 11, 1, 4);
+        random7.setRotationPoint(-5.5F, 0F, 3.5F);
+        random7.setTextureSize(128, 128);
+        random7.mirror = true;
+        setRotation(random7, 0F, 0F, 0F);
+        random8 = new ModelRenderer(this, 35, 35);
+        random8.addBox(0F, 0F, 0F, 1, 1, 1);
+        random8.setRotationPoint(-3F, 3F, 6F);
+        random8.setTextureSize(128, 128);
+        random8.mirror = true;
+        setRotation(random8, 0F, 0F, 0F);
+        random9 = new ModelRenderer(this, 35, 35);
+        random9.addBox(0F, 0F, 0F, 1, 1, 1);
+        random9.setRotationPoint(2F, 3F, 6F);
+        random9.setTextureSize(128, 128);
+        random9.mirror = true;
+        setRotation(random9, 0F, 0F, 0F);
+    }
+
+    @Override
+    public void render(float f){
+        leg1.render(f);
+        leg2.render(f);
+        leg3.render(f);
+        lag4.render(f);
+        tableTop.render(f);
+        back1.render(f);
+        back2.render(f);
+        side1.render(f);
+        side2.render(f);
+        bottom.render(f);
+        side3.render(f);
+        onTop.render(f);
+        random1.render(f);
+        random2.render(f);
+        random3.render(f);
+        random4.render(f);
+        random5.render(f);
+        random6.render(f);
+        random7.render(f);
+        random8.render(f);
+        random9.render(f);
+    }
+
+    private void setRotation(ModelRenderer model, float x, float y, float z){
+        model.rotateAngleX = x;
+        model.rotateAngleY = y;
+        model.rotateAngleZ = z;
+    }
+
+    @Override
+    public boolean doesRotate(){
+        return true;
+    }
+
+    @Override
+    public String getName(){
+        return "modelToolTable";
+    }
+
+    @Override
+    public void renderExtra(float f, TileEntity tile){
+        GL11.glPushMatrix();
+        {
+            GL11.glTranslated(-7.25*f, 17.75*f, 2.25*f);
+            GL11.glScalef(0.5F, 0.5F, 0.5F);
+            GL11.glRotatef(90F, 0F, 1F, 0F);
+            GL11.glRotatef(-40F, 0F, 0F, 1F);
+            AssetUtil.renderItem(new ItemStack(Items.shears), 0);
+        }
+        GL11.glPopMatrix();
+
+        GL11.glPushMatrix();
+        {
+            GL11.glTranslated(5*f, 10.65*f, 4.5*f);
+            GL11.glScalef(0.15F, 0.15F, 0.15F);
+            GL11.glRotatef(90F, 1F, 0F, 0F);
+            GL11.glRotatef(45F, 0F, 0F, 1F);
+            AssetUtil.renderBlock(InitBlocks.blockPhantomLiquiface, 0);
+        }
+        GL11.glPopMatrix();
+
+        GL11.glPushMatrix();
+        {
+            GL11.glTranslated(-3.25*f, 11.35*f, -1*f);
+            GL11.glScalef(0.35F, 0.35F, 0.35F);
+            GL11.glRotatef(90F, 1F, 0F, 0F);
+            AssetUtil.renderItem(new ItemStack(Items.stick), 0);
+        }
+        GL11.glPopMatrix();
+
+        GL11.glPushMatrix();
+        {
+            GL11.glTranslated(-2.25*f, 11.35*f, -4.5*f);
+            GL11.glScalef(0.25F, 0.25F, 0.25F);
+            GL11.glRotatef(90F, 1F, 0F, 0F);
+            GL11.glRotatef(75F, 0F, 0F, 1F);
+            AssetUtil.renderItem(new ItemStack(Items.iron_ingot), 0);
+        }
+        GL11.glPopMatrix();
+    }
+}

src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java

@@ -45,6 +45,7 @@ public class RenderItems implements IItemRenderer{
                 GL11.glTranslatef(0.5F,  0.5F, 0.5F);
                 GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
                 GL11.glTranslatef(-0.5F, -1.27F, 0.5F);
+                GL11.glRotatef(180F, 0F, 1F, 0F);
                 Minecraft.getMinecraft().renderEngine.bindTexture(theTexture);
                 theModel.render(0.0625F);
                 GL11.glPopMatrix();
@@ -55,6 +56,7 @@ public class RenderItems implements IItemRenderer{
                 GL11.glTranslatef(0.5F, 0.5F, 0.5F);
                 GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
                 GL11.glTranslatef(0.6F, -1.2F, -0.0F);
+                GL11.glRotatef(180F, 0F, 1F, 0F);
                 Minecraft.getMinecraft().renderEngine.bindTexture(theTexture);
                 theModel.render(0.0625F);
                 GL11.glPopMatrix();
@@ -65,6 +67,7 @@ public class RenderItems implements IItemRenderer{
                 GL11.glScalef(1.2F, 1.2F, 1.2F);
                 GL11.glRotatef(180, 2F, -0F, 0.1F);
                 GL11.glTranslatef(1.5F, -1.2F, -0.3F);
+                GL11.glRotatef(180F, 0F, 1F, 0F);
                 Minecraft.getMinecraft().renderEngine.bindTexture(theTexture);
                 theModel.render(0.0625F);
                 GL11.glPopMatrix();
@@ -74,6 +77,7 @@ public class RenderItems implements IItemRenderer{
                 GL11.glPushMatrix();
                 GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
                 GL11.glTranslatef(0.0F, -1.27F, 0.0F);
+                GL11.glRotatef(180F, 0F, 1F, 0F);
                 Minecraft.getMinecraft().renderEngine.bindTexture(theTexture);
                 theModel.render(0.0625F);
                 GL11.glPopMatrix();

src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java

@@ -63,6 +63,7 @@ public class ClientProxy implements IProxy{
         AssetUtil.COFFEE_MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
         AssetUtil.PHANTOM_BOOSTER_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
         AssetUtil.SMILEY_CLOUD_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+        AssetUtil.TOOL_TABLE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
 
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()));
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCompost), new RenderItems(new ModelCompost()));
@@ -82,6 +83,9 @@ public class ClientProxy implements IProxy{
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud()));
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockSmileyCloud), new RenderItems(new ModelSmileyCloud()));
 
+        ClientRegistry.bindTileEntitySpecialRenderer(TileEntityToolTable.class, new RenderTileEntity(new ModelToolTable()));
+        MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockToolTable), new RenderItems(new ModelToolTable()));
+
         VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png"));
 
         Util.registerEvent(new TooltipEvent());

src/main/java/ellpeck/actuallyadditions/util/AssetUtil.java

@@ -31,6 +31,7 @@ public class AssetUtil{
     public static int COFFEE_MACHINE_RENDER_ID;
     public static int PHANTOM_BOOSTER_RENDER_ID;
     public static int SMILEY_CLOUD_RENDER_ID;
+    public static int TOOL_TABLE_RENDER_ID;
 
     public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory");