Release v3.12.2+fabric-1.20.X

Backports to 1.20.X. Needs testing.

tcdcommons-3-fabric-1.20.1/gradle.properties

@@ -48,7 +48,7 @@ org.gradle.jvmargs=-Xmx1G
 	mod_icon = assets/tcdcommons/icon.png
 
 	# This is the name of the Minecraft version your mod depends on:
-	mod_depends_minecraft = 1.20.2
+	mod_depends_minecraft = 1.20.1
 
 	# This is the resource pack format number of your mod's resource pack:
 	# ( More info at https://minecraft.wiki/w/Pack_format )

tcdcommons-3-fabric-1.20.1/src/main/java/io/github/thecsdev/tcdcommons/api/client/gui/other/TEntityRendererElement.java

@@ -26,7 +26,7 @@
 	protected boolean entityErrorState; //when true, entity won't render, and its name will render instead
 
 	/** The cached center XY coordinates for rendering the {@link #entity}. <b>tY</b> is for text. */
-	protected int entityTextX, entityTextY;
+	protected int entityCenterX, entityCenterY, entityTextY;
 	/** The cached calculated size at which the entity will render. */
 	protected int entityDisplaySize;
 	// --------------------------------------------------
@@ -106,12 +106,13 @@ protected final void recalcCache_mobSize()
 	}
 
 	/**
-	 * Recalculates the values of {@link #entityTextX} and {@link #entityTextY}.
+	 * Recalculates the values of {@link #entityCenterX} and {@link #entityCenterY}.
 	 */
 	protected final void recalcCache_cXY()
 	{
 		//calculate center XY
-		this.entityTextX = (this.x + (this.width / 2));
+		this.entityCenterX = (this.x + (this.width / 2));
+		this.entityCenterY = (getEndY() - (this.height / 4));
 		//calculate text Y for the entity name text
 		if(this.entityTypeName != null)
 		{
@@ -121,7 +122,7 @@ protected final void recalcCache_cXY()
 				(fh / 2) -
 				(this.entityTypeName.count() * fh);
 		}
-		else this.entityTextY = (getEndY() - (this.height / 4));
+		else this.entityTextY = this.entityCenterY;
 	}
 	// ==================================================
 	public @Virtual @Override void render(TDrawContext pencil)
@@ -132,7 +133,7 @@ protected final void recalcCache_cXY()
 		if(this.entityErrorState || this.entity == null)
 		{
 			if(this.entityTypeName != null)
-				this.entityTypeName.drawCenterWithShadow(pencil, this.entityTextX, this.entityTextY);
+				this.entityTypeName.drawCenterWithShadow(pencil, this.entityCenterX, this.entityTextY);
 			else pencil.drawTFill(TDrawContext.DEFAULT_ERROR_COLOR);
 			return;
 		}
@@ -142,7 +143,7 @@ protected final void recalcCache_cXY()
 		{
 			pencil.drawTEntity(
 					this.entity,
-					this.x, this.y, this.width, this.height,
+					this.entityCenterX, this.entityCenterY,
 					this.entityDisplaySize,
 					this.followsCursor);
 		}

tcdcommons-3-fabric-1.20.1/src/main/java/io/github/thecsdev/tcdcommons/api/client/gui/screen/TScreen.java

