mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Fix gold renders
This commit is contained in:
1 parent
de450cb633
commit
549adb3d42
4 files changed
+61
-8
No files matched your search
@@ -36,6 +36,7 @@ import net.minecraft.item.Items;
|
||||
import net.minecraft.util.DefaultUncaughtExceptionHandler;
|
||||
import vazkii.botania.api.item.AccessoryRenderHelper;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
@@ -138,10 +139,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
|
||||
ms.translate(0, -0.85, 0);
|
||||
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
|
||||
ms.scale(0.5F, 0.5F, 0.5F);
|
||||
// todo 1.15 shader
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.GOLD);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(player, flower, ItemCameraTransforms.TransformType.NONE, false, ms, buffers, player.world, 0xF000F0, OverlayTexture.DEFAULT_UV);
|
||||
ShaderHelper.releaseShader();
|
||||
RenderHelper.renderItemModelGold(player, flower, ItemCameraTransforms.TransformType.NONE, ms, buffers, player.world, 0xF000F0, OverlayTexture.DEFAULT_UV);
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
@@ -28,23 +29,32 @@ import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.internal.ShaderCallback;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.render.tile.RenderTilePylon;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.OptionalDouble;
|
||||
import java.util.Random;
|
||||
|
||||
@@ -70,6 +80,7 @@ public final class RenderHelper {
|
||||
public static final RenderType NATURA_PYLON_GLOW;
|
||||
public static final RenderType GAIA_PYLON_GLOW;
|
||||
public static final RenderType ASTROLABE_PREVIEW;
|
||||
public static final RenderType ENTITY_TRANSLUCENT_GOLD;
|
||||
|
||||
// todo 1.15 AT's for necessary fields
|
||||
static {
|
||||
@@ -149,6 +160,9 @@ public final class RenderHelper {
|
||||
GlStateManager.uniform1(alpha, ShaderHelper.FLOAT_BUF);
|
||||
};
|
||||
ASTROLABE_PREVIEW = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.ALPHA, cb, RenderType.of(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 256, true, true, glState));
|
||||
|
||||
glState = RenderType.State.builder().texture(new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, false)).transparency(translucentTransparency).diffuseLighting(enableDiffuse).alpha(oneTenthAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
|
||||
ENTITY_TRANSLUCENT_GOLD = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.GOLD, null, RenderType.of(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 128, true, true, glState));
|
||||
}
|
||||
|
||||
public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) {
|
||||
@@ -335,4 +349,34 @@ public final class RenderHelper {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static final MethodHandle RENDER_BAKED_ITEM_MODEL = LibObfuscation.getMethod(ItemRenderer.class, "func_229114_a_", IBakedModel.class, ItemStack.class, int.class, int.class, MatrixStack.class, IVertexBuilder.class);
|
||||
|
||||
// [VanillaCopy] Portions of ItemRenderer.renderItem
|
||||
// Does not support TEISRs
|
||||
public static void renderItemModelGold(@Nullable LivingEntity entity, ItemStack stack, ItemCameraTransforms.TransformType transform, MatrixStack ms, IRenderTypeBuffer buffers, @Nullable World world, int light, int overlay) {
|
||||
ItemRenderer ir = Minecraft.getInstance().getItemRenderer();
|
||||
if (!stack.isEmpty()) {
|
||||
IBakedModel ibakedmodel = ir.getItemModelWithOverrides(stack, world, entity);
|
||||
ms.push();
|
||||
boolean flag = transform == ItemCameraTransforms.TransformType.GUI;
|
||||
boolean flag1 = flag || transform == ItemCameraTransforms.TransformType.GROUND || transform == ItemCameraTransforms.TransformType.FIXED;
|
||||
if (stack.getItem() == Items.TRIDENT && flag1) {
|
||||
ibakedmodel = ir.getItemModelMesher().getModelManager().getModel(new ModelResourceLocation("minecraft:trident#inventory"));
|
||||
}
|
||||
|
||||
ibakedmodel = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(ms, ibakedmodel, transform, false);
|
||||
ms.translate(-0.5D, -0.5D, -0.5D);
|
||||
if (!ibakedmodel.isBuiltInRenderer() && (stack.getItem() != Items.TRIDENT || flag1)) {
|
||||
IVertexBuilder ivertexbuilder = ItemRenderer.getArmorVertexConsumer(buffers, ENTITY_TRANSLUCENT_GOLD, true, stack.hasEffect());
|
||||
try {
|
||||
RENDER_BAKED_ITEM_MODEL.invokeExact(ir, ibakedmodel, stack, light, overlay, ms, ivertexbuilder);
|
||||
} catch (Throwable ex) {
|
||||
throw new RuntimeException("Error calling renderBakedItemModel", ex);
|
||||
}
|
||||
}
|
||||
|
||||
ms.pop();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,6 +49,7 @@ import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.client.core.handler.ContributorFancinessHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.helper.ShaderWrappedRenderLayer;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
@@ -357,10 +358,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
if (!icon.isEmpty()) {
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180));
|
||||
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180));
|
||||
// todo 1.15
|
||||
ShaderHelper.useShader(ShaderHelper.BotaniaShader.GOLD);
|
||||
renderItem(ms, buffers, light, overlay, icon);
|
||||
ShaderHelper.releaseShader();
|
||||
RenderHelper.renderItemModelGold(null, icon, ItemCameraTransforms.TransformType.HEAD, ms, buffers, null, light, overlay);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,11 @@
|
||||
*/
|
||||
package vazkii.botania.common.lib;
|
||||
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
|
||||
public final class LibObfuscation {
|
||||
// EntityLiving
|
||||
public static final String GET_LIVING_SOUND = "func_184639_G";
|
||||
@@ -22,4 +27,12 @@ public final class LibObfuscation {
|
||||
|
||||
// HoeItem
|
||||
public static final String HOE_LOOKUP = "field_195973_b";
|
||||
|
||||
public static MethodHandle getMethod(Class<?> clazz, String srg, Class<?>... paramTypes) {
|
||||
try {
|
||||
return MethodHandles.publicLookup().unreflect(ObfuscationReflectionHelper.findMethod(clazz, srg, paramTypes));
|
||||
} catch (IllegalAccessException e) {
|
||||
throw new IllegalStateException("Can't find " + srg, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user