"Tsuki no me" almost complete

Becomes super apparent what project "Tsuki no me" is about
SlimeKnights · Sep 26, 2013 · abdd27c · abdd27c
1 parent 21a611e
commit abdd27c
Show file tree

Hide file tree

Showing 11 changed files with 922 additions and 665 deletions.
diff --git a/resources/assets/tinker/textures/gui/slotButton.png b/resources/assets/tinker/textures/gui/slotButton.png
diff --git a/src/tconstruct/blocks/RedstoneMachine.java b/src/tconstruct/blocks/RedstoneMachine.java
@@ -35,10 +35,10 @@ public RedstoneMachine(int id)
     @Override
     public int getLightValue (IBlockAccess world, int x, int y, int z)
     {
-        if (world.getBlockMetadata(x, y, z) == 0)
+        if (world.getBlockMetadata(x, y, z) == 0 || world.getBlockMetadata(x, y, z) == 2)
         {
             TileEntity logic = world.getBlockTileEntity(x, y, z);
-
+            
             if (logic != null && logic instanceof DrawbridgeLogic)
             {
                 if (((DrawbridgeLogic) logic).getStackInSlot(1) != null)
@@ -48,6 +48,16 @@ public int getLightValue (IBlockAccess world, int x, int y, int z)
                         return lightValue[stack.itemID];
                 }
             }
+
+            if (logic != null && logic instanceof AdvancedDrawbridgeLogic)
+            {
+                if (((AdvancedDrawbridgeLogic) logic).camoInventory.getCamoStack() != null)
+                {
+                    ItemStack stack = ((AdvancedDrawbridgeLogic) logic).camoInventory.getCamoStack();
+                    if (stack.itemID < 4096 && Block.blocksList[stack.itemID] != null)
+                        return lightValue[stack.itemID];
+                }
+            }
         }
         return super.getLightValue(world, x, y, z);
     }
@@ -80,8 +90,8 @@ public TileEntity createTileEntity (World world, int metadata)
             return new DrawbridgeLogic();
         case 1:
             return new FirestarterLogic();
-//        case 2:
-//        	return new AdvancedDrawbridgeLogic();
+        case 2:
+        	return new AdvancedDrawbridgeLogic();
         default:
             return null;
         }
@@ -95,6 +105,8 @@ public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplay
         {
         case 0:
             return TConstruct.proxy.drawbridgeID;
+        case 2:
+        	return TConstruct.proxy.advDrawbridgeID;
         }
         return null;
     }
@@ -168,6 +180,26 @@ public Icon getBlockTexture (IBlockAccess world, int x, int y, int z, int side)
                 return icons[getTextureIndex(side)];
             }
         }
+
+        if (meta == 2)
+        {
+            AdvancedDrawbridgeLogic drawbridge = (AdvancedDrawbridgeLogic) logic;
+            ItemStack stack = drawbridge.camoInventory.getCamoStack();
+            if (stack != null && stack.itemID < 4096)
+            {
+                Block block = Block.blocksList[stack.itemID];
+                if (block != null && block.renderAsNormalBlock())
+                    return block.getIcon(side, stack.getItemDamage());
+            }
+            if (side == direction)
+            {
+                return icons[getTextureIndex(side) + 3];
+            }
+            else
+            {
+                return icons[getTextureIndex(side)];
+            }
+        }
 
         if (meta == 1)
         {