@@ -143,7 +143,7 @@ public final boolean setFocusedElement(TElement child, boolean askToFocus)
 	public @Virtual void renderBackground(TDrawContext pencil)
 	{
 		if(this.client.world == null)
-			this.__wrapper.Screen_super_renderBackground(pencil, pencil.mouseX, pencil.mouseY, pencil.deltaTime);
+			this.__wrapper.Screen_super_renderBackground(pencil);
 	}
 	// --------------------------------------------------
 	/**

tcdcommons-3-fabric-1.20.1/src/main/java/io/github/thecsdev/tcdcommons/api/client/gui/screen/TScreenWrapper.java

@@ -123,8 +123,8 @@ public TScreenWrapper(T target)
 	    this.target.forEachChild(c -> c.tick(), true);
 	}
 	// --------------------------------------------------
-	public final void Screen_super_renderBackground(DrawContext context, int mouseX, int mouseY, float delta) { super.renderBackground(context, mouseX, mouseY, delta); }
-	public final @Override void renderBackground(DrawContext context, int mouseX, int mouseY, float delta)
+	public final void Screen_super_renderBackground(DrawContext context) { super.renderBackground(context); }
+	public final @Override void renderBackground(DrawContext context)
 	{
 		/* This method started causing visual bugs, and as such, has been removed.
 		 * The reason for the bugs is because `super.render` is used in `#render`
@@ -215,13 +215,13 @@ private final boolean __onTMouseCR(double mouseX, double mouseY, int button, boo
 		return input(ofMouseDrag(mouseX, mouseY, deltaX, deltaY, this.target.__draggingButton));
 	}
 	// --------------------------------------------------
-	public final @Override boolean mouseScrolled(double mouseX, double mouseY, double hAmount, double vAmount)
+	public final @Override boolean mouseScrolled(double mouseX, double mouseY, double vAmount)
 	{
 		//Screen takes priority here, as its elements are rendered on top of TElement-s
-		if(super.mouseScrolled(mouseX, mouseY, hAmount, vAmount))
+		if(super.mouseScrolled(mouseX, mouseY, vAmount))
 			return true;
 		//if the Screen doesn't handle it, forward it to TScreen
-		return input(ofMouseScroll(mouseX, mouseY, hAmount, vAmount));
+		return input(ofMouseScroll(mouseX, mouseY, 0, vAmount));
 	}
 	// --------------------------------------------------
 	/**

tcdcommons-3-fabric-1.20.1/src/main/java/io/github/thecsdev/tcdcommons/api/client/gui/util/TDrawContext.java

@@ -1,7 +1,7 @@
 package io.github.thecsdev.tcdcommons.api.client.gui.util;
 
 import static io.github.thecsdev.tcdcommons.TCDCommons.getModID;
-import static io.github.thecsdev.tcdcommons.api.client.gui.widget.TClickableWidget.BUTTON_TEXTURES;
+import static io.github.thecsdev.tcdcommons.api.client.gui.widget.TClickableWidget.BUTTON_TEXTURE_SLICE_SIZE;
 import static io.github.thecsdev.tcdcommons.client.TCDCommonsClient.MC_CLIENT;
 
 import java.awt.Color;
@@ -12,7 +12,6 @@
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;
 import org.joml.Quaternionfc;
-import org.joml.Vector3f;
 
 import com.google.common.annotations.Beta;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -21,17 +20,20 @@
 import io.github.thecsdev.tcdcommons.api.client.gui.TParentElement;
 import io.github.thecsdev.tcdcommons.api.client.gui.screen.TScreen;
 import io.github.thecsdev.tcdcommons.api.client.gui.util.ColorStack.BlendMethod;
-import io.github.thecsdev.tcdcommons.api.client.gui.widget.TCheckboxWidget;
+import io.github.thecsdev.tcdcommons.api.client.gui.widget.TClickableWidget;
 import io.github.thecsdev.tcdcommons.api.util.enumerations.HorizontalAlignment;
 import io.github.thecsdev.tcdcommons.client.TCDCommonsClient;
 import io.github.thecsdev.tcdcommons.client.mixin.hooks.AccessorDrawContext;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.DiffuseLighting;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.text.Text;
@@ -46,7 +48,7 @@ public final class TDrawContext extends DrawContext
 	// ==================================================
 	private static final EntityRenderDispatcher ERD = TCDCommonsClient.MC_CLIENT.getEntityRenderDispatcher();
 	//private static final EntityModelLoader ERD_EML = getModelLoader(ERD);
-	//private static final Camera ERD_CAMERA = new Camera();
+	private static final Camera ERD_CAMERA = new Camera();
 	// ==================================================
 	public static final @Beta int DEFAULT_TEXT_SIDE_OFFSET = 5;
 	public static final @Beta int DEFAULT_TEXT_COLOR = 16777215;
@@ -429,117 +431,117 @@ public final void drawTRepeatingTexture(
 	// --------------------------------------------------
 	/**
 	 * Draws a GUI button on top of the {@link #currentTarget}.
+	 * @param yImage See {@link TClickableWidget#getButtonTextureY(boolean, boolean)}
+	 * @see TClickableWidget#getButtonTextureY(boolean, boolean)
 	 */
-	public final void drawTButton(boolean enabled, boolean focused)
+	public final void drawTButton(int yImage)
 	{
-		final var curr = this.currentTarget;
-		drawGuiTexture(BUTTON_TEXTURES.get(enabled, focused),
-				curr.getX(), curr.getY(),
-				curr.getWidth(), curr.getHeight());
-	}
-
-	public final void drawTCheckbox(int x, int y, boolean highlighted, boolean checked) { drawTCheckbox(x, y, 20, 20, highlighted, checked); }
-	public final void drawTCheckbox(int x, int y, int width, int height, boolean highlighted, boolean checked)
-	{
-		final Identifier tex = (checked) ?
-				(highlighted ? TCheckboxWidget.SELECTED_HIGHLIGHTED_TEXTURE : TCheckboxWidget.SELECTED_TEXTURE) :
-				(highlighted ? TCheckboxWidget.HIGHLIGHTED_TEXTURE : TCheckboxWidget.TEXTURE);
-		drawGuiTexture(tex, x, y, width, height);
+		drawTNineSlicedTexture(ClickableWidget.WIDGETS_TEXTURE,
+				0, yImage, 200, 20,
+				BUTTON_TEXTURE_SLICE_SIZE);
 	}
 	// ==================================================
 	@Experimental
 	public final void drawTEntity(Entity entity, int size, boolean followCursor) throws NullPointerException
 	{
 		if(entity == null) return;
 		final var c = this.currentTarget;
-		drawTEntity(entity, c.getX(), c.getY(), c.getWidth(), c.getHeight(), size, followCursor);
+		drawTEntity(entity, c.getX(), c.getY(), size, followCursor);
 	}
 
+	/**
+	 * Draws an {@link Entity} on the GUI screen.
+	 * @param entity The {@link Entity} to draw on the screen
+	 * @param x The X coordinate of the bottom of the {@link Entity}'s feet
+	 * @param y The Y coordinate of the bottom of the {@link Entity}'s feet
+	 * @param size The {@link Entity} size
+	 * @param followCursor If true, the {@link Entity} will face towards the mouse cursor
+	 * @apiNote Still in {@link Beta}. May cause issues and crashes.
+	 * @apiNote Some {@link EntityRenderer}s <b>do not support rendering</b>
+	 * their corresponding {@link Entity}s <b>while not in-game</b>.
+	 */
 	@Experimental
-	public final void drawTEntity(Entity entity, int x, int y, int width, int height, int size, boolean followCursor)
+	public final void drawTEntity(Entity entity, int x, int y, int size, boolean followCursor)
 	{
 		//null check
 		if(entity == null) return;
 
-		//prepare to render
-		final float f = 0.0625F;
-		final int mouseX = followCursor ? this.mouseX : x + (width / 2) + 100;
-		final int mouseY = followCursor ? this.mouseY : y + (height / 2) + 50;
+		//prepare to handle living entities as well
+		int mouseX = followCursor ? this.mouseX + (size/2) : x + 100;
+		int mouseY = followCursor ? this.mouseY + (size/2) : y + 50;
 		final @Nullable LivingEntity livingEntity = (entity instanceof LivingEntity) ? (LivingEntity)entity : null;
-
-		//vanilla rendering
-		if(livingEntity != null && MC_CLIENT.world != null) //vanilla rendering depends on client-world
+		if(livingEntity != null && MC_CLIENT.world != null /*client world is required for vanilla rendering*/)
 		{
-			InventoryScreen.drawEntity(
-					this,
-					x, y,
-					x + width, y + height,
-					size,
-					f, mouseX, mouseY,
-					livingEntity);
+			//use Vanilla rendering for living entities, so i don't have to keep that part up-to-date by myself
+			InventoryScreen.drawEntity(this, x, y, size, x - mouseX, y - mouseY, livingEntity);
 			return;
 		}
 
-		//rendering in a way that supports all entity types
-		float g = x + (width / 2);
-		float h = y + (height / 2);
-		enableScissor(x, y, x + width, y + height);
-		float i = (float)Math.atan(((g - mouseX) / 40.0F));
-		float j = (float)Math.atan(((h - mouseY) / 40.0F));
-		Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F);
-		Quaternionf quaternionf2 = (new Quaternionf()).rotateX(j * 20.0F * 0.017453292F);
+		//prepare the context - push stuff
+		//(position and rotate the entity appropriately)
+		float atanMouseX40 = (float)Math.atan(((mouseX - x) / 40.0F));
+		float atanMouseY40 = -(float)Math.atan(((mouseY - y) / 40.0F));
+		Quaternionf quaternionf = new Quaternionf().rotateZ(3.1415927F).rotateY(3.1415927F);
+		Quaternionf quaternionf2 = (new Quaternionf()).rotateX(atanMouseY40 * 20.0F * 0.017453292F);
 		quaternionf.mul((Quaternionfc)quaternionf2);
-		float k = 0;
-		float l = entity.getYaw();
-		float m = entity.getPitch();
-		float n = 0;
-		float o = 0;
+
+		float i = entity.getYaw(), j = entity.getPitch();
+		entity.setYaw(180.0F + atanMouseX40 * 40.0F);
+		entity.setPitch(-atanMouseY40 * 20.0F);
+		float h = 0, k = 0, l = 0;
 		if(livingEntity != null)
 		{
-			k = livingEntity.bodyYaw;
-			n = livingEntity.prevHeadYaw;
-			o = livingEntity.headYaw;
-			livingEntity.bodyYaw = 180.0F + i * 20.0F;
+			h = livingEntity.bodyYaw;
+			k = livingEntity.prevHeadYaw;
+			l = livingEntity.headYaw;
+			livingEntity.bodyYaw = 180.0F + atanMouseX40 * 20.0F;
 			livingEntity.headYaw = entity.getYaw();
 			livingEntity.prevHeadYaw = entity.getYaw();
 		}
-		entity.setYaw(180.0F + i * 40.0F);
-		entity.setPitch(-j * 20.0F);
-		Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f, 0.0F);
-		__drawEntity(g, h, size, vector3f, quaternionf, quaternionf2, entity);
-		entity.setYaw(l);
-		entity.setPitch(m);
+
+		//render
+		__drawTEntity(x, y, size, quaternionf, quaternionf2, entity);
+
+		//un-prepare the context - pop stuff
+		//(return the entity back to its initial state)
+		entity.setYaw(i);
+		entity.setPitch(j);
 		if(livingEntity != null)
 		{
-			livingEntity.bodyYaw = k;
-			livingEntity.prevHeadYaw = n;
-			livingEntity.headYaw = o;
+			livingEntity.bodyYaw = h;
+			livingEntity.prevHeadYaw = k;
+			livingEntity.headYaw = l;
 		}
-		disableScissor();
 	}
 
-	private final @Internal void __drawEntity(
-			float x, float y, int size,
-			Vector3f vector3f, Quaternionf quaternionf, @Nullable Quaternionf quaternionf2,
-			Entity entity)
+	//note: don't forget to make sure this method is up-to-date with InventoryScreen#drawEntity
+	private final @Internal void __drawTEntity
+	(int x, int y, int size, Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, Entity entity)
 	{
-		getMatrices().push();
-		getMatrices().translate(x, y, 50.0D);
-		getMatrices().multiplyPositionMatrix((new Matrix4f()).scaling(size, size, -size));
-		getMatrices().translate(vector3f.x, vector3f.y, vector3f.z);
-		getMatrices().multiply(quaternionf);
+		//push matrices
+		final var matrices = getMatrices();
+		matrices.push();
+		matrices.translate(x, y, 50);
+		matrices.multiplyPositionMatrix(new Matrix4f().scaling(size, size, size));
+		matrices.multiply(quaternionf);
 		DiffuseLighting.method_34742();
-		if (quaternionf2 != null)
+
+		//do the vanilla rendering method
+		if(quaternionf2 != null)
 		{
 			quaternionf2.conjugate();
 			ERD.setRotation(quaternionf2);
-		} 
+		}
+		if(ERD.camera == null) ERD.camera = ERD_CAMERA;
+
 		ERD.setRenderShadows(false);
-		ERD.render(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F, getMatrices(), getVertexConsumers(), 15728880);
+		ERD.render(entity, 0, 0, 0, 0, 1, getMatrices(), getVertexConsumers(), 15728880);
 		draw();
 		ERD.setRenderShadows(true);
-		getMatrices().pop();
+
+		//pop matrices
+		matrices.pop();
 		DiffuseLighting.enableGuiDepthLighting();
-	  }
+	}
 	// ==================================================
 }

tcdcommons-3-fabric-1.20.1/src/main/java/io/github/thecsdev/tcdcommons/api/client/gui/widget/TButtonWidget.java

@@ -71,7 +71,7 @@ public TButtonWidget(int x, int y, int width, int height, Text text, Consumer<TB
 	 */
 	protected @Virtual void renderBackground(TDrawContext pencil)
 	{
-		pencil.drawTButton(this.enabled, isFocusedOrHovered());
+		pencil.drawTButton(getButtonTextureY());
 		renderIcon(pencil);
 	}
 

tcdcommons-3-fabric-1.20.1/src/main/java/io/github/thecsdev/tcdcommons/api/client/gui/widget/TCheckboxWidget.java

@@ -7,18 +7,17 @@
 import io.github.thecsdev.tcdcommons.api.client.gui.util.TDrawContext;
 import io.github.thecsdev.tcdcommons.api.util.annotations.Virtual;
 import io.github.thecsdev.tcdcommons.api.util.enumerations.HorizontalAlignment;
-import io.github.thecsdev.tcdcommons.client.mixin.hooks.AccessorCheckboxWidget;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
 public @Virtual class TCheckboxWidget extends TButtonWidget
 {
 	// ==================================================
-	public static final Identifier SELECTED_HIGHLIGHTED_TEXTURE = AccessorCheckboxWidget.getSelectedHighlightedTexture();
-	public static final Identifier SELECTED_TEXTURE = AccessorCheckboxWidget.getSelectedTexture();
-	public static final Identifier HIGHLIGHTED_TEXTURE = AccessorCheckboxWidget.getHighlightedTexture();
-	public static final Identifier TEXTURE = AccessorCheckboxWidget.getTexture();
+	/**
+	 * The {@link Identifier} for the GUI checkbox texture used by Minecraft.
+	 */
+	public static final Identifier TEXTURE_CHECKBOX = new Identifier("textures/gui/checkbox.png");
 	// --------------------------------------------------
 	protected boolean checked = false;
 	protected boolean showText;
@@ -102,7 +101,13 @@ public final void setHorizontalAlignment(HorizontalAlignment forText, Horizontal
 		final var textRenderer = getTextRenderer();
 
 	    //draw the texture and the background
-		pencil.drawTCheckbox(this.x + cX, this.y + cY, 20, this.height, isFocusedOrHovered(), this.checked);
+		final boolean isFocused = (getParentTScreen().getFocusedElement() == this);
+	    pencil.drawTexture(
+	    		TEXTURE_CHECKBOX,
+	    		this.x + cX, this.y + cY, //XY
+	    		isFocused ? 20 : 0, this.checked ? 20 : 0, //UV
+	    		20, this.height, //WH
+	    		64,64); //texture WH
 
 	    //draw the text
 	    if(this.showText)