backport to 1.21.5 for Mod Garden

Author: HamaIndustries

libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-loom = "1.11.+"
+loom = "1.10.+"
 minotaur = "2.+"
 
 kaleidoConfig = "0.3.1+1.3.1"
 
-mc = "1.21.7"
+mc = "1.21.5"
 fl = "0.16.14"
-yarn = "1.21.7+build.2"
-fapi = "0.128.2+1.21.7"
+yarn = "1.21.5+build.1"
+fapi = "0.128.1+1.21.5"
 
-fpapi = "0.4.0"
-libgui = "14.0.0+1.21.6"
+fpapi = "0.3.1"
+libgui = "13.1.0+1.21.5"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }

src/main/java/net/modfest/scatteredshards/block/ShardBlockEntity.java

@@ -5,13 +5,12 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
 import net.minecraft.network.listener.ClientPlayPacketListener;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.storage.ReadView;
-import net.minecraft.storage.WriteView;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
@@ -86,34 +85,32 @@ public boolean canInteract() {
 		return canInteract;
 	}
 
-	@Override
-	protected void writeData(WriteView view) {
-		super.writeData(view);
 
-		if (shardId != null) view.putString(SHARD_NBT_KEY, shardId.toString());
+	@Override
+	protected void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
+		super.writeNbt(nbt, registryLookup);
+		if (shardId != null) nbt.putString(SHARD_NBT_KEY, shardId.toString());
 
-		view.putBoolean("CanInteract", this.canInteract);
+		nbt.putBoolean("CanInteract", this.canInteract);
 
 		NbtCompound glowSettings = new NbtCompound();
 		glowSettings.putFloat("size", this.glowSize);
 		glowSettings.putFloat("strength", this.glowStrength);
-		view.put("Glow", NbtCompound.CODEC, glowSettings);
+		nbt.put("Glow", glowSettings);
 	}
 
 	@Override
-	protected void readData(ReadView view) {
-		super.readData(view);
-
-		var shardId = view.getString(SHARD_NBT_KEY, null);
-		if (shardId != null) {
-			setShardId(Identifier.of(shardId));
-		}
+	protected void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
+		super.readNbt(nbt, registryLookup);
+		nbt.getString(SHARD_NBT_KEY).ifPresent(
+			v -> setShardId(Identifier.of(v))
+		);
 
-		this.canInteract = view.getBoolean("CanInteract", false);
+		this.canInteract = nbt.getBoolean("CanInteract", false);
 
-		NbtCompound glowSettings = view.read("Glow", NbtCompound.CODEC).get();
-		this.glowSize = glowSettings.getFloat("size").orElse(this.glowSize);
-		this.glowStrength = glowSettings.getFloat("strength").orElse(this.glowStrength);
+		NbtCompound glowSettings = nbt.getCompound("Glow").get();
+		this.glowSize = glowSettings.getFloat("size", this.glowSize);
+		this.glowStrength = glowSettings.getFloat("strength", this.glowStrength);
 	}
 
 	@Override

src/main/java/net/modfest/scatteredshards/client/ShardCollectedToast.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
 import net.minecraft.item.ItemStack;
