Fix missing entity renderers, shader layers for pylons

This commit is contained in:
Vincent Lee committed 2020-01-16 11:32:58 -06:00
1 parent 6676f370fd
commit aa04783e3e
3 files changed
+42 -16

No files matched your search

@@ -10,6 +10,7 @@ package vazkii.botania.client.core.handler;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.client.renderer.entity.SpriteRenderer;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.util.ResourceLocation;
@@ -75,13 +76,19 @@ import vazkii.botania.common.entity.EntityBabylonWeapon;
import vazkii.botania.common.entity.EntityCorporeaSpark;
import vazkii.botania.common.entity.EntityDoppleganger;
import vazkii.botania.common.entity.EntityEnderAirBottle;
import vazkii.botania.common.entity.EntityFallingStar;
import vazkii.botania.common.entity.EntityFlameRing;
import vazkii.botania.common.entity.EntityMagicLandmine;
import vazkii.botania.common.entity.EntityMagicMissile;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.entity.EntityManaStorm;
import vazkii.botania.common.entity.EntityPinkWither;
import vazkii.botania.common.entity.EntityPixie;
import vazkii.botania.common.entity.EntityPoolMinecart;
import vazkii.botania.common.entity.EntitySignalFlare;
import vazkii.botania.common.entity.EntitySpark;
import vazkii.botania.common.entity.EntityThornChakram;
import vazkii.botania.common.entity.EntityThrownItem;
import vazkii.botania.common.entity.EntityVineBall;
import vazkii.botania.common.lib.LibMisc;
@@ -139,6 +146,12 @@ public final class ModelHandler {
RenderingRegistry.registerEntityRenderingHandler(EntityManaBurst.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(TileLightRelay.EntityPlayerMover.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(EntitySignalFlare.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(EntityFlameRing.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(EntityMagicLandmine.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(EntityMagicMissile.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(EntityFallingStar.TYPE, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(EntityThrownItem.TYPE, m -> new ItemRenderer(m, Minecraft.getInstance().getItemRenderer()));
RenderingRegistry.registerEntityRenderingHandler(EntityPixie.TYPE, RenderPixie::new);
RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.TYPE, RenderDoppleganger::new);
RenderingRegistry.registerEntityRenderingHandler(EntitySpark.TYPE, RenderSpark::new);
@@ -37,6 +37,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.tile.RenderTilePylon;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import java.util.Arrays;
@@ -62,17 +63,23 @@ public final class RenderHelper {
public static final RenderType TERRA_PLATE;
public static final RenderType ENCHANTER;
public static final RenderType HALO;
public static final RenderType MANA_PYLON_GLOW;
public static final RenderType NATURA_PYLON_GLOW;
public static final RenderType GAIA_PYLON_GLOW;
// todo 1.15 AT's for necessary fields
static {
RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_");
RenderState.TransparencyState translucentTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_");
RenderState.TextureState mipmapBlockAtlasTexture = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228521_m_");
RenderState.CullState disableCull = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228491_A_");
RenderState.CullState disableCull = new RenderState.CullState(false);
RenderState.LayerState projectionLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_");
RenderState.WriteMaskState colorMask = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228496_F_");
RenderType.ShadeModelState smoothShade = new RenderState.ShadeModelState(true);
RenderState.LightmapState enableLightmap = new RenderState.LightmapState(true);
RenderState.OverlayState enableOverlay = new RenderState.OverlayState(true);
RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true);
RenderState.AlphaState zeroAlpha = new RenderState.AlphaState(0);
RenderType.State glState = RenderType.State.builder().shadeModel(smoothShade)
.writeMaskState(colorMask)
@@ -118,6 +125,15 @@ public final class RenderHelper {
RenderState.TextureState haloTexture = new RenderState.TextureState(ItemFlightTiara.textureHalo, false, true);
glState = RenderType.State.builder().texture(haloTexture).transparency(translucentTransparency).cull(disableCull).shadeModel(smoothShade).build(true);
HALO = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, RenderType.of(LibResources.PREFIX_MOD + "halo", DefaultVertexFormats.POSITION_TEX, GL11.GL_QUADS, 64, glState));
glState = RenderType.State.builder().texture(new RenderState.TextureState(RenderTilePylon.MANA_TEXTURE, false, false)).transparency(translucentTransparency).diffuseLighting(enableDiffuse).alpha(zeroAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
MANA_PYLON_GLOW = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, RenderType.of(LibResources.PREFIX_MOD + "mana_pylon_glow", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, GL11.GL_QUADS, 128, glState));
glState = RenderType.State.builder().texture(new RenderState.TextureState(RenderTilePylon.NATURA_TEXTURE, false, false)).transparency(translucentTransparency).diffuseLighting(enableDiffuse).alpha(zeroAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
NATURA_PYLON_GLOW = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, RenderType.of(LibResources.PREFIX_MOD + "natura_pylon_glow", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, GL11.GL_QUADS, 128, glState));
glState = RenderType.State.builder().texture(new RenderState.TextureState(RenderTilePylon.GAIA_TEXTURE, false, false)).transparency(translucentTransparency).diffuseLighting(enableDiffuse).alpha(zeroAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
GAIA_PYLON_GLOW = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, RenderType.of(LibResources.PREFIX_MOD + "gaia_pylon_glow", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, GL11.GL_QUADS, 128, glState));
}
public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) {
@@ -26,7 +26,7 @@ import net.minecraft.util.LazyValue;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.IPylonModel;
import vazkii.botania.client.model.ModelPylonGaia;
@@ -41,9 +41,9 @@ import java.util.Random;
public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
private static final ResourceLocation MANA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_MANA);
private static final ResourceLocation NATURA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_NATURA);
private static final ResourceLocation GAIA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_GAIA);
public static final ResourceLocation MANA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_MANA);
public static final ResourceLocation NATURA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_NATURA);
public static final ResourceLocation GAIA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_GAIA);
private final ModelPylonMana manaModel = new ModelPylonMana();
private final ModelPylonNatura naturaModel = new ModelPylonNatura();
@@ -68,21 +68,25 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
BlockPylon.Variant type = pylon == null ? forceVariant : ((BlockPylon) pylon.getBlockState().getBlock()).variant;
IPylonModel model;
ResourceLocation texture;
RenderType shaderLayer;
switch(type) {
default:
case MANA: {
model = manaModel;
texture = MANA_TEXTURE;
shaderLayer = RenderHelper.MANA_PYLON_GLOW;
break;
}
case NATURA: {
model = naturaModel;
texture = NATURA_TEXTURE;
shaderLayer = RenderHelper.NATURA_PYLON_GLOW;
break;
}
case GAIA: {
model = gaiaModel;
texture = GAIA_TEXTURE;
shaderLayer = RenderHelper.GAIA_PYLON_GLOW;
break;
}
}
@@ -101,7 +105,9 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
if(pylon != null)
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(worldTime * 1.5F));
IVertexBuilder buffer = buffers.getBuffer(RenderType.getEntityTranslucent(texture));
RenderType layer = RenderType.getEntityTranslucent(texture);
IVertexBuilder buffer = buffers.getBuffer(layer);
model.renderRing(ms, buffer, light, overlay);
if(pylon != null)
ms.translate(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D);
@@ -115,18 +121,9 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
if(pylon != null)
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-worldTime));
GlStateManager.disableCull();
GlStateManager.disableAlphaTest();
if(pylon != null)
ShaderHelper.useShader(ShaderHelper.BotaniaShader.PYLON_GLOW);
// todo 1.15 custom render layer
buffer = buffers.getBuffer(shaderLayer);
model.renderCrystal(ms, buffer, light, overlay);
if(pylon != null)
ShaderHelper.releaseShader();
GlStateManager.enableAlphaTest();
GlStateManager.enableCull();
ms.pop();
ms.pop();