Update to 1.21.11

Author: Alexander01998

gradle.properties

@@ -8,35 +8,35 @@ 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.10
-yarn_mappings=1.21.10+build.3
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.4
 loader_version=0.18.4
 loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.138.4+1.21.10
+fabric_api_version=0.140.2+1.21.11
 
 # Mod Properties
-mod_version=1.4.1-MC1.21.10-Fabric
+mod_version=1.4.1-MC1.21.11-Fabric
 maven_group=net.wimods.chestesp
 archives_base_name=ChestESP
 mod_loader=Fabric
 
 # CurseForge
 cf_project_id=870203
-cf_game_version=1.21.10
+cf_game_version=1.21.11
 
 # GitHub
 gh_repo_id=Wurst-Imperium/ChestESP
 mcx_repo_id=Wurst-Imperium-MCX/ChestESP
 
 # Dependencies
-# check at https://modrinth.com/mod/modmenu/versions?g=1.21.10
-modmenu_version=16.0.0-rc.2
-# check at https://modrinth.com/mod/cloth-config/versions?l=fabric&g=1.21.10
-cloth_config_version=20.0.149
-# check at https://modrinth.com/mod/lootr/versions?l=fabric&g=1.21.10
-lootr_version=tBqlJU85
-# ^ that's fabric-1.21.10-1.18.32.99
+# check at https://modrinth.com/mod/modmenu/versions?g=1.21.11
+modmenu_version=17.0.0-beta.1
+# check at https://modrinth.com/mod/cloth-config/versions?l=fabric&g=1.21.11
+cloth_config_version=21.11.153
+# check at https://modrinth.com/mod/lootr/versions?l=fabric&g=1.21.11
+lootr_version=NKsNpTwe
+# ^ that's fabric-1.21.11-1.19.33.100
 # turn off if Lootr is not yet available for the current Minecraft version
 do_mod_compat_test=true

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

@@ -26,7 +26,7 @@
 import net.fabricmc.fabric.api.client.gametest.v1.world.TestWorldBuilder;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
-import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.gamerules.GameRules;
 import net.wimods.chestesp.ChestEspConfig;
 import net.wimods.chestesp.ChestEspMod;
 
@@ -84,8 +84,8 @@ public void runTest(ClientGameTestContext context)
 			String mcVersion = SharedConstants.getCurrentVersion().name();
 			creator.setName("E2E Test " + mcVersion);
 			creator.setGameMode(WorldCreationUiState.SelectedGameMode.CREATIVE);
-			creator.getGameRules().getRule(GameRules.RULE_SENDCOMMANDFEEDBACK)
-				.set(false, null);
+			creator.getGameRules().set(GameRules.SEND_COMMAND_FEEDBACK, false,
+				null);
 		});
 
 		try(TestSingleplayerContext spContext = worldBuilder.create())

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

@@ -21,7 +21,7 @@
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.wimods.chestesp.util.ChunkUtils;
@@ -49,8 +49,8 @@ public ChestEspMod()
 
 		groups = new ChestEspGroupManager(configHolder);
 
-		KeyMapping.Category kbCategory = KeyMapping.Category.register(
-			ResourceLocation.fromNamespaceAndPath("chestesp", "chestesp"));
+		KeyMapping.Category kbCategory = KeyMapping.Category
+			.register(Identifier.fromNamespaceAndPath("chestesp", "chestesp"));
 		toggleKey = KeyBindingHelper
 			.registerKeyBinding(new KeyMapping("key.chestesp.toggle",
 				InputConstants.UNKNOWN.getValue(), kbCategory));

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

@@ -13,8 +13,9 @@
 import com.mojang.blaze3d.platform.DepthTestFunction;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormat.Mode;
+
 import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 public enum ChestEspPipelines
 {
@@ -26,11 +27,11 @@ public enum ChestEspPipelines
 	public static final Snippet FOGLESS_LINES_SNIPPET = RenderPipeline
 		.builder(RenderPipelines.MATRICES_FOG_SNIPPET,
 			RenderPipelines.GLOBALS_SNIPPET)
-		.withVertexShader(ResourceLocation.parse("chestesp:core/fogless_lines"))
-		.withFragmentShader(
-			ResourceLocation.parse("chestesp:core/fogless_lines"))
+		.withVertexShader(Identifier.parse("chestesp:core/fogless_lines"))
+		.withFragmentShader(Identifier.parse("chestesp:core/fogless_lines"))
 		.withBlend(BlendFunction.TRANSLUCENT).withCull(false)
-		.withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL, Mode.LINES)
+		.withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL_LINE_WIDTH,
+			Mode.LINES)
 		.buildSnippet();
 
 	/**
@@ -39,45 +40,23 @@ public enum ChestEspPipelines
 	public static final RenderPipeline DEPTH_TEST_LINES =
 		RenderPipelines.register(RenderPipeline.builder(FOGLESS_LINES_SNIPPET)
 			.withLocation(
-				ResourceLocation.parse("chestesp:pipeline/depth_test_lines"))
+				Identifier.parse("chestesp:pipeline/depth_test_lines"))
 			.build());
 
 	/**
 	 * Similar to the LINES ShaderPipeline, but with no depth test or fog.
 	 */
 	public static final RenderPipeline ESP_LINES =
 		RenderPipelines.register(RenderPipeline.builder(FOGLESS_LINES_SNIPPET)
-			.withLocation(ResourceLocation.parse("chestesp:pipeline/esp_lines"))
-			.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build());
-	
-	/**
-	 * Similar to the LINE_STRIP ShaderPipeline, but with no fog.
-	 */
-	public static final RenderPipeline DEPTH_TEST_LINE_STRIP =
-		RenderPipelines.register(RenderPipeline.builder(FOGLESS_LINES_SNIPPET)
-			.withLocation(ResourceLocation
-				.parse("chestesp:pipeline/depth_test_line_strip"))
-			.withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL,
-				Mode.LINE_STRIP)
-			.build());
-	
-	/**
-	 * Similar to the LINE_STRIP ShaderPipeline, but with no depth test or fog.
-	 */
-	public static final RenderPipeline ESP_LINE_STRIP =
-		RenderPipelines.register(RenderPipeline.builder(FOGLESS_LINES_SNIPPET)
-			.withLocation(
-				ResourceLocation.parse("chestesp:pipeline/esp_line_strip"))
-			.withVertexFormat(DefaultVertexFormat.POSITION_COLOR_NORMAL,
-				Mode.LINE_STRIP)
+			.withLocation(Identifier.parse("chestesp:pipeline/esp_lines"))
 			.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build());
 
 	/**
 	 * Similar to the DEBUG_QUADS ShaderPipeline, but with culling enabled.
 	 */
 	public static final RenderPipeline QUADS = RenderPipelines
 		.register(RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
-			.withLocation(ResourceLocation.parse("chestesp:pipeline/quads"))
+			.withLocation(Identifier.parse("chestesp:pipeline/quads"))
 			.withDepthTestFunction(DepthTestFunction.LEQUAL_DEPTH_TEST)
 			.build());
 
@@ -87,15 +66,6 @@ public enum ChestEspPipelines
 	 */
 	public static final RenderPipeline ESP_QUADS = RenderPipelines
 		.register(RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
-			.withLocation(ResourceLocation.parse("chestesp:pipeline/esp_quads"))
-			.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build());
-	
-	/**
-	 * Similar to the DEBUG_QUADS ShaderPipeline, but with no depth test.
-	 */
-	public static final RenderPipeline ESP_QUADS_NO_CULLING = RenderPipelines
-		.register(RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
-			.withLocation(ResourceLocation.parse("chestesp:pipeline/esp_quads"))
-			.withCull(false)
+			.withLocation(Identifier.parse("chestesp:pipeline/esp_quads"))
 			.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST).build());
 }

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

@@ -7,54 +7,49 @@
  */
 package net.wimods.chestesp;
 
-import java.util.OptionalDouble;
-import net.minecraft.client.renderer.RenderStateShard;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.rendertype.LayeringTransform;
+import net.minecraft.client.renderer.rendertype.OutputTarget;
+import net.minecraft.client.renderer.rendertype.RenderSetup;
+import net.minecraft.client.renderer.rendertype.RenderType;
 
 public enum ChestEspRenderLayers
 {
 	;
 
 	/**
-	 * Similar to {@link RenderType#lines()}, but with line width 2.
+	 * Similar to {@link RenderType#getLines()}, but with line width 2.
 	 */
-	public static final RenderType.CompositeRenderType LINES = RenderType
-		.create("chestesp:lines", 1536, ChestEspPipelines.DEPTH_TEST_LINES,
-			RenderType.CompositeState.builder()
-				.setLineState(
-					new RenderStateShard.LineStateShard(OptionalDouble.of(2)))
-				.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
-				.setOutputState(RenderType.ITEM_ENTITY_TARGET)
-				.createCompositeState(false));
+	public static final RenderType LINES = RenderType.create("chestesp:lines",
+		RenderSetup.builder(ChestEspPipelines.DEPTH_TEST_LINES)
+			.setLayeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+			.setOutputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+			.createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#lines()}, but with line width 2 and no
+	 * Similar to {@link RenderType#getLines()}, but with line width 2 and no
 	 * depth test.
 	 */
-	public static final RenderType.CompositeRenderType ESP_LINES = RenderType
-		.create("chestesp:esp_lines", 1536, ChestEspPipelines.ESP_LINES,
-			RenderType.CompositeState.builder()
-				.setLineState(
-					new RenderStateShard.LineStateShard(OptionalDouble.of(2)))
-				.setLayeringState(RenderType.VIEW_OFFSET_Z_LAYERING)
-				.setOutputState(RenderType.ITEM_ENTITY_TARGET)
-				.createCompositeState(false));
+	public static final RenderType ESP_LINES =
+		RenderType.create("chestesp:esp_lines",
+			RenderSetup.builder(ChestEspPipelines.ESP_LINES)
+				.setLayeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+				.setOutputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+				.createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#debugQuads()}, but with culling enabled.
+	 * Similar to {@link RenderType#getDebugQuads()}, but with culling enabled.
 	 */
-	public static final RenderType.CompositeRenderType QUADS = RenderType
-		.create("chestesp:quads", 1536, false, true, ChestEspPipelines.QUADS,
-			RenderType.CompositeState.builder().createCompositeState(false));
+	public static final RenderType QUADS = RenderType.create("chestesp:quads",
+		RenderSetup.builder(ChestEspPipelines.QUADS).sortOnUpload()
+			.createRenderSetup());
 
 	/**
-	 * Similar to {@link RenderType#debugQuads()}, but with culling enabled
+	 * Similar to {@link RenderType#getDebugQuads()}, but with culling enabled
 	 * and no depth test.
 	 */
-	public static final RenderType.CompositeRenderType ESP_QUADS =
-		RenderType.create("chestesp:esp_quads", 1536, false, true,
-			ChestEspPipelines.ESP_QUADS,
-			RenderType.CompositeState.builder().createCompositeState(false));
+	public static final RenderType ESP_QUADS = RenderType.create(
+		"chestesp:esp_quads", RenderSetup.builder(ChestEspPipelines.ESP_QUADS)
+			.sortOnUpload().createRenderSetup());
 
 	/**
 	 * Returns either {@link #QUADS} or {@link #ESP_QUADS} depending on the

src/main/java/net/wimods/chestesp/groups/ChestBoatsGroup.java

@@ -9,7 +9,7 @@
 
 import me.shedaniel.autoconfig.ConfigHolder;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.vehicle.AbstractChestBoat;
+import net.minecraft.world.entity.vehicle.boat.AbstractChestBoat;
 import net.wimods.chestesp.ChestEspConfig;
 import net.wimods.chestesp.ChestEspEntityGroup;
 

src/main/java/net/wimods/chestesp/groups/ChestCartsGroup.java

@@ -9,7 +9,7 @@
 
 import me.shedaniel.autoconfig.ConfigHolder;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.vehicle.MinecartChest;
+import net.minecraft.world.entity.vehicle.minecart.MinecartChest;
 import net.wimods.chestesp.ChestEspConfig;
 import net.wimods.chestesp.ChestEspEntityGroup;
 

src/main/java/net/wimods/chestesp/groups/HopperCartsGroup.java

@@ -9,7 +9,7 @@
 
 import me.shedaniel.autoconfig.ConfigHolder;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.vehicle.MinecartHopper;
+import net.minecraft.world.entity.vehicle.minecart.MinecartHopper;
 import net.wimods.chestesp.ChestEspConfig;
 import net.wimods.chestesp.ChestEspEntityGroup;