Port to Minecraft 1.20.

Author: LambdAurora

CHANGELOG.md

@@ -118,3 +118,4 @@
 - Fixed ignoring `HideFlags` in armor NBT ([#98](https://github.com/Queerbric/Inspecio/issues/98)).
 - Fixed messed up colors in shulker box previews ([#102](https://github.com/Queerbric/Inspecio/issues/102)).
 - Fixed unbounded hunger/saturation tooltips with auto-wrapping ([#105](https://github.com/Queerbric/Inspecio/issues/105)).
+- (1.20+) Added ability to see both sides of a sign in a tooltip by pressing the control key.

gradle.properties

@@ -1,11 +1,11 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric properties
-minecraft_version=1.19.4
-quilt_mappings=5
+minecraft_version=1.20
+quilt_mappings=1
 loader_version=0.18.5
 
-qsl_version=5.0.0-beta.1
+qsl_version=6.0.1
 
 # Mod properties
 mod_version=1.8.1

src/main/java/io/github/queerbric/inspecio/Inspecio.java

@@ -66,6 +66,7 @@ RegistryKeys.ITEM, new Identifier(NAMESPACE, "hidden_effects"),
 			TagType.CLIENT_FALLBACK
 	);
 	public static final RandomGenerator COMMON_RANDOM = new LegacySimpleRandom(System.currentTimeMillis());
+	public static final Identifier GUI_ICONS_TEXTURE = new Identifier("textures/gui/icons.png");
 	private static InspecioConfig config = InspecioConfig.defaultConfig();
 	private static ModContainer mod;
 

src/main/java/io/github/queerbric/inspecio/tooltip/ArmorStandTooltipComponent.java

@@ -22,9 +22,9 @@
 import io.github.queerbric.inspecio.mixin.EntityAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.item.TooltipData;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -67,8 +67,9 @@ public static Optional<TooltipData> of(NbtCompound itemNbt) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer) {
+	public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
 		if (this.shouldRender()) {
+			MatrixStack matrices = graphics.getMatrices();
 			matrices.push();
 			matrices.translate(30, 0, 0);
 			((EntityAccessor) this.entity).setTouchingWater(true);

src/main/java/io/github/queerbric/inspecio/tooltip/ArmorTooltipComponent.java

@@ -17,15 +17,11 @@
 
 package io.github.queerbric.inspecio.tooltip;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.queerbric.inspecio.Inspecio;
 import io.github.queerbric.inspecio.mixin.ItemStackAccessor;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.ItemStack;
 import org.quiltmc.qsl.tooltip.api.ConvertibleTooltipData;
@@ -68,13 +64,12 @@ public int getWidth(TextRenderer textRenderer) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer) {
-		RenderSystem.setShaderTexture(0, InGameHud.GUI_ICONS_TEXTURE);
+	public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
 		for (int i = 0; i < this.prot / 2; i++) {
-			DrawableHelper.drawTexture(matrices, x + i * 9, y, 34, 9, 9, 9, 256, 256);
+			graphics.drawTexture(Inspecio.GUI_ICONS_TEXTURE, x + i * 9, y, 34, 9, 9, 9, 256, 256);
 		}
 		if (this.prot % 2 == 1) {
-			DrawableHelper.drawTexture(matrices, x + this.prot / 2 * 9, y, 25, 9, 9, 9, 256, 256);
+			graphics.drawTexture(Inspecio.GUI_ICONS_TEXTURE, x + this.prot / 2 * 9, y, 25, 9, 9, 9, 256, 256);
 		}
 	}
 }

src/main/java/io/github/queerbric/inspecio/tooltip/BannerTooltipComponent.java

@@ -24,14 +24,14 @@
 import net.minecraft.block.entity.BannerPattern;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.client.item.TooltipData;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.block.entity.BannerBlockEntityRenderer;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.nbt.NbtList;
@@ -82,8 +82,9 @@ public int getWidth(TextRenderer textRenderer) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer) {
+	public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
 		DiffuseLighting.setupFlatGuiLighting();
+		MatrixStack matrices = graphics.getMatrices();
 		matrices.push();
 		matrices.translate(x + 8, y + 8, 0);
 		matrices.push();

src/main/java/io/github/queerbric/inspecio/tooltip/BeesTooltipComponent.java

@@ -17,16 +17,14 @@
 
 package io.github.queerbric.inspecio.tooltip;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.queerbric.inspecio.Inspecio;
 import io.github.queerbric.inspecio.InspecioConfig;
 import net.minecraft.block.BeehiveBlock;
 import net.minecraft.block.entity.BeehiveBlockEntity;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.item.TooltipData;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -117,7 +115,8 @@ public int getWidth(TextRenderer textRenderer) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer) {
+	public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
+		MatrixStack matrices = graphics.getMatrices();
 		matrices.push();
 
 		if (!this.bees.isEmpty()) {
@@ -135,11 +134,10 @@ public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matri
 			matrices.translate(x, y + (this.bees.isEmpty() ? 0 : (this.shouldRenderCustomNames() ? 32 : 24)), 0);
 			matrices.scale(2, 2, 1);
 
-			RenderSystem.setShaderTexture(0, HONEY_LEVEL_TEXTURE);
-			DrawableHelper.drawTexture(matrices, 0, 0, 0, 0, 0, 26, 5, 32, 16);
+			graphics.drawTexture(HONEY_LEVEL_TEXTURE, 0, 0, 0, 0, 0, 26, 5, 32, 16);
 
 			if (honeyLevel != 0) {
-				DrawableHelper.drawTexture(matrices, 0, 0, 0, 0, 5, Math.min(25, honeyLevel * 5 + 1), 6, 32, 16);
+				graphics.drawTexture(HONEY_LEVEL_TEXTURE, 0, 0, 0, 0, 5, Math.min(25, honeyLevel * 5 + 1), 6, 32, 16);
 			}
 		}
 

src/main/java/io/github/queerbric/inspecio/tooltip/CampfireTooltipComponent.java

@@ -21,11 +21,9 @@
 import io.github.queerbric.inspecio.Inspecio;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.client.item.TooltipData;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
@@ -94,16 +92,16 @@ public int getWidth(TextRenderer textRenderer) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int xOffset, int yOffset, MatrixStack matrices, ItemRenderer itemRenderer) {
+	public void drawItems(TextRenderer textRenderer, int xOffset, int yOffset, GuiGraphics graphics) {
 		int x = 1 + 18 * 2;
 		int y = 1 + 18 * 2;
 
 		for (int i = 0; i < this.inventory.size(); i++) {
 			var stack = this.inventory.get(i);
 
-			InventoryTooltipComponent.drawSlot(matrices, x + xOffset - 1, y + yOffset - 1, 0, null);
-			itemRenderer.method_4023(matrices, stack, xOffset + x, yOffset + y);
-			itemRenderer.method_4025(matrices, textRenderer, stack, xOffset + x, yOffset + y);
+			InventoryTooltipComponent.drawSlot(graphics, x + xOffset - 1, y + yOffset - 1, 0, null);
+			graphics.drawItem(stack, xOffset + x, yOffset + y);
+			graphics.drawItemInSlot(textRenderer, stack, xOffset + x, yOffset + y);
 
 			if (i == 1)
 				y -= 18 * 2;
@@ -118,7 +116,7 @@ else if (i == 2)
 
 			var sprite = MinecraftClient.getInstance().getSpriteAtlas(ATLAS_TEXTURE).apply(this.fireTexture);
 			if (sprite != null)
-				DrawableHelper.drawSprite(matrices, xOffset + 19, yOffset + 19, 0, 16, 16, sprite);
+				graphics.drawSprite(xOffset + 19, yOffset + 19, 0, 16, 16, sprite);
 		}
 	}
 }

src/main/java/io/github/queerbric/inspecio/tooltip/ChiseledBookshelfTooltipComponent.java

@@ -25,11 +25,11 @@
 import net.minecraft.block.ChiseledBookshelfBlock;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.client.item.TooltipData;
 import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.OverlayTexture;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
@@ -97,8 +97,9 @@ public int getWidth(TextRenderer textRenderer) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer) {
+	public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
 		DiffuseLighting.setupInventoryEntityLighting();
+		MatrixStack matrices = graphics.getMatrices();
 		matrices.translate(x, y, 0);
 		matrices.scale(-1, -1, 1);
 		matrices.translate(-20, -20, 0);

src/main/java/io/github/queerbric/inspecio/tooltip/CompoundTooltipComponent.java

@@ -19,6 +19,7 @@
 
 import com.google.common.collect.Lists;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
 import net.minecraft.client.render.VertexConsumerProvider.Immediate;
 import net.minecraft.client.render.item.ItemRenderer;
@@ -61,10 +62,10 @@ public int getWidth(TextRenderer textRenderer) {
 	}
 
 	@Override
-	public void drawItems(TextRenderer textRenderer, int x, int y, MatrixStack matrices, ItemRenderer itemRenderer) {
+	public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
 		int yOff = 0;
 		for (var comp : components) {
-			comp.drawItems(textRenderer, x, y + yOff, matrices, itemRenderer);
+			comp.drawItems(textRenderer, x, y + yOff, graphics);
 			yOff += comp.getHeight();
 		}
 	}