Changed Rendering & added Acid & Jasin to the Cloud

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

@@ -1,11 +1,11 @@
 package ellpeck.actuallyadditions.blocks;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
+import ellpeck.actuallyadditions.proxy.ClientProxy;
 import ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine;
 import ellpeck.actuallyadditions.util.BlockUtil;
 import ellpeck.actuallyadditions.util.INameableItem;
@@ -81,7 +81,7 @@ public class BlockCoffeeMachine extends BlockContainerBase implements INameableI
 
     @Override
     public int getRenderType(){
-        return RenderingRegistry.getNextAvailableRenderId();
+        return ClientProxy.COFFEE_MACHINE_RENDER_ID;
     }
 
     @Override

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

@@ -1,12 +1,12 @@
 package ellpeck.actuallyadditions.blocks;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
 import ellpeck.actuallyadditions.items.ItemFertilizer;
 import ellpeck.actuallyadditions.items.ItemMisc;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
+import ellpeck.actuallyadditions.proxy.ClientProxy;
 import ellpeck.actuallyadditions.tile.TileEntityCompost;
 import ellpeck.actuallyadditions.util.BlockUtil;
 import ellpeck.actuallyadditions.util.INameableItem;
@@ -105,7 +105,7 @@ public class BlockCompost extends BlockContainerBase implements INameableItem{
 
     @Override
     public int getRenderType(){
-        return RenderingRegistry.getNextAvailableRenderId();
+        return ClientProxy.COMPOST_RENDER_ID;
     }
 
     @Override

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

@@ -1,8 +1,8 @@
 package ellpeck.actuallyadditions.blocks;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ellpeck.actuallyadditions.proxy.ClientProxy;
 import ellpeck.actuallyadditions.tile.TileEntityFishingNet;
 import ellpeck.actuallyadditions.util.BlockUtil;
 import ellpeck.actuallyadditions.util.INameableItem;
@@ -59,7 +59,7 @@ public class BlockFishingNet extends BlockContainerBase implements INameableItem
 
     @Override
     public int getRenderType(){
-        return RenderingRegistry.getNextAvailableRenderId();
+        return ClientProxy.FISHING_NET_RENDER_ID;
     }
 
     @Override

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

@@ -1,9 +1,9 @@
 package ellpeck.actuallyadditions.blocks;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
+import ellpeck.actuallyadditions.proxy.ClientProxy;
 import ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar;
 import ellpeck.actuallyadditions.util.BlockUtil;
 import ellpeck.actuallyadditions.util.INameableItem;
@@ -60,7 +60,7 @@ public class BlockFurnaceSolar extends BlockContainerBase implements INameableIt
 
     @Override
     public int getRenderType(){
-        return RenderingRegistry.getNextAvailableRenderId();
+        return ClientProxy.FURNACE_SOLAR_RENDER_ID;
     }
 
     @Override

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

@@ -1,10 +1,10 @@
 package ellpeck.actuallyadditions.blocks;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
+import ellpeck.actuallyadditions.proxy.ClientProxy;
 import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
 import ellpeck.actuallyadditions.util.BlockUtil;
 import ellpeck.actuallyadditions.util.INameableItem;
@@ -97,7 +97,7 @@ public class BlockSmileyCloud extends BlockContainerBase implements INameableIte
 
     @Override
     public int getRenderType(){
-        return RenderingRegistry.getNextAvailableRenderId();
+        return ClientProxy.SMILEY_CLOUD_RENDER_ID;
     }
 
     @Override

src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java

@@ -2,6 +2,7 @@ package ellpeck.actuallyadditions.gadget.cloud;
 
 import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.items.InitItems;
+import ellpeck.actuallyadditions.items.metalists.TheFoods;
 import ellpeck.actuallyadditions.util.AssetUtil;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -186,6 +187,30 @@ public class SmileyCloudEasterEggs{
                 renderHeadBlock(Blocks.hay_block, 0, 74F);
             }
         });
+        //Acid
+        register(new ISmileyCloudEasterEgg(){
+            @Override
+            public String[] getTriggerNames(){
+                return new String[]{"acid", "acid_blues", "acidblues"};
+            }
+            @Override
+            public void renderExtra(float f){
+                renderHoldingItem(false, new ItemStack(InitItems.itemFoods, 1, TheFoods.PIZZA.ordinal()));
+                renderHeadBlock(Blocks.bookshelf, 0, 27F);
+            }
+        });
+        //Jasin
+        register(new ISmileyCloudEasterEgg(){
+            @Override
+            public String[] getTriggerNames(){
+                return new String[]{"jasin", "jasindow"};
+            }
+            @Override
+            public void renderExtra(float f){
+                renderHoldingItem(false, new ItemStack(Items.written_book));
+                renderHeadBlock(Blocks.web, 0, 56F);
+            }
+        });
     }
 
     private static void register(ISmileyCloudEasterEgg egg){

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

@@ -2,6 +2,7 @@ package ellpeck.actuallyadditions.proxy;
 
 
 import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.registry.VillagerRegistry;
 import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.blocks.render.*;
@@ -19,6 +20,13 @@ import net.minecraftforge.client.MinecraftForgeClient;
 @SuppressWarnings("unused")
 public class ClientProxy implements IProxy{
 
+    public static int COMPOST_RENDER_ID;
+    public static int FISHING_NET_RENDER_ID;
+    public static int FURNACE_SOLAR_RENDER_ID;
+    public static int COFFEE_MACHINE_RENDER_ID;
+    public static int PHANTOM_BOOSTER_RENDER_ID;
+    public static int SMILEY_CLOUD_RENDER_ID;
+
     @Override
     public void preInit(){
         ModUtil.LOGGER.info("PreInitializing ClientProxy...");
@@ -32,6 +40,13 @@ public class ClientProxy implements IProxy{
     public void init(){
         ModUtil.LOGGER.info("Initializing ClientProxy...");
 
+        COMPOST_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+        FISHING_NET_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+        FURNACE_SOLAR_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+        COFFEE_MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+        PHANTOM_BOOSTER_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+        SMILEY_CLOUD_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
+
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()));
         MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCompost), new RenderItems(new ModelCompost()));