@@ -77,7 +78,7 @@ public void update(ToastManager manager, long time) {
 
 	@Override
 	public void draw(DrawContext context, TextRenderer textRenderer, long startTime) {
-		context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, TEXTURE, 0, 0, this.getWidth(), this.getHeight());
+		context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURE, 0, 0, this.getWidth(), this.getHeight());
 
 		context.drawText(
 			textRenderer,

src/main/java/net/modfest/scatteredshards/client/render/ShardBlockEntityRenderer.java

@@ -66,7 +66,10 @@ public void render(ShardBlockEntity entity, float tickDelta, MatrixStack matrice
 
 		float alpha = collected ? 0.5f : 1f;
 
-		VertexConsumer buf = vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(ShardType.getBackingTexture(shard.shardTypeId())));
+		// old VertexConsumer buf = vertexConsumers.getBuffer(RenderLayer.getEntityTranslucentCull(ShardType.getBackingTexture(shard.shardTypeId())));
+		// .7 VertexConsumer buf = vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(ShardType.getBackingTexture(shard.shardTypeId())));
+		Identifier bt = ShardType.getBackingTexture(shard.shardTypeId());
+		VertexConsumer buf = vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(bt));
 
 		/*
 		 * A note about scale here:
@@ -126,7 +129,9 @@ public void render(ShardBlockEntity entity, float tickDelta, MatrixStack matrice
 
 		//Draw card front
 		Vector3f revNormal = normal.mul(-1, -1, -1);
-		buf = vertexConsumers.getBuffer(RenderLayer.getEntityTranslucent(ShardType.getFrontTexture(shard.shardTypeId())));
+		Identifier ft = ShardType.getFrontTexture(shard.shardTypeId());
+		// cheating: .5 weirdly only wants to use the last texture, so we just use a different renderlayer /shrug
+		buf = vertexConsumers.getBuffer(RenderLayer.getItemEntityTranslucentCull(ft));
 		buf
 			.vertex(matrices.peek().getPositionMatrix(), dl.x, dl.y, dl.z)
 			.color(1, 1, 1, alpha)

src/main/java/net/modfest/scatteredshards/client/screen/widget/WAlternativeToggle.java

@@ -10,11 +10,11 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.modfest.scatteredshards.ScatteredShards;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix3x2fStack;
 
 import java.util.Optional;
 import java.util.function.Function;
@@ -149,16 +149,16 @@ public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
 		int hoverX = (isRight) ? 0 : halfWidth - 1;
 		boolean hovered = (mouseX >= hoverX && mouseY >= 0 && mouseX < hoverX + halfWidth && mouseY < getHeight());
 
-		Matrix3x2fStack matrices = context.getMatrices();
-		matrices.pushMatrix();
-		matrices.translate(x, y);
+		MatrixStack matrices = context.getMatrices();
+		matrices.push();
+		matrices.translate(x, y, 0);
 		NinePatch<Identifier> leftButton = map(recessedButton, button);
 		NinePatch<Identifier> rightButton = map(button, recessedButton);
 		leftButton.draw(NinePatchTextureRendererImpl.INSTANCE, context, halfWidth, this.getHeight());
-		matrices.translate(halfWidth - 1, 0);
+		matrices.translate(halfWidth - 1, 0, 0);
 		rightButton.draw(NinePatchTextureRendererImpl.INSTANCE, context, halfWidth, this.getHeight());
 
-		matrices.popMatrix();
+		matrices.pop();
 
 		ScreenDrawing.drawStringWithShadow(context, leftLabel.asOrderedText(), HorizontalAlignment.CENTER, x + 2, y + 5, halfWidth - 4, 0xFF_FFFFFF);
 		ScreenDrawing.drawStringWithShadow(context, rightLabel.asOrderedText(), HorizontalAlignment.CENTER, x + 2 + halfWidth, y + 5, halfWidth - 4, 0xFF_FFFFFF);

src/main/java/net/modfest/scatteredshards/client/screen/widget/WMiniShard.java

@@ -74,11 +74,12 @@ public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
 
 			ShardIconOffsets.Offset offset = this.shardType.getOffsets().getMini();
 			shard.icon().ifLeft((it) -> {
-				context.getMatrices().pushMatrix();
-				context.getMatrices().translate(x + offset.left(), y + offset.up());
-				context.getMatrices().scale(0.5f, 0.5f); // 16px -> 8px
+				context.getMatrices().push();
+				context.getMatrices().translate(x + offset.left(), y + offset.up(), 0);
+				context.getMatrices().scale(0.5f, 0.5f, 1); // 16px -> 8px
+//				RenderSystem.enableDepthTest();
 				context.drawItemWithoutEntity(it, 0, 0);
-				context.getMatrices().popMatrix();
+				context.getMatrices().pop();
 			});
 			shard.icon().ifRight((it) -> ScreenDrawing.texturedRect(context, x + offset.left(), y + offset.up(), 8, 8, it, 0xFF_FFFFFF));
 		}

src/main/java/net/modfest/scatteredshards/client/screen/widget/WShardPanel.java

@@ -36,7 +36,7 @@
 
 public class WShardPanel extends WPlainPanel {
 
-	public static final IntSupplier WHITE = () -> 0xFF_FFFFFF;
+	public static final IntSupplier WHITE = () -> 0xFFFFFF;
 	public static final Style HINT_STYLE = Style.EMPTY.withFont(Identifier.of("minecraft:alt"));
 
 	private Shard shard = Shard.MISSING_SHARD.copy();
@@ -229,7 +229,7 @@ public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
 	public void addPainters() {
 		ShardDisplaySettings displaySettings = ScatteredShardsAPI.getClientLibrary().shardDisplaySettings();
 		this.setBackgroundPainter((context, left, top, panel) -> {
-			//context.setShaderColor(1, 1, 1, 1);
+//			context.setShaderColor(1, 1, 1, 1);
 			ScreenDrawing.drawGuiPanel(context, left, top, panel.getWidth(), panel.getHeight());
 			ScreenDrawing.drawBeveledPanel(context, left + 4, top + 4, panel.getWidth() - 8, panel.getHeight() - 8);
 			context.fillGradient(

src/main/java/net/modfest/scatteredshards/client/screen/widget/scalable/WScalableWidget.java

@@ -12,13 +12,13 @@ public abstract class WScalableWidget extends WWidget {
 	@Environment(EnvType.CLIENT)
 	@Override
 	public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
-		context.getMatrices().pushMatrix();
+		context.getMatrices().push();
 
-		context.getMatrices().translate(x, y);
-		context.getMatrices().scale(scale, scale);
+		context.getMatrices().translate(x, y, 0);
+		context.getMatrices().scale(scale, scale, 1.0f);
 
 		paintScaled(context, (int) (this.getWidth() / scale), (int) (this.getHeight() / scale), (int) (mouseX / scale), (int) (mouseY / scale));
-		context.getMatrices().popMatrix();
+		context.getMatrices().pop();
 	}
 
 	/**

src/main/java/net/modfest/scatteredshards/client/screen/widget/scalable/WScaledLabel.java

@@ -7,6 +7,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.tooltip.HoveredTooltipPositioner;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Util;
@@ -87,16 +88,17 @@ public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
 		//Paint background here because it's one pixel more accurate; results are validated for scaled painting already.
 		if (backgroundColor != 0) ScreenDrawing.coloredRect(context, x, y, getWidth(), getHeight(), backgroundColor);
 
-		context.enableScissor(x, y, x + width, y + height);
+		// both of these behave spuriously in 1.21.5 and it looks "normal" besides this
+//		context.enableScissor(x, y, width, height);
+//		Scissors.push(x, y, width, height);
 		super.paint(context, x, y, mouseX, mouseY);
-		context.disableScissor();
+//		Scissors.pop();
+//		context.disableScissor();
 
 		if (mouseX >= 0 && mouseX < width && mouseY >= 0 && mouseY < height) {
 			List<OrderedText> tooltip = hover.get();
 			if (!tooltip.isEmpty()) {
-
-				context.drawTooltip(tooltip, x + mouseX, y + mouseY);
-
+				context.drawTooltip(MinecraftClient.getInstance().textRenderer, tooltip, HoveredTooltipPositioner.INSTANCE, x + mouseX, y + mouseY);
 			}
 		}
 	}
@@ -129,7 +131,8 @@ public static void drawScrollableString(DrawContext context, OrderedText text, H
 			xofs = (int) MathHelper.lerp(t, 0.0, scrollWidth);
 		}
 
-		//context.setShaderColor(1, 1, 1, 1);
+
+//		context.setShaderColor(1, 1, 1, 1);
 		if (shadow) {
 			ScreenDrawing.drawStringWithShadow(context, text, alignment, x - xofs, y, width, color);
 		} else {

src/main/java/net/modfest/scatteredshards/client/screen/widget/scalable/WScaledText.java

@@ -92,7 +92,7 @@ public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
 		if (mouseX >= 0 && mouseX < width && mouseY >= 0 && mouseY < height) {
 			List<OrderedText> tooltip = hover.get();
 			if (!tooltip.isEmpty()) {
-				context.drawTooltip(tooltip, x + mouseX, y + mouseY);
+				context.drawTooltip(MinecraftClient.getInstance().textRenderer, tooltip, HoveredTooltipPositioner.INSTANCE, x + mouseX, y + mouseY);
 			}
 		}
 	}