add render state data abstractions, drop support for 1.21.1

settings.gradle.kts

@@ -17,7 +17,7 @@ stonecutter {
 	centralScript = "build.gradle.kts"
 
 	shared {
-		versions("1.21", "1.21.3", "1.21.4", "1.21.5")
+		versions("1.21.3", "1.21.4", "1.21.5")
 		vcsVersion = "1.21.4"
 	}
 	create(rootProject)

src/main/java/me/nobaboy/nobaaddons/ducks/EntityStateCaptureDuck.java → src/main/java/me/nobaboy/nobaaddons/ducks/EntityRenderStateDuck.java

@@ -3,9 +3,7 @@
 import net.minecraft.entity.Entity;
 import org.jetbrains.annotations.Nullable;
 
-//? if >=1.21.2 {
-public interface EntityStateCaptureDuck {
+public interface EntityRenderStateDuck {
 	@Nullable Entity nobaaddons$getEntity();
 	void nobaaddons$setEntity(@Nullable Entity entity);
 }
-//?}

src/main/java/me/nobaboy/nobaaddons/mixins/accessors/DrawContextAccessor.java

@@ -5,9 +5,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-//? if >=1.21.2 {
 @Mixin(DrawContext.class)
 public interface DrawContextAccessor {
 	@Accessor VertexConsumerProvider.Immediate getVertexConsumers();
 }
-//?}

src/main/java/me/nobaboy/nobaaddons/mixins/duckimpl/EntityStateCaptureDuckImpl.java → src/main/java/me/nobaboy/nobaaddons/mixins/duckimpl/EntityRenderStateDuckImpl.java

@@ -1,7 +1,6 @@
 package me.nobaboy.nobaaddons.mixins.duckimpl;
 
-//? if >=1.21.2 {
-import me.nobaboy.nobaaddons.ducks.EntityStateCaptureDuck;
+import me.nobaboy.nobaaddons.ducks.EntityRenderStateDuck;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.entity.Entity;
 import org.jetbrains.annotations.Nullable;
@@ -10,7 +9,7 @@
 
 @SuppressWarnings("unused")
 @Mixin(EntityRenderState.class)
-abstract class EntityStateCaptureDuckImpl implements EntityStateCaptureDuck {
+abstract class EntityRenderStateDuckImpl implements EntityRenderStateDuck {
 	private @Unique @Nullable Entity nobaaddons$entity;
 
 	@Override
@@ -23,4 +22,3 @@ abstract class EntityStateCaptureDuckImpl implements EntityStateCaptureDuck {
 		nobaaddons$entity = entity;
 	}
 }
-//?}

src/main/java/me/nobaboy/nobaaddons/mixins/events/EntityEventsMixin_EntityRenderDispatcher.java

@@ -17,21 +17,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-//? if >=1.21.2 {
-// For whatever reason, the MC Dev plugin complains about this, but only on 1.21.2+.
-// This is despite the fact that this is, in fact, a valid injector.
-@SuppressWarnings("InvalidInjectorMethodSignature")
-//?}
 @Mixin(EntityRenderDispatcher.class)
 abstract class EntityEventsMixin_EntityRenderDispatcher {
 	@Inject(
 		//? if >=1.21.5 {
 		/*method = "render(Lnet/minecraft/client/render/entity/state/EntityRenderState;DDDLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V",
-		*///?} else if >=1.21.2 {
+		*///?} else {
 		method = "render(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V",
-		//?} else {
-		/*method = "render",
-		*///?}
+		//?}
 		at = @At("HEAD"),
 		cancellable = true
 	)
@@ -42,17 +35,12 @@ abstract class EntityEventsMixin_EntityRenderDispatcher {
 		Entity entity,
 		//?}
 		double x, double y, double z,
-		//? if <1.21.2 {
-		/*float yaw,
-		*///?}
 		//? if <1.21.5 {
 		float tickDelta,
 		//?}
 		MatrixStack matrices,VertexConsumerProvider vertexConsumers,
 		int light,
-		//? if >=1.21.2 {
 		EntityRenderer<?, ?> renderer,
-		//?}
 		CallbackInfo ci
 	) {
 		//? if >=1.21.5 {
@@ -64,11 +52,9 @@ abstract class EntityEventsMixin_EntityRenderDispatcher {
 	@Inject(
 		//? if >=1.21.5 {
 		/*method = "render(Lnet/minecraft/client/render/entity/state/EntityRenderState;DDDLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V",
-		*///?} else if >=1.21.2 {
+		*///?} else {
 		method = "render(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V",
-		//?} else {
-		/*method = "render",
-		*///?}
+		//?}
 		at = @At(
 			value = "INVOKE",
 			target = "Lnet/minecraft/client/util/math/MatrixStack;push()V"
@@ -82,17 +68,12 @@ abstract class EntityEventsMixin_EntityRenderDispatcher {
 		Entity entity,
 		//?}
 		double x, double y, double z,
-		//? if <1.21.2 {
-		/*float yaw,
-		*///?}
 		//? if <1.21.5 {
 		float tickDelta,
 		//?}
 		MatrixStack matrices,VertexConsumerProvider vertexConsumers,
 		int light,
-		//? if >=1.21.2 {
 		EntityRenderer<?, ?> renderer,
-		//?}
 		CallbackInfo ci
 	) {
 		//? if >=1.21.5 {
@@ -105,11 +86,9 @@ abstract class EntityEventsMixin_EntityRenderDispatcher {
 	@Inject(
 		//? if >=1.21.5 {
 		/*method = "render(Lnet/minecraft/client/render/entity/state/EntityRenderState;DDDLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V",
-		*///?} else if >=1.21.2 {
+		*///?} else {
 		method = "render(Lnet/minecraft/entity/Entity;DDDFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/EntityRenderer;)V",
-		//?} else {
-		/*method = "render",
-		*///?}
+		//?}
 		at = @At(
 			value = "INVOKE",
 			target = "Lnet/minecraft/client/util/math/MatrixStack;pop()V"
@@ -123,17 +102,12 @@ abstract class EntityEventsMixin_EntityRenderDispatcher {
 		Entity entity,
 		//?}
 		double x, double y, double z,
-		//? if <1.21.2 {
-		/*float yaw,
-		*///?}
 		//? if <1.21.5 {
 		float tickDelta,
 		//?}
 		MatrixStack matrices,VertexConsumerProvider vertexConsumers,
 		int light,
-		//? if >=1.21.2 {
 		EntityRenderer<?, ?> renderer,
-		//?}
 		CallbackInfo ci
 	) {
 		//? if >=1.21.5 {

src/main/java/me/nobaboy/nobaaddons/mixins/events/NametagRenderEventsMixin_ArmorStandEntityRenderer.java

@@ -11,11 +11,7 @@
 @Mixin(ArmorStandEntityRenderer.class)
 abstract class NametagRenderEventsMixin_ArmorStandEntityRenderer {
 	@ModifyReturnValue(
-		//? if >=1.21.2 {
 		method = "hasLabel(Lnet/minecraft/entity/decoration/ArmorStandEntity;D)Z",
-		//?} else {
-		/*method = "hasLabel(Lnet/minecraft/entity/decoration/ArmorStandEntity;)Z",
-		*///?}
 		at = @At("RETURN")
 	)
 	public boolean nobaaddons$modifyNametagVisibility(boolean original, @Local(argsOnly = true) ArmorStandEntity entity) {

src/main/java/me/nobaboy/nobaaddons/mixins/events/NametagRenderEventsMixin_EntityRenderer.java

@@ -1,10 +1,7 @@
 package me.nobaboy.nobaaddons.mixins.events;
 
-//? if >=1.21.2 {
-import me.nobaboy.nobaaddons.ducks.EntityStateCaptureDuck;
+import me.nobaboy.nobaaddons.ducks.EntityRenderStateDuck;
 import net.minecraft.client.render.entity.state.EntityRenderState;
-//?}
-
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -23,16 +20,11 @@
 abstract class NametagRenderEventsMixin_EntityRenderer {
 	@Shadow
 	protected abstract void renderLabelIfPresent(
-		//? if >=1.21.2 {
 		EntityRenderState state,
-		//?} else {
-		/*Entity entity,
-		*///?}
 		Text text,
 		MatrixStack matrices,
 		VertexConsumerProvider vertexConsumers,
 		int light
-		/*? if <1.21.2 {*//*, float tickDelta*//*?}*/
 	);
 
 	@ModifyReturnValue(method = "hasLabel", at = @At("RETURN"))
@@ -42,46 +34,28 @@ protected abstract void renderLabelIfPresent(
 		return event.getShouldRender();
 	}
 
-	//? if >=1.21.2 {
-	// For whatever reason, the MC Dev plugin complains about this, but only on 1.21.2+.
-	// This is despite the fact that this is, in fact, a valid injector.
-	@SuppressWarnings("InvalidInjectorMethodSignature")
-	//?}
 	@WrapOperation(
 		method = "render",
 		at = @At(
 			value = "INVOKE",
-			//? if >=1.21.2 {
 			target = "Lnet/minecraft/client/render/entity/EntityRenderer;renderLabelIfPresent(Lnet/minecraft/client/render/entity/state/EntityRenderState;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V"
-			//?} else {
-			/*target = "Lnet/minecraft/client/render/entity/EntityRenderer;renderLabelIfPresent(Lnet/minecraft/entity/Entity;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IF)V"
-			*///?}
 		)
 	)
 	public void nobaaddons$nametagRender(
-		//? if >=1.21.2 {
 		EntityRenderer<?, ?> instance,
 		EntityRenderState state,
-		//?} else {
-		/*EntityRenderer<?> instance,
-		Entity entity,
-		*///?}
 		Text text,
 		MatrixStack matrices,
 		VertexConsumerProvider vertexConsumers,
 		int light,
-		//? if <1.21.2 {
-		/*float tickDelta,
-		*///?}
 		Operation<Void> original
 	) {
-		//? if >=1.21.2 {
-		Entity entity = ((EntityStateCaptureDuck) state).nobaaddons$getEntity();
+		// TODO remove this entity capture logic
+		Entity entity = ((EntityRenderStateDuck) state).nobaaddons$getEntity();
 		if(entity == null) {
 			original.call(instance, state, text, matrices, vertexConsumers, light);
 			return;
 		}
-		//?}
 
 		var event = new EntityNametagRenderEvents.Nametag(entity);
 		EntityNametagRenderEvents.EVENT.dispatch(event);
@@ -90,28 +64,13 @@ protected abstract void renderLabelIfPresent(
 			var ntext = event.getTags().get(i);
 			// TODO this causes the scoreboard objective in the below name slot to render multiple times on players;
 			//      we don't presently use this on players however, so this isn't an issue I'm too worried about right now.
-			renderLabelIfPresent(
-				/*? if >=1.21.2 {*/state/*?} else {*//*entity*//*?}*/,
-				ntext,
-				matrices,
-				vertexConsumers,
-				light
-				/*? if <1.21.2 {*//*, tickDelta*//*?}*/
-			);
+			renderLabelIfPresent(state, ntext, matrices, vertexConsumers, light);
 			if(i < event.getTags().size() - 1 || event.getRenderEntityName()) {
 				matrices.translate(0f, 9f * 1.15f * 0.025f, 0f);
 			}
 		}
 		if(event.getRenderEntityName()) {
-			original.call(
-				instance,
-				/*? if >=1.21.2 {*/state/*?} else {*//*entity*//*?}*/,
-				text == null ? entity.getDisplayName() : text,
-				matrices,
-				vertexConsumers,
-				light
-				/*? if <1.21.2 {*//*, tickDelta*//*?}*/
-			);
+			original.call(instance, state, text == null ? entity.getDisplayName() : text, matrices, vertexConsumers, light);
 		}
 		matrices.pop();
 	}

src/main/java/me/nobaboy/nobaaddons/mixins/events/ScreenRenderEventsMixin_HandledScreen.java

@@ -21,11 +21,7 @@ protected ScreenRenderEventsMixin_HandledScreen(Text title) {
 		method = "drawSlot",
 		at = @At(
 			value = "INVOKE",
-			//? if >=1.21.2 {
 			target = "Lnet/minecraft/client/gui/DrawContext;drawStackOverlay(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"
-			//?} else {
-			/*target = "Lnet/minecraft/client/gui/DrawContext;drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"
-			*///?}
 		)
 	)
 	public void nobaaddons$onDrawSlot(DrawContext context, Slot slot, CallbackInfo ci) {

src/main/java/me/nobaboy/nobaaddons/mixins/events/ScreenRenderEventsMixin_InGameHud.java

@@ -22,11 +22,7 @@ abstract class ScreenRenderEventsMixin_InGameHud {
 		method = "renderHotbarItem",
 		at = @At(
 			value = "INVOKE",
-			//? if >=1.21.2 {
 			target = "Lnet/minecraft/client/gui/DrawContext;drawStackOverlay(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;II)V"
-			//?} else {
-			/*target = "Lnet/minecraft/client/gui/DrawContext;drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;II)V"
-			*///?}
 		)
 	)
 	public void nobaaddons$onRenderHotbarItem(DrawContext context, int x, int y, RenderTickCounter tickCounter, PlayerEntity player, ItemStack itemStack, int seed, CallbackInfo ci) {

src/main/java/me/nobaboy/nobaaddons/mixins/events/SoundEventsMixin.java

@@ -45,13 +45,7 @@ abstract class SoundEventsMixin {
 		var key = sound.getKeyOrValue();
 		var id = key.left()
 			.map(RegistryKey::getValue)
-			.orElseGet(() -> key.right()
-				//? if >=1.21.2 {
-				.map(SoundEvent::id)
-				//?} else {
-				/*.map(SoundEvent::getId)
-				*///?}
-				.orElseThrow());
+			.orElseGet(() -> key.right().map(SoundEvent::id).orElseThrow());
 
 		var location = new NobaVec(x, y, z);
 

src/main/java/me/nobaboy/nobaaddons/mixins/render/EntityRendererMixin.java

@@ -1,7 +1,6 @@
 package me.nobaboy.nobaaddons.mixins.render;
 
-//? if >=1.21.2 {
-import me.nobaboy.nobaaddons.ducks.EntityStateCaptureDuck;
+import me.nobaboy.nobaaddons.ducks.EntityRenderStateDuck;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.entity.Entity;
@@ -14,8 +13,7 @@
 abstract class EntityRendererMixin {
 	@Inject(method = "updateRenderState", at = @At("TAIL"))
 	public void nobaaddons$captureEntity(Entity entity, EntityRenderState state, float tickDelta, CallbackInfo ci) {
-		var duck = (EntityStateCaptureDuck) state;
+		var duck = (EntityRenderStateDuck) state;
 		duck.nobaaddons$setEntity(entity);
 	}
 }
-//?}

src/main/java/me/nobaboy/nobaaddons/mixins/render/InGameHudMixin.java

@@ -1,9 +1,5 @@
 package me.nobaboy.nobaaddons.mixins.render;
 
-//? if <1.21.2 {
-/*import org.spongepowered.asm.mixin.injection.Slice;
-*///?}
-
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import me.nobaboy.nobaaddons.api.skyblock.SkyBlockAPI;
 import me.nobaboy.nobaaddons.config.NobaConfig;
@@ -19,19 +15,8 @@
 
 @Mixin(InGameHud.class)
 abstract class InGameHudMixin {
-	//? if >=1.21.2 {
 	@WrapWithCondition(method = "renderAirBubbles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIII)V"))
 	public boolean nobaaddons$hideAirBubbles(DrawContext instance, Function<Identifier, RenderLayer> renderLayers, Identifier sprite, int x, int y, int width, int height) {
-	//?} else {
-	/*@WrapWithCondition(
-		method = "renderStatusBars",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"),
-		slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSubmergedIn(Lnet/minecraft/registry/tag/TagKey;)Z")),
-		require = 2,
-		allow = 2
-	)
-	public boolean nobaaddons$hideAirBubbles(DrawContext instance, Identifier texture, int x, int y, int width, int height) {
-	*///?}
 		if(SkyBlockAPI.inSkyBlock()) {
 			return !NobaConfig.INSTANCE.getUiAndVisuals().getRenderingTweaks().getHideAirBubbles();
 		}

src/main/java/me/nobaboy/nobaaddons/mixins/render/ItemStackMixin.java

@@ -1,9 +1,5 @@
 package me.nobaboy.nobaaddons.mixins.render;
 
-//? if <1.21.2 {
-/*import net.minecraft.item.ArmorItem;
-*///?}
-
 //? if <1.21.5 {
 import org.spongepowered.asm.mixin.injection.Slice;
 //?} else {
@@ -30,7 +26,7 @@ abstract class ItemStackMixin {
 	@ModifyReturnValue(method = "hasGlint", at = @At("RETURN"))
 	public boolean nobaaddons$modifyGlint(boolean original) {
 		var item = (ItemStack) (Object) this;
-		boolean isArmor = /*? if >=1.21.2 {*/item.get(DataComponentTypes.EQUIPPABLE) != null/*?} else {*//*item.getItem() instanceof ArmorItem*//*?}*/;
+		boolean isArmor = item.get(DataComponentTypes.EQUIPPABLE) != null;
 		if(!isArmor) return original;
 
 		return ItemUtils.shouldArmorHaveEnchantGlint(item, original);