From 78ac0cdf59bc23c14c819cc57186c96e00e82867 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Tue, 25 Aug 2015 21:14:39 +0200
Subject: [PATCH] Changed Rendering & added Acid & Jasin to the Cloud

---
 .../blocks/BlockCoffeeMachine.java            |   4 +--
 .../blocks/BlockCompost.java                  |   4 +--
 .../blocks/BlockFishingNet.java               |   4 +--
 .../blocks/BlockFurnaceSolar.java             |   4 +--
 .../blocks/BlockSmileyCloud.java              |   4 +--
 .../gadget/cloud/SmileyCloudEasterEggs.java   |  25 ++++++++++++++++++
 .../actuallyadditions/proxy/ClientProxy.java  |  15 +++++++++++
 .../blocks/models/modelSmileyCloud.png        | Bin 559 -> 2578 bytes
 8 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java
index 75a35ebf1..af7d8a938 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java
+++ b/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
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java
index 0fdf3f3a6..91d6ee151 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java
+++ b/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
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java
index 5363e1224..e8f850a44 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java
+++ b/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
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java
index b269cc52f..10477d6a3 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java
+++ b/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
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java
index 9cf2533d3..bde7ca960 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java
+++ b/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
diff --git a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java b/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java
index 65f3e8007..09a163f5f 100644
--- a/src/main/java/ellpeck/actuallyadditions/gadget/cloud/SmileyCloudEasterEggs.java
+++ b/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){
diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
index 394c82b09..d163a9468 100644
--- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
+++ b/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()));
 
diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelSmileyCloud.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelSmileyCloud.png
index 10de75d82d8670671e7ea3256a49141abc3ed0a0..2bfc199b497b6ca340fe76ca706cc288c6bb0f03 100644
GIT binary patch
delta 2494
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
IM6N<$f;;ixNB{r;

delta 457
zcmbOvvYusv3KwH>kh>GZx^prwCn`#F9b#bMJH#le;ngtF&9a`c*VDx@q$2L^#Kx?{
z20SjG|NoEtCMnDJ{E<rg#K)JV`l~-A<SyO3BsZ`wZhiT(3O6UWW&9WTW-HE{IAP*T
z<}HWQI?`2AQhqVK-5~i$l2dY~or85wTZJ0S>;1})k~T0b1v3|$yjlN+v4%nZ0DHpy
z`xn_GzA~_Wi}v3VTc3E;zbx%p?L*@=A5NY-vq!(CP1Nq@%$eU?|1;<8?8w-Es4Ly&
z4QtqK;au^ET$e5KiLG3M^$l0Qy4+?BlNNmI9<k8rh<rk+?Zs)_)e(x1_&4mDmvOq)
zc8!5@wR{9`wTI%P`TWvxijQ`0*e5Ay&Bh(n@k4J-zT1($gH0kz`?%|0&lcSH`oOdq
zf*YmSoV?GjJ%0P4s8X1-!4|!E*+sH(ib<v{&bObovuCu2cSP`NE>yn-l5bYpBKwXr
zX^q78Sz$}|Ug*fspR(Wm&j+?2KV)wd30}OXXZ9%lr`OMS+8drKEvl^riN&q>fAv)q
xi2rv_O(|GeUEChEtRBN-63I~FS!K>`{i&^|Hay>Ocq0Q4c)I$ztaD0e0ssU8(F6bh