Merge branch '1.21.9'

Author: Alexander01998

gradle.properties

@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
@@ -8,34 +8,34 @@ org.gradle.warning.mode=fail
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
 loader_version=0.17.2
 loom_version=1.11-SNAPSHOT
 
 # Fabric API
-fabric_version=0.133.4+1.21.8
+fabric_version=0.134.0+1.21.9
 
 # Mod Properties
-mod_version=1.4-MC1.21.8-Fabric
+mod_version=1.4-MC1.21.9-Fabric
 maven_group=net.wimods.chestesp
 archives_base_name=ChestESP
 mod_loader=Fabric
 
 # CurseForge
 cf_project_id=870203
-cf_game_version=1.21.8
+cf_game_version=1.21.9
 
 # GitHub
 gh_repo_id=Wurst-Imperium/ChestESP
 mcx_repo_id=Wurst-Imperium-MCX/ChestESP
 
 # Dependencies
 # check at https://modrinth.com/mod/modmenu/versions
-modmenu_version=15.0.0
+modmenu_version=16.0.0-rc.1
 # check at https://modrinth.com/mod/cloth-config/versions?l=fabric
-cloth_config_version=19.0.147
+cloth_config_version=20.0.148
 # check at https://modrinth.com/mod/lootr/versions?l=fabric
 lootr_version=fabric-1.21.8-1.16.39.95
 # turn off if Lootr is not yet available for the current Minecraft version
-do_lootr_test=true
+do_lootr_test=false

gradlew

@@ -63,7 +63,7 @@ public void runTest(ClientGameTestContext context)
 				"https://i.imgur.com/Q1IyYQG.png");
 		else
 			assertScreenshotEquals(context, "mod_menu",
-				"https://i.imgur.com/PU7EsPS.png");
+				"https://i.imgur.com/EY2sFws.png");
 
 		LOGGER.info("Clicking configure button");
 		TestInput input = context.getInput();
@@ -116,7 +116,7 @@ private void testInWorld(ClientGameTestContext context,
 		world.waitForChunksRender();
 
 		assertScreenshotEquals(context, "in_game",
-			"https://i.imgur.com/E8j601u.png");
+			"https://i.imgur.com/i2Nr9is.png");
 
 		LOGGER.info("Recording debug menu");
 		input.pressKey(GLFW.GLFW_KEY_F3);
@@ -130,13 +130,13 @@ private void testInWorld(ClientGameTestContext context,
 				"https://i.imgur.com/8T8FDmg.png");
 		else
 			assertScreenshotEquals(context, "inventory",
-				"https://i.imgur.com/uaRQbyJ.png");
+				"https://i.imgur.com/GP74ZNS.png");
 		input.pressKey(GLFW.GLFW_KEY_ESCAPE);
 
 		LOGGER.info("Opening game menu");
 		input.pressKey(GLFW.GLFW_KEY_ESCAPE);
 		assertScreenshotEquals(context, "game_menu",
-			"https://i.imgur.com/7g7wN11.png");
+			"https://i.imgur.com/5mMgnXc.png");
 		input.pressKey(GLFW.GLFW_KEY_ESCAPE);
 
 		LOGGER.info("Building vanilla test rig");

src/gametest/java/net/wimods/chestesp/gametest/ChestESPTest.java

@@ -74,7 +74,7 @@ public static void build(ClientGameTestContext context,
 	public static void test(ClientGameTestContext context)
 	{
 		assertScreenshotEquals(context, "ChestESP_default_settings",
-			"https://i.imgur.com/WFzW2zj.png");
+			"https://i.imgur.com/5SS5W2T.png");
 
 		ChestESPTest.LOGGER.info("Enabling all ChestESP groups");
 		ChestESPTest.withConfig(context, config -> {
@@ -87,25 +87,25 @@ public static void test(ClientGameTestContext context)
 			config.include_furnaces = true;
 		});
 		assertScreenshotEquals(context, "ChestESP_boxes",
-			"https://i.imgur.com/2EJ9bUx.png");
+			"https://i.imgur.com/lRMaLRU.png");
 
 		ChestESPTest.LOGGER.info("Changing style to lines");
 		ChestESPTest.withConfig(context, config -> {
 			config.style = ChestEspStyle.LINES;
 		});
 		assertScreenshotEquals(context, "ChestESP_lines",
-			"https://i.imgur.com/VzVI2Vm.png");
+			"https://i.imgur.com/jhVL1Ne.png");
 
 		ChestESPTest.LOGGER.info("Changing style to lines and boxes");
 		ChestESPTest.withConfig(context, config -> {
 			config.style = ChestEspStyle.LINES_AND_BOXES;
 		});
 		assertScreenshotEquals(context, "ChestESP_lines_and_boxes",
-			"https://i.imgur.com/mc86M6S.png");
+			"https://i.imgur.com/XiFiGvh.png");
 
 		ChestESPTest.LOGGER.info("Changing all color settings");
 		ChestESPTest.setRainbowColors(context);
 		assertScreenshotEquals(context, "ChestESP_custom_colors",
-			"https://i.imgur.com/RBQEZmd.png");
+			"https://i.imgur.com/TBsz8Eq.png");
 	}
 }

src/gametest/java/net/wimods/chestesp/gametest/VanillaTestRig.java

@@ -21,6 +21,7 @@
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 import net.wimods.chestesp.util.ChunkUtils;
@@ -48,9 +49,11 @@ public ChestEspMod()
 
 		groups = new ChestEspGroupManager(configHolder);
 
+		KeyBinding.Category kbCategory =
+			KeyBinding.Category.create(Identifier.of("chestesp", "chestesp"));
 		toggleKey = KeyBindingHelper
 			.registerKeyBinding(new KeyBinding("key.chestesp.toggle",
-				InputUtil.UNKNOWN_KEY.getCode(), "ChestESP"));
+				InputUtil.UNKNOWN_KEY.getCode(), kbCategory));
 
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			boolean enabled = configHolder.get().enable;

src/main/java/net/wimods/chestesp/ChestEspMod.java

@@ -29,12 +29,12 @@ public abstract class WorldRendererMixin
 	implements SynchronousResourceReloader, AutoCloseable
 {
 	@Inject(at = @At("RETURN"),
-		method = "render(Lnet/minecraft/client/util/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V")
+		method = "render(Lnet/minecraft/client/util/ObjectAllocator;Lnet/minecraft/client/render/RenderTickCounter;ZLnet/minecraft/client/render/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/buffers/GpuBufferSlice;Lorg/joml/Vector4f;Z)V")
 	private void onRender(ObjectAllocator allocator,
 		RenderTickCounter tickCounter, boolean renderBlockOutline,
 		Camera camera, Matrix4f positionMatrix, Matrix4f projectionMatrix,
-		GpuBufferSlice gpuBufferSlice, Vector4f vector4f, boolean bl,
-		CallbackInfo ci)
+		Matrix4f matrix4f2, GpuBufferSlice gpuBufferSlice, Vector4f vector4f,
+		boolean bl, CallbackInfo ci)
 	{
 		MatrixStack matrixStack = new MatrixStack();
 		matrixStack.multiplyPositionMatrix(positionMatrix);

src/main/java/net/wimods/chestesp/mixin/WorldRendererMixin.java

@@ -31,7 +31,7 @@ public static Vec3d getLerpedPos(Entity e, float partialTicks)
 		// When an entity is removed, it stops moving and its lastRenderX/Y/Z
 		// values are no longer updated.
 		if(e.isRemoved())
-			return e.getPos();
+			return e.getEntityPos();
 
 		double x = MathHelper.lerp(partialTicks, e.lastRenderX, e.getX());
 		double y = MathHelper.lerp(partialTicks, e.lastRenderY, e.getY());
@@ -57,7 +57,7 @@ public static Box getLerpedBox(Entity e, float partialTicks)
 		if(e.isRemoved())
 			return e.getBoundingBox();
 
-		Vec3d offset = getLerpedPos(e, partialTicks).subtract(e.getPos());
+		Vec3d offset = getLerpedPos(e, partialTicks).subtract(e.getEntityPos());
 		return e.getBoundingBox().offset(offset);
 	}
 }

src/main/java/net/wimods/chestesp/util/EntityUtils.java

@@ -31,7 +31,7 @@ public enum RenderUtils
 
 	public static Vec3d getCameraPos()
 	{
-		Camera camera = MC.getBlockEntityRenderDispatcher().camera;
+		Camera camera = MC.gameRenderer.getCamera();
 		if(camera == null)
 			return Vec3d.ZERO;
 

src/main/java/net/wimods/chestesp/util/RenderUtils.java

@@ -1,4 +1,5 @@
 {
+  "key.category.chestesp.chestesp": "ChestESP",
   "key.chestesp.toggle": "Toggle ChestESP",
   "text.autoconfig.chestesp.title": "ChestESP Settings",
   "text.autoconfig.chestesp.option.enable": "Enable ChestESP",

src/main/resources/assets/chestesp/lang/en_us.json

@@ -1,4 +1,4 @@
-#version 150
+#version 330
 
 #moj_import <minecraft:dynamictransforms.glsl>