Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

AtomSponge Smiley Cloud

Browse source
This commit is contained in:
Ellpeck 2015-11-06 23:22:38 +01:00
parent 8a6530d459
commit 3572c4a4b5
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java
View file

@ -10,7 +10,6 @@
package ellpeck.actuallyadditions.blocks.render; package ellpeck.actuallyadditions.blocks.render;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
public class ModelSmileyCloud extends ModelBaseAA{ public class ModelSmileyCloud extends ModelBaseAA{
@ -162,7 +161,7 @@ public class ModelSmileyCloud extends ModelBaseAA{
@Override @Override
public String getName(){ public String getName(){
return ClientProxy.bulletForMyValentine ? "modelPinkFluffyUnicloud" : "modelSmileyCloud"; return "modelSmileyCloud";
} }
@Override @Override

10
src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java
View file

@ -12,19 +12,24 @@ package ellpeck.actuallyadditions.blocks.render;
import ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg; import ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg;
import ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs; import ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil; import ellpeck.actuallyadditions.util.StringUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import java.util.Random; import java.util.Random;
public class RenderSmileyCloud extends RenderTileEntity{ 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){ public RenderSmileyCloud(ModelBaseAA model){
super(model); super(model);
} }
@ -75,7 +80,12 @@ public class RenderSmileyCloud extends RenderTileEntity{
} }
} }
if(ClientProxy.bulletForMyValentine || (theCloud.name != null && !theCloud.name.isEmpty() && theCloud.name.equals("Pink Fluffy Unicloud"))){
this.bindTexture(resLocValentine);
}
else{
this.bindTexture(resLoc); this.bindTexture(resLoc);
}
theModel.render(0.0625F); theModel.render(0.0625F);

13
src/main/java/ellpeck/actuallyadditions/misc/cloud/SmileyCloudEasterEggs.java
View file

@ -358,6 +358,19 @@ public class SmileyCloudEasterEggs{
renderHeadBlock(InitBlocks.blockColoredLampOn, 4, 40F); 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){ private static void register(ISmileyCloudEasterEgg egg){