pass through tesrs

This commit is contained in:
Vincent Lee committed 2019-02-24 17:05:44 -06:00
1 parent a4d76b9335
commit 8aefdf57ea
84 files changed
+754 -857

No files matched your search

@@ -16,10 +16,10 @@ import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
@@ -28,6 +28,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumFacing.Axis;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.item.TinyPotatoRenderEvent;
import vazkii.botania.api.state.BotaniaStateProps;
@@ -48,7 +49,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import javax.annotation.Nonnull;
import java.util.Arrays;
public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPotato> {
public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO);
private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS);
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TINY_POTATO_HALLOWEEN);
@@ -64,19 +65,19 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
}
@Override
public void render(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
public void render(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage) {
if(!potato.getWorld().isBlockLoaded(potato.getPos(), false)
|| potato.getWorld().getBlockState(potato.getPos()).getBlock() != ModBlocks.tinyPotato)
return;
GlStateManager.pushMatrix();
GlStateManager.enableRescaleNormal();
GlStateManager.color(1F, 1F, 1F, 1F);
GlStateManager.translate(x, y, z);
GlStateManager.color4f(1F, 1F, 1F, 1F);
GlStateManager.translated(x, y, z);
Minecraft mc = Minecraft.getMinecraft();
mc.renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
String name = potato.name.toLowerCase().trim();
Minecraft mc = Minecraft.getInstance();
mc.textureManager.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
String name = potato.name.getString().toLowerCase().trim();
boolean usedShader = false;
if (matches(name, "gaia")) {
@@ -101,11 +102,11 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
usedShader = true;
}
GlStateManager.translate(0.5F, 1.5F, 0.5F);
GlStateManager.scale(1F, -1F, -1F);
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
GlStateManager.scalef(1F, -1F, -1F);
int meta = potato.getWorld() == null ? 3 : potato.getBlockMetadata();
float rotY = meta * 90F - 180F;
GlStateManager.rotate(rotY, 0F, 1F, 0F);
GlStateManager.rotatef(rotY, 0F, 1F, 0F);
float jump = potato.jumpTicks;
if (jump > 0)
@@ -114,25 +115,25 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
float up = (float) -Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F;
float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2;
GlStateManager.translate(0F, up, 0F);
GlStateManager.rotate(rotZ, 0F, 0F, 1F);
GlStateManager.translatef(0F, up, 0F);
GlStateManager.rotatef(rotZ, 0F, 0F, 1F);
GlStateManager.pushMatrix();
switch (name) {
case "pahimar":
GlStateManager.scale(1F, 0.3F, 1F);
GlStateManager.translate(0F, 3.5F, 0F);
GlStateManager.scalef(1F, 0.3F, 1F);
GlStateManager.translatef(0F, 3.5F, 0F);
break;
case "kyle hyde":
mc.renderEngine.bindTexture(textureGrayscale);
mc.textureManager.bindTexture(textureGrayscale);
break;
case "dinnerbone":
case "grumm":
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(0F, -2.625F, 0F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
GlStateManager.translatef(0F, -2.625F, 0F);
break;
case "aureylian":
GlStateManager.color(1F, 0.5F, 1F);
GlStateManager.color3f(1F, 0.5F, 1F);
break;
}
@@ -140,7 +141,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
if (render)
model.render();
if (name.equals("kingdaddydmac")) {
GlStateManager.translate(0.5F, 0F, 0F);
GlStateManager.translatef(0.5F, 0F, 0F);
model.render();
}
@@ -150,15 +151,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
GlStateManager.popMatrix();
GlStateManager.pushMatrix();
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.pushMatrix();
GlStateManager.rotate(180F, 0, 0, 1);
GlStateManager.translate(0F, -1F, 0F);
GlStateManager.rotatef(180F, 0, 0, 1);
GlStateManager.translatef(0F, -1F, 0F);
float s = 1F / 3.5F;
GlStateManager.scale(s, s, s);
GlStateManager.scalef(s, s, s);
EnumFacing potatoFacing = potato.getWorld().getBlockState(potato.getPos()).getValue(BotaniaStateProps.CARDINALS);
EnumFacing potatoFacing = potato.getWorld().getBlockState(potato.getPos()).get(BotaniaStateProps.CARDINALS);
for(int i = 0; i < potato.getSizeInventory(); i++) {
ItemStack stack = potato.getItemHandler().getStackInSlot(i);
@@ -178,56 +179,56 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
switch(side) {
case UP:
if(mySon)
GlStateManager.translate(0F, 0.6F, 0.5F);
GlStateManager.translatef(0F, 0.6F, 0.5F);
else if(block)
GlStateManager.translate(0F, 0.3F, 0.5F);
GlStateManager.translate(0F, -0.5F, -0.4F);
GlStateManager.translatef(0F, 0.3F, 0.5F);
GlStateManager.translatef(0F, -0.5F, -0.4F);
break;
case DOWN:
GlStateManager.translate(0, -2.3, -0.88);
GlStateManager.translatef(0, -2.3F, -0.88F);
if(mySon)
GlStateManager.translate(0, .65, 0.6);
GlStateManager.translatef(0, .65F, 0.6F);
else if(block)
GlStateManager.translate(0, 1, 0.6);
GlStateManager.translatef(0, 1, 0.6F);
break;
case NORTH:
GlStateManager.translate(0, -1.9, 0.02);
GlStateManager.translatef(0, -1.9F, 0.02F);
if(mySon)
GlStateManager.translate(0, 1, 0.6);
GlStateManager.translatef(0, 1, 0.6F);
else if(block)
GlStateManager.translate(0, 1, 0.6);
GlStateManager.translatef(0, 1, 0.6F);
break;
case SOUTH:
GlStateManager.translate(0, -1.6, -0.89);
GlStateManager.translatef(0, -1.6F, -0.89F);
if(mySon)
GlStateManager.translate(0, 1.4, 0.5);
GlStateManager.translatef(0, 1.4F, 0.5F);
else if(block)
GlStateManager.translate(0, 1.0, 0.5);
GlStateManager.translatef(0, 1.0F, 0.5F);
break;
case EAST:
if(mySon)
GlStateManager.translate(-0.4F, 0.65F, 0F);
GlStateManager.translatef(-0.4F, 0.65F, 0F);
else if(block)
GlStateManager.translate(-0.4F, 0.8F, 0F);
else GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.translate(-0.3F, -1.9F, 0.04F);
GlStateManager.translatef(-0.4F, 0.8F, 0F);
else GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(-0.3F, -1.9F, 0.04F);
break;
case WEST:
if(mySon)
GlStateManager.translate(1F, 0.65F, 1F);
GlStateManager.translatef(1F, 0.65F, 1F);
else if(block)
GlStateManager.translate(1F, 0.8F, 1F);
else GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.translate(-0.3F, -1.9F, -0.92F);
GlStateManager.translatef(1F, 0.8F, 1F);
else GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(-0.3F, -1.9F, -0.92F);
break;
}
if (mySon)
GlStateManager.scale(1.1, 1.1, 1.1);
GlStateManager.scalef(1.1F, 1.1F, 1.1F);
else if(block)
GlStateManager.scale(0.5, 0.5, 0.5);
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
if(block && side != EnumFacing.NORTH)
GlStateManager.rotate(180F, 0, 1, 0);
GlStateManager.rotatef(180F, 0, 1, 0);
renderItem(stack);
GlStateManager.popMatrix();
}
@@ -237,60 +238,61 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
ContributorFancinessHandler.firstStart();
float scale = 1F / 4F;
GlStateManager.translate(0F, 1F, 0F);
GlStateManager.scale(scale, scale, scale);
GlStateManager.translatef(0F, 1F, 0F);
GlStateManager.scalef(scale, scale, scale);
if (name.equals("phi") || name.equals("vazkii")) {
GlStateManager.translate(0.45F, 0F, 0.4F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.rotate(20F, 1F, 0F, 1F);
GlStateManager.translatef(0.45F, 0F, 0.4F);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.rotatef(20F, 1F, 0F, 1F);
renderIcon(MiscellaneousIcons.INSTANCE.phiFlowerIcon);
if (name.equals("vazkii")) {
GlStateManager.rotate(-20F, 1F, 0F, 1F);
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-1.5F, -1.3F, -0.75F);
GlStateManager.rotatef(-20F, 1F, 0F, 1F);
GlStateManager.scalef(1.25F, 1.25F, 1.25F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
GlStateManager.translatef(-1.5F, -1.3F, -0.75F);
renderIcon(MiscellaneousIcons.INSTANCE.nerfBatIcon);
}
} else if (name.equals("haighyorkie")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
GlStateManager.scalef(1.25F, 1.25F, 1.25F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.translatef(-0.5F, -1.2F, -0.4F);
renderIcon(MiscellaneousIcons.INSTANCE.goldfishIcon);
} else if (name.equals("martysgames") || name.equals("marty")) {
GlStateManager.scale(0.7F, 0.7F, 0.7F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.3F, -2.7F, -1.2F);
GlStateManager.rotate(15F, 0F, 0F, 1F);
renderItem(new ItemStack(ModItems.infiniteFruit, 1).setStackDisplayName("das boot"));
GlStateManager.scalef(0.7F, 0.7F, 0.7F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
GlStateManager.translatef(-0.3F, -2.7F, -1.2F);
GlStateManager.rotatef(15F, 0F, 0F, 1F);
renderItem(new ItemStack(ModItems.infiniteFruit, 1).setDisplayName(new TextComponentString("das boot")));
} else if (name.equals("jibril")) {
GlStateManager.scale(1.5F, 1.5F, 1.5F);
GlStateManager.translate(0F, -0.8F, 0F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.scalef(1.5F, 1.5F, 1.5F);
GlStateManager.translatef(0F, -0.8F, 0F);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
ItemFlightTiara.renderHalo(null, partialTicks);
GlStateManager.disableBlend();
GlStateManager.disableLighting();
} else if (name.equals("kingdaddydmac")) {
GlStateManager.scale(0.5F, 0.5F, 0.5F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(0F, -3F, 0.65F);
renderItem(new ItemStack(ModItems.manaRing, 1, 0));
GlStateManager.translate(0F, 0F, -4F);
renderItem(new ItemStack(ModItems.manaRing, 1, 0));
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.translatef(0F, -3F, 0.65F);
ItemStack ring = new ItemStack(ModItems.manaRing);
renderItem(ring);
GlStateManager.translatef(0F, 0F, -4F);
renderItem(ring);
GlStateManager.scale(0.8F, 0.8F, 0.8F);
GlStateManager.translate(1.25F, -1.25F, 2.25F);
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.scalef(0.8F, 0.8F, 0.8F);
GlStateManager.translatef(1.25F, -1.25F, 2.25F);
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
renderBlock(Blocks.CAKE);
} else if (ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) {
} else if (ContributorFancinessHandler.flowerMap.containsKey(name)) {
ItemStack icon = ContributorFancinessHandler.flowerMap.getOrDefault(name, ItemStack.EMPTY);
if (!icon.isEmpty()) {
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.translate(0F, 0F, 0F);
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotatef(180F, 1F, 0F, 0F);
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.translatef(0F, 0F, 0F);
ShaderHelper.useShader(ShaderHelper.gold);
renderItem(icon);
ShaderHelper.releaseShader();
@@ -301,30 +303,30 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, x, y, z, partialTicks, destroyStage));
GlStateManager.rotate(-rotZ, 0F, 0F, 1F);
GlStateManager.rotate(-rotY, 0F, 1F, 0F);
GlStateManager.color(1F, 1F, 1F);
GlStateManager.scale(1F, -1F, -1F);
GlStateManager.rotatef(-rotZ, 0F, 0F, 1F);
GlStateManager.rotatef(-rotY, 0F, 1F, 0F);
GlStateManager.color3f(1F, 1F, 1F);
GlStateManager.scalef(1F, -1F, -1F);
RayTraceResult pos = mc.objectMouseOver;
if (!name.isEmpty() && pos != null && pos.getBlockPos() != null && potato.getPos().equals(pos.getBlockPos())) {
GlStateManager.pushMatrix();
GlStateManager.translate(0F, -0.6F, 0F);
GlStateManager.rotate(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F);
GlStateManager.rotate(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F);
GlStateManager.translatef(0F, -0.6F, 0F);
GlStateManager.rotatef(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F);
GlStateManager.rotatef(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F);
float f = 1.6F;
float f1 = 0.016666668F * f;
GlStateManager.scale(-f1, -f1, f1);
GlStateManager.scalef(-f1, -f1, f1);
GlStateManager.disableLighting();
GlStateManager.translate(0.0F, 0F / f1, 0.0F);
GlStateManager.translatef(0.0F, 0F / f1, 0.0F);
GlStateManager.depthMask(false);
GlStateManager.enableBlend();
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
OpenGlHelper.glBlendFuncSeparate(770, 771, 1, 0);
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder worldrenderer = tessellator.getBuffer();
GlStateManager.disableTexture2D();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
int i = mc.fontRenderer.getStringWidth(potato.name) / 2;
int i = mc.fontRenderer.getStringWidth(potato.name.getString()) / 2;
worldrenderer.pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
worldrenderer.pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
worldrenderer.pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
@@ -332,13 +334,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
tessellator.draw();
GlStateManager.enableTexture2D();
GlStateManager.depthMask(true);
mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF);
mc.fontRenderer.drawString(potato.name.getFormattedText(), -i, 0, 0xFFFFFF);
if (name.equals("pahimar") || name.equals("soaryn")) {
GlStateManager.translate(0F, 14F, 0F);
GlStateManager.translatef(0F, 14F, 0F);
String str = name.equals("pahimar") ? "[WIP]" : "(soon)";
GlStateManager.depthMask(false);
GlStateManager.enableBlend();
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
OpenGlHelper.glBlendFuncSeparate(770, 771, 1, 0);
GlStateManager.disableTexture2D();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
i = mc.fontRenderer.getStringWidth(str) / 2;
@@ -354,8 +356,8 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
GlStateManager.enableLighting();
GlStateManager.disableBlend();
GlStateManager.color(1F, 1F, 1F, 1F);
GlStateManager.scale(1F / -f1, 1F / -f1, 1F / f1);
GlStateManager.color4f(1F, 1F, 1F, 1F);
GlStateManager.scalef(1F / -f1, 1F / -f1, 1F / f1);
GlStateManager.popMatrix();
}
@@ -367,15 +369,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 16F);
}
private void renderItem(ItemStack stack) {
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.HEAD);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.HEAD);
}
private void renderBlock(Block block) {
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(block.getDefaultState(), 1.0F);
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(block.getDefaultState(), 1.0F);
}
}