1.19.4-pre1
This commit is contained in:
parent
32e719115b
commit
759c3fbfc3
58 changed files with 210 additions and 263 deletions
|
@ -55,7 +55,7 @@ public class RebornCoreClient implements ClientModInitializer {
|
|||
});
|
||||
|
||||
ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
|
||||
String strangeMcLang = client.getLanguageManager().getLanguage().getCode();
|
||||
String strangeMcLang = client.getLanguageManager().getLanguage();
|
||||
RebornCore.locale = Locale.forLanguageTag(strangeMcLang.substring(0, 2));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -79,7 +79,6 @@ public class ClientChunkManager {
|
|||
final Tessellator tessellator = Tessellator.getInstance();
|
||||
final BufferBuilder bufferBuilder = tessellator.getBuffer();
|
||||
|
||||
RenderSystem.disableTexture();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.lineWidth(5.0F);
|
||||
|
||||
|
@ -100,7 +99,6 @@ public class ClientChunkManager {
|
|||
tessellator.draw();
|
||||
RenderSystem.lineWidth(1.0F);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.enableTexture();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -79,7 +79,7 @@ public class ItemStackRenderer implements HudRenderCallback {
|
|||
|
||||
framebuffer.beginWrite(true);
|
||||
GlStateManager._clear(GL12.GL_COLOR_BUFFER_BIT | GL12.GL_DEPTH_BUFFER_BIT, MinecraftClient.IS_SYSTEM_MAC);
|
||||
MinecraftClient.getInstance().getItemRenderer().renderInGui(item, 0, 0);
|
||||
MinecraftClient.getInstance().getItemRenderer().renderInGui(stack, item, 0, 0);
|
||||
framebuffer.endWrite();
|
||||
|
||||
framebuffer.beginRead();
|
||||
|
|
|
@ -146,7 +146,6 @@ public class RenderUtil {
|
|||
}
|
||||
|
||||
public static void drawGradientRect(MatrixStack matrices, int zLevel, int left, int top, int right, int bottom, int startColor, int endColor) {
|
||||
RenderSystem.disableTexture();
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.defaultBlendFunc();
|
||||
RenderSystem.setShader(GameRenderer::getPositionColorProgram);
|
||||
|
@ -172,7 +171,6 @@ public class RenderUtil {
|
|||
|
||||
tessellator.draw();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.enableTexture();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -50,7 +50,7 @@ public class RedstoneConfigGui {
|
|||
int i = 0;
|
||||
int spread = configuration.getElements().size() == 3 ? 27 : 18;
|
||||
for (RedstoneConfiguration.Element element : configuration.getElements()) {
|
||||
itemRenderer.renderInGuiWithOverrides(element.getIcon(), x - 3, y + (i * spread) - 5);
|
||||
itemRenderer.renderInGuiWithOverrides(matrixStack, element.getIcon(), x - 3, y + (i * spread) - 5);
|
||||
|
||||
guiBase.getTextRenderer().draw(matrixStack, Text.translatable("reborncore.gui.fluidconfig." + element.getName()), x + 15, y + (i * spread), -1);
|
||||
|
||||
|
|
|
@ -114,8 +114,8 @@ public class ConfigSlotElement extends ElementBase {
|
|||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GlStateManager.SrcFactor.SRC_ALPHA, GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA);
|
||||
ItemRenderer renderItem = MinecraftClient.getInstance().getItemRenderer();
|
||||
renderItem.renderInGuiWithOverrides(stack, xPos, yPos);
|
||||
renderItem.renderGuiItemOverlay(gui.getTextRenderer(), stack, xPos, yPos, null);
|
||||
renderItem.renderInGuiWithOverrides(matrixStack, stack, xPos, yPos);
|
||||
renderItem.renderGuiItemOverlay(matrixStack, gui.getTextRenderer(), stack, xPos, yPos, null);
|
||||
RenderSystem.disableDepthTest();
|
||||
matrixStack.pop();
|
||||
if (isHovering) {
|
||||
|
|
|
@ -318,7 +318,7 @@ public class ElementBase {
|
|||
RenderSystem.blendFunc(GlStateManager.SrcFactor.SRC_ALPHA, GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
|
||||
itemRenderer.renderInGuiWithOverrides(sprite.itemStack, x + gui.getGuiLeft(), y + gui.getGuiTop());
|
||||
itemRenderer.renderInGuiWithOverrides(matrixStack, sprite.itemStack, x + gui.getGuiLeft(), y + gui.getGuiTop());
|
||||
|
||||
matrixStack.pop();
|
||||
}
|
||||
|
|
|
@ -387,7 +387,7 @@ public class GuiBuilder {
|
|||
public void drawSlotTab(MatrixStack matrixStack, GuiBase<?> gui, int x, int y, ItemStack stack) {
|
||||
RenderSystem.setShaderTexture(0, resourceLocation);
|
||||
gui.drawTexture(matrixStack, x, y, 217, 82, 24, 24);
|
||||
gui.getMinecraft().getItemRenderer().renderInGuiWithOverrides(stack, x + 5, y + 4);
|
||||
gui.getMinecraft().getItemRenderer().renderInGuiWithOverrides(matrixStack, stack, x + 5, y + 4);
|
||||
}
|
||||
|
||||
|
||||
|
@ -461,7 +461,7 @@ public class GuiBuilder {
|
|||
|
||||
@Override
|
||||
public void render(MatrixStack matrixStack, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean hovering, float delta) {
|
||||
MinecraftClient.getInstance().textRenderer.drawTrimmed(tip, x, y, width, 11184810);
|
||||
MinecraftClient.getInstance().textRenderer.drawTrimmed(matrixStack, tip, x, y, width, 11184810);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,6 +33,7 @@ import net.minecraft.client.render.VertexConsumer;
|
|||
import net.minecraft.client.render.VertexConsumerProvider;
|
||||
import net.minecraft.client.render.block.BlockRenderManager;
|
||||
import net.minecraft.client.render.model.json.ModelTransformation;
|
||||
import net.minecraft.client.render.model.json.ModelTransformationMode;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.fluid.FluidState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -40,6 +41,7 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.util.math.random.Random;
|
||||
import net.minecraft.world.BlockRenderView;
|
||||
import net.minecraft.world.BlockView;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.common.blockentity.MultiblockWriter;
|
||||
|
||||
import java.util.function.BiPredicate;
|
||||
|
@ -48,7 +50,7 @@ import java.util.function.BiPredicate;
|
|||
* Renders a hologram
|
||||
*/
|
||||
public
|
||||
record HologramRenderer(BlockRenderView view, MatrixStack matrix, VertexConsumerProvider vertexConsumerProvider,
|
||||
record HologramRenderer(World view, MatrixStack matrix, VertexConsumerProvider vertexConsumerProvider,
|
||||
float scale) implements MultiblockWriter {
|
||||
private static final BlockPos OUT_OF_WORLD_POS = new BlockPos(0, 260, 0); // Bad hack; disables lighting
|
||||
|
||||
|
@ -63,7 +65,7 @@ record HologramRenderer(BlockRenderView view, MatrixStack matrix, VertexConsumer
|
|||
|
||||
if (state.getBlock() instanceof FluidBlock) {
|
||||
FluidState fluidState = ((FluidBlock) state.getBlock()).getFluidState(state);
|
||||
MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(fluidState.getFluid().getBucketItem()), ModelTransformation.Mode.FIXED, 15728880, OverlayTexture.DEFAULT_UV, matrix, vertexConsumerProvider, 0);
|
||||
MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(fluidState.getFluid().getBucketItem()), ModelTransformationMode.FIXED, 15728880, OverlayTexture.DEFAULT_UV, matrix, vertexConsumerProvider, view, 0);
|
||||
} else {
|
||||
matrix.translate(-0.5, -0.5, -0.5);
|
||||
VertexConsumer consumer = vertexConsumerProvider.getBuffer(RenderLayers.getBlockLayer(state));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue