Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Made Smiley Clouds render special people stuff

Browse source
This commit is contained in:
Ellpeck 2017-02-14 18:40:45 +01:00
parent a7f3565404
commit 1ef3b268ff
3 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java
View file

@ -12,6 +12,8 @@ package de.ellpeck.actuallyadditions.mod.blocks.render;
import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg; import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg;
import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs; import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs;
import de.ellpeck.actuallyadditions.mod.misc.special.RenderSpecial;
import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit;
import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import net.minecraft.block.BlockHorizontal; import net.minecraft.block.BlockHorizontal;
@ -23,6 +25,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.Locale;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class RenderSmileyCloud extends TileEntitySpecialRenderer{ public class RenderSmileyCloud extends TileEntitySpecialRenderer{
@ -37,6 +41,8 @@ public class RenderSmileyCloud extends TileEntitySpecialRenderer{
GlStateManager.translate(0.0F, -2F, 0.0F); GlStateManager.translate(0.0F, -2F, 0.0F);
if(theCloud.name != null && !theCloud.name.isEmpty()){ if(theCloud.name != null && !theCloud.name.isEmpty()){
boolean renderedEaster = false;
easterEggs: easterEggs:
for(ISmileyCloudEasterEgg cloud : SmileyCloudEasterEggs.CLOUD_STUFF){ for(ISmileyCloudEasterEgg cloud : SmileyCloudEasterEggs.CLOUD_STUFF){
for(String triggerName : cloud.getTriggerNames()){ for(String triggerName : cloud.getTriggerNames()){
@ -59,18 +65,35 @@ public class RenderSmileyCloud extends TileEntitySpecialRenderer{
cloud.renderExtra(0.0625F); cloud.renderExtra(0.0625F);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
renderedEaster = true;
break easterEggs; break easterEggs;
} }
} }
} }
} }
String nameLower = theCloud.name.toLowerCase(Locale.ROOT);
if(SpecialRenderInit.SPECIAL_LIST.containsKey(nameLower)){
RenderSpecial render = SpecialRenderInit.SPECIAL_LIST.get(nameLower);
if(render != null){
GlStateManager.pushMatrix();
GlStateManager.translate(0F, renderedEaster ? 0.05F : 0.25F, 0F);
GlStateManager.rotate(180F, 1.0F, 0.0F, 1.0F);
GlStateManager.scale(0.75F, 0.75F, 0.75F);
render.render();
GlStateManager.popMatrix();
}
}
} }
GlStateManager.popMatrix(); GlStateManager.popMatrix();
if(theCloud.name != null && !theCloud.name.isEmpty() && !Minecraft.getMinecraft().gameSettings.hideGUI){ Minecraft mc = Minecraft.getMinecraft();
AssetUtil.renderNameTag(theCloud.name, x+0.5F, y+1.5F, z+0.66); if(theCloud.name != null && !theCloud.name.isEmpty() && !mc.gameSettings.hideGUI){
if(mc.player.getDistanceSq(tile.getPos()) <= 36){
AssetUtil.renderNameTag(theCloud.name, x+0.5F, y+1.5F, z+0.5F);
}
} }
} }
} }

17
src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/RenderSpecial.java
View file

@ -29,19 +29,30 @@ public class RenderSpecial{
} }
public void render(EntityPlayer player, float partialTicks){ public void render(EntityPlayer player, float partialTicks){
if(StackUtil.isValid(this.theThingToRender)){
if(player.isInvisible() || !player.isWearing(EnumPlayerModelParts.CAPE) || player.isElytraFlying()){ if(player.isInvisible() || !player.isWearing(EnumPlayerModelParts.CAPE) || player.isElytraFlying()){
return; return;
} }
boolean isBlock = this.theThingToRender.getItem() instanceof ItemBlock;
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
Vec3d currentPos = Minecraft.getMinecraft().player.getPositionEyes(partialTicks); Vec3d currentPos = Minecraft.getMinecraft().player.getPositionEyes(partialTicks);
Vec3d playerPos = player.getPositionEyes(partialTicks); Vec3d playerPos = player.getPositionEyes(partialTicks);
GlStateManager.translate(playerPos.xCoord-currentPos.xCoord, playerPos.yCoord-currentPos.yCoord, playerPos.zCoord-currentPos.zCoord); GlStateManager.translate(playerPos.xCoord-currentPos.xCoord, playerPos.yCoord-currentPos.yCoord, playerPos.zCoord-currentPos.zCoord);
GlStateManager.translate(0D, 2.375D-(player.isSneaking() ? 0.125D : 0D), 0D);
GlStateManager.translate(0D, 2.375D-(player.isSneaking() ? 0.125D : 0D)+(isBlock ? 0D : 0.1875D), 0D); this.render();
GlStateManager.popMatrix();
}
public void render(){
if(StackUtil.isValid(this.theThingToRender)){
boolean isBlock = this.theThingToRender.getItem() instanceof ItemBlock;
GlStateManager.pushMatrix();
if(isBlock){
GlStateManager.translate(0D, -0.1875D, 0D);
}
GlStateManager.rotate(180F, 1.0F, 0.0F, 1.0F); GlStateManager.rotate(180F, 1.0F, 0.0F, 1.0F);
float size = isBlock ? 0.5F : 0.4F; float size = isBlock ? 0.5F : 0.4F;

2
src/main/java/de/ellpeck/actuallyadditions/mod/misc/special/SpecialRenderInit.java
View file

@ -26,7 +26,7 @@ import java.util.Properties;
public class SpecialRenderInit{ public class SpecialRenderInit{
private static final HashMap<String, RenderSpecial> SPECIAL_LIST = new HashMap<String, RenderSpecial>(); public static final HashMap<String, RenderSpecial> SPECIAL_LIST = new HashMap<String, RenderSpecial>();
public SpecialRenderInit(){ public SpecialRenderInit(){
new ThreadSpecialFetcher(); new ThreadSpecialFetcher();