From 3572c4a4b5c083e45fa5d88137880940e6f2e018 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 6 Nov 2015 23:22:38 +0100 Subject: [PATCH] AtomSponge Smiley Cloud --- .../blocks/render/ModelSmileyCloud.java | 3 +-- .../blocks/render/RenderSmileyCloud.java | 12 +++++++++++- .../misc/cloud/SmileyCloudEasterEggs.java | 13 +++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java index 944b7aea4..df4b8e00d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java @@ -10,7 +10,6 @@ package ellpeck.actuallyadditions.blocks.render; -import ellpeck.actuallyadditions.proxy.ClientProxy; import net.minecraft.client.model.ModelRenderer; public class ModelSmileyCloud extends ModelBaseAA{ @@ -162,7 +161,7 @@ public class ModelSmileyCloud extends ModelBaseAA{ @Override public String getName(){ - return ClientProxy.bulletForMyValentine ? "modelPinkFluffyUnicloud" : "modelSmileyCloud"; + return "modelSmileyCloud"; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java index 80382ab7a..491bf456b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java @@ -12,19 +12,24 @@ package ellpeck.actuallyadditions.blocks.render; import ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg; import ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs; +import ellpeck.actuallyadditions.proxy.ClientProxy; import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; +import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import java.util.Random; public class RenderSmileyCloud extends RenderTileEntity{ + private static final ResourceLocation resLocValentine = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/modelPinkFluffyUnicloud.png"); + public RenderSmileyCloud(ModelBaseAA model){ super(model); } @@ -75,7 +80,12 @@ public class RenderSmileyCloud extends RenderTileEntity{ } } - this.bindTexture(resLoc); + if(ClientProxy.bulletForMyValentine || (theCloud.name != null && !theCloud.name.isEmpty() && theCloud.name.equals("Pink Fluffy Unicloud"))){ + this.bindTexture(resLocValentine); + } + else{ + this.bindTexture(resLoc); + } theModel.render(0.0625F); diff --git a/src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java index 31adb1b94..05532a696 100644 --- a/src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java @@ -358,6 +358,19 @@ public class SmileyCloudEasterEggs{ renderHeadBlock(InitBlocks.blockColoredLampOn, 4, 40F); } }); + //AtomSponge + register(new ISmileyCloudEasterEgg(){ + @Override + public String[] getTriggerNames(){ + return new String[]{"sponge", "atomsponge", "atom", "explosions", "explosion"}; + } + + @Override + public void renderExtra(float f){ + renderHoldingItem(false, new ItemStack(Items.gunpowder)); + renderHeadBlock(Blocks.sponge, 2, 20F); + } + }); } private static void register(ISmileyCloudEasterEgg egg){