diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 4c0664f60..7f0ab2e22 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -33,7 +33,6 @@ import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; @@ -41,6 +40,7 @@ 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 vazkii.botania.mixin.AccessorRenderState; import javax.annotation.Nullable; @@ -50,7 +50,7 @@ import java.util.OptionalDouble; import java.util.Random; public final class RenderHelper { - private static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = getTranslucentTransparency(); + private static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = AccessorRenderState.getTranslucentTransparency(); private static final RenderType STAR; public static final RenderType RECTANGLE; public static final RenderType CIRCLE; @@ -81,10 +81,10 @@ public final class RenderHelper { static { // todo 1.16 update to match vanilla where necessary (alternate render targets, etc.) - RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_"); + RenderState.TransparencyState lightningTransparency = AccessorRenderState.getLightningTransparency(); RenderState.TextureState mipmapBlockAtlasTexture = new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, true); RenderState.CullState disableCull = new RenderState.CullState(false); - RenderState.LayerState viewOffsetZLayering = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_239235_M_"); + RenderState.LayerState viewOffsetZLayering = AccessorRenderState.getViewOffsetZLayer(); RenderState.WriteMaskState colorMask = new RenderState.WriteMaskState(true, false); RenderType.ShadeModelState smoothShade = new RenderState.ShadeModelState(true); RenderState.LightmapState enableLightmap = new RenderState.LightmapState(true); @@ -92,7 +92,7 @@ public final class RenderHelper { RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true); RenderState.AlphaState oneTenthAlpha = new RenderState.AlphaState(0.004F); RenderState.DepthTestState noDepth = new RenderState.DepthTestState("always", GL11.GL_ALWAYS); - RenderState.TargetState itemTarget = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_241712_U_"); + RenderState.TargetState itemTarget = AccessorRenderState.getItemEntityTarget(); boolean useShaders = ShaderHelper.useShaders(); RenderType.State glState = RenderType.State.getBuilder().shadeModel(smoothShade) @@ -187,10 +187,6 @@ public final class RenderHelper { ENTITY_TRANSLUCENT_GOLD = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.GOLD, null, gold) : gold; } - private static RenderState.TransparencyState getTranslucentTransparency() { - return ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_"); - } - private static RenderType getPylonGlowDirect(String name, ResourceLocation texture) { return getPylonGlow(name, texture, true); } @@ -208,8 +204,7 @@ public final class RenderHelper { .cull(new RenderState.CullState(false)) .lightmap(new RenderState.LightmapState(true)); if (!direct) { - RenderState.TargetState itemTarget = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_241712_U_"); - glState = glState.target(itemTarget); + glState = glState.target(AccessorRenderState.getItemEntityTarget()); } RenderType layer = RenderType.makeType(LibResources.PREFIX_MOD + name, DefaultVertexFormats.ENTITY, GL11.GL_QUADS, 128, glState.build(false)); return ShaderHelper.useShaders() ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, layer) : layer; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 2991d3b8f..c26a56799 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -13,16 +13,15 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.tileentity.EndPortalTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Matrix4f; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.block.tile.TileStarfield; +import vazkii.botania.mixin.AccessorEndPortalTileEntityRenderer; import java.util.List; import java.util.Random; @@ -30,7 +29,7 @@ import java.util.Random; // [VanillaCopy] end portal TESR, relevant edits are commented public class RenderTileStarfield extends TileEntityRenderer { private static final Random RANDOM = new Random(31100L); - private static List field_228881_e_ = ObfuscationReflectionHelper.getPrivateValue(EndPortalTileEntityRenderer.class, null, "field_228881_e_"); + private static final List LAYERS = AccessorEndPortalTileEntityRenderer.getLayers(); public RenderTileStarfield(TileEntityRendererDispatcher manager) { super(manager); @@ -44,15 +43,15 @@ public class RenderTileStarfield extends TileEntityRenderer { int i = this.getPasses(d0); float f = this.getOffset(); Matrix4f matrix4f = p_225616_3_.getLast().getMatrix(); - this.func_228883_a_(p_225616_1_, f, 0.15F, matrix4f, p_225616_4_.getBuffer(field_228881_e_.get(0))); + this.renderCube(p_225616_1_, f, 0.15F, matrix4f, p_225616_4_.getBuffer(LAYERS.get(0))); for (int j = 1; j < i; ++j) { - this.func_228883_a_(p_225616_1_, f, 2.0F / (float) (18 - j), matrix4f, p_225616_4_.getBuffer(field_228881_e_.get(j))); + this.renderCube(p_225616_1_, f, 2.0F / (float) (18 - j), matrix4f, p_225616_4_.getBuffer(LAYERS.get(j))); } } - private void func_228883_a_(TileStarfield p_228883_1_, float p_228883_2_, float p_228883_3_, Matrix4f p_228883_4_, IVertexBuilder p_228883_5_) { + private void renderCube(TileStarfield p_228883_1_, float p_228883_2_, float p_228883_3_, Matrix4f p_228883_4_, IVertexBuilder p_228883_5_) { float f = (RANDOM.nextFloat() * 0.5F + 0.1F) * p_228883_3_; float f1 = (RANDOM.nextFloat() * 0.5F + 0.4F) * p_228883_3_; float f2 = (RANDOM.nextFloat() * 0.5F + 0.5F) * p_228883_3_; @@ -63,15 +62,15 @@ public class RenderTileStarfield extends TileEntityRenderer { f1 = (color >> 8 & 0xFF) / 255F * p_228883_3_; f2 = (color & 0xFF) / 255F * p_228883_3_; - this.func_228884_a_(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, 0.0F, 1.0F, 1.0F, 1.0F, 1.0F, 1.0F, f, f1, f2, Direction.SOUTH); - this.func_228884_a_(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, f, f1, f2, Direction.NORTH); - this.func_228884_a_(p_228883_1_, p_228883_4_, p_228883_5_, 1.0F, 1.0F, 1.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.0F, f, f1, f2, Direction.EAST); - this.func_228884_a_(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 0.0F, 0.0F, 1.0F, 0.0F, 1.0F, 1.0F, 0.0F, f, f1, f2, Direction.WEST); - this.func_228884_a_(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f, f1, f2, Direction.DOWN); - this.func_228884_a_(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, p_228883_2_, p_228883_2_, 1.0F, 1.0F, 0.0F, 0.0F, f, f1, f2, Direction.UP); + this.shouldRenderFace(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, 0.0F, 1.0F, 1.0F, 1.0F, 1.0F, 1.0F, f, f1, f2, Direction.SOUTH); + this.shouldRenderFace(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, f, f1, f2, Direction.NORTH); + this.shouldRenderFace(p_228883_1_, p_228883_4_, p_228883_5_, 1.0F, 1.0F, 1.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.0F, f, f1, f2, Direction.EAST); + this.shouldRenderFace(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 0.0F, 0.0F, 1.0F, 0.0F, 1.0F, 1.0F, 0.0F, f, f1, f2, Direction.WEST); + this.shouldRenderFace(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, 0.0F, 0.0F, 0.0F, 0.0F, 1.0F, 1.0F, f, f1, f2, Direction.DOWN); + this.shouldRenderFace(p_228883_1_, p_228883_4_, p_228883_5_, 0.0F, 1.0F, p_228883_2_, p_228883_2_, 1.0F, 1.0F, 0.0F, 0.0F, f, f1, f2, Direction.UP); } - private void func_228884_a_(TileStarfield p_228884_1_, Matrix4f p_228884_2_, IVertexBuilder p_228884_3_, float p_228884_4_, float p_228884_5_, float p_228884_6_, float p_228884_7_, float p_228884_8_, float p_228884_9_, float p_228884_10_, float p_228884_11_, float p_228884_12_, float p_228884_13_, float p_228884_14_, Direction p_228884_15_) { + private void shouldRenderFace(TileStarfield p_228884_1_, Matrix4f p_228884_2_, IVertexBuilder p_228884_3_, float p_228884_4_, float p_228884_5_, float p_228884_6_, float p_228884_7_, float p_228884_8_, float p_228884_9_, float p_228884_10_, float p_228884_11_, float p_228884_12_, float p_228884_13_, float p_228884_14_, Direction p_228884_15_) { if (p_228884_15_ == Direction.UP) { // Botania: up face only p_228884_3_.pos(p_228884_2_, p_228884_4_, p_228884_6_, p_228884_8_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); p_228884_3_.pos(p_228884_2_, p_228884_5_, p_228884_6_, p_228884_9_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); diff --git a/src/main/java/vazkii/botania/mixin/AccessorEndPortalTileEntityRenderer.java b/src/main/java/vazkii/botania/mixin/AccessorEndPortalTileEntityRenderer.java new file mode 100644 index 000000000..56b05db87 --- /dev/null +++ b/src/main/java/vazkii/botania/mixin/AccessorEndPortalTileEntityRenderer.java @@ -0,0 +1,16 @@ +package vazkii.botania.mixin; + +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.tileentity.EndPortalTileEntityRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.List; + +@Mixin(EndPortalTileEntityRenderer.class) +public interface AccessorEndPortalTileEntityRenderer { + @Accessor("RENDER_TYPES") + static List getLayers() { + throw new IllegalStateException(); + } +} diff --git a/src/main/java/vazkii/botania/mixin/AccessorRenderState.java b/src/main/java/vazkii/botania/mixin/AccessorRenderState.java new file mode 100644 index 000000000..ae235f0ab --- /dev/null +++ b/src/main/java/vazkii/botania/mixin/AccessorRenderState.java @@ -0,0 +1,28 @@ +package vazkii.botania.mixin; + +import net.minecraft.client.renderer.RenderState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(RenderState.class) +public interface AccessorRenderState { + @Accessor("field_239235_M_") + static RenderState.LayerState getViewOffsetZLayer() { + throw new IllegalStateException(); + } + + @Accessor("TRANSLUCENT_TRANSPARENCY") + static RenderState.TransparencyState getTranslucentTransparency() { + throw new IllegalStateException(); + } + + @Accessor("LIGHTNING_TRANSPARENCY") + static RenderState.TransparencyState getLightningTransparency() { + throw new IllegalStateException(); + } + + @Accessor("field_241712_U_") + static RenderState.TargetState getItemEntityTarget() { + throw new IllegalStateException(); + } +} diff --git a/src/main/resources/assets/botania/botania.mixins.json b/src/main/resources/assets/botania/botania.mixins.json index 35677a720..49e8302bd 100644 --- a/src/main/resources/assets/botania/botania.mixins.json +++ b/src/main/resources/assets/botania/botania.mixins.json @@ -22,12 +22,14 @@ ], "client": [ "AccessorBiomeGeneratorTypeScreens", + "AccessorEndPortalTileEntityRenderer", "AccessorFirstPersonRenderer", "AccessorItemOverrideList", "AccessorModelBakery", "AccessorMinecraft", "AccessorRecipeBookGui", "AccessorRecipeBookPage", + "AccessorRenderState", "AccessorRenderTypeBuffers", "AccessorWorldRenderer", "MixinSplashes"