Update to 1.21.3, fix tests

Author: embeddedt

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java renamed to common/src/main/java/org/embeddedt/modernfix/common/mixin/core/ClientPlayNetHandlerMixin.java

@@ -1,7 +1,7 @@
-package org.embeddedt.modernfix.fabric.mixin.core;
+package org.embeddedt.modernfix.common.mixin.core;
 
 import net.minecraft.client.multiplayer.ClientPacketListener;
-import org.embeddedt.modernfix.ModernFixClientFabric;
+import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -13,6 +13,6 @@
 public class ClientPlayNetHandlerMixin {
     @Inject(method = "handleUpdateRecipes", at = @At("RETURN"))
     private void signalRecipes(CallbackInfo ci) {
-        ModernFixClientFabric.commonMod.onRecipesUpdated();
+        ModernFixClient.INSTANCE.onRecipesUpdated();
     }
 }

fabric/src/test/java/net/minecraft/world/level/block/state/BlockStateCacheTest.java

@@ -19,7 +19,7 @@ public void testCacheReturnsNullForNullGetter() {
 
     @Test
     public void testCacheFunctions() {
-        BakedModel model = new BuiltInModel(null, null, null, false);
+        BakedModel model = new BuiltInModel(null, null, false);
         DynamicModelCache<Item> cache = new DynamicModelCache(k -> model, true);
         assertEquals(model, cache.get(Items.STONE));
     }

fabric/src/test/java/org/embeddedt/modernfix/dynamicresources/DynamicModelCacheTest.java

@@ -5,9 +5,9 @@ junit_version=5.10.0-M1
 mixinextras_version=0.3.2
 
 mod_id=modernfix
-minecraft_version=1.21.2-rc1
-enabled_platforms=fabric
-forge_version=21.1.15
+minecraft_version=1.21.3
+enabled_platforms=fabric,neoforge
+forge_version=21.3.1-beta
 parchment_version=2024.07.07
 parchment_mc_version=1.21
 refined_storage_version=4392788
@@ -18,8 +18,8 @@ kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
 supported_minecraft_versions=1.21.1
 
-fabric_loader_version=0.16.6
-fabric_api_version=0.106.0+1.21.2
+fabric_loader_version=0.16.7
+fabric_api_version=0.106.1+1.21.3
 
 continuity_version=3.0.0-beta.4+1.20.2
 

gradle.properties

@@ -8,7 +8,7 @@
 import com.google.common.graph.MutableGraph;
 import net.minecraft.client.renderer.block.BlockModelShaper;
 import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelBakery;
+import net.minecraft.client.resources.model.MissingBlockModel;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
@@ -125,7 +125,7 @@ public Map<ModelResourceLocation, BakedModel> wrapRegistry(String modId) {
         if(modIdsToInclude.stream().noneMatch(INCOMPATIBLE_MODS::contains))
             return createWarningRegistry(modId);
         Set<ModelResourceLocation> ourModelLocations = Sets.filter(this.topLevelModelLocations, loc -> modIdsToInclude.contains(loc.id().getNamespace()));
-        BakedModel missingModel = modelRegistry.get(ModelBakery.MISSING_MODEL_VARIANT);
+        BakedModel missingModel = modelRegistry.get(MissingBlockModel.VARIANT);
         return new ForwardingMap<ModelResourceLocation, BakedModel>() {
             @Override
             protected Map<ModelResourceLocation, BakedModel> delegate() {

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java

@@ -13,7 +13,6 @@
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
-import net.neoforged.neoforge.client.event.RecipesUpdatedEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.RenderFrameEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
@@ -87,7 +86,7 @@ public void onRenderOverlay(CustomizeGuiOverlayEvent.DebugText event) {
     public void onDisconnect(LevelEvent.Unload event) {
         if(event.getLevel().isClientSide()) {
             DebugScreenOverlay overlay = Minecraft.getInstance().getDebugOverlay();
-            Minecraft.getInstance().tell(overlay::clearChunkCache);
+            Minecraft.getInstance().execute(overlay::clearChunkCache);
         }
     }
 
@@ -101,11 +100,6 @@ public void onRenderTickEnd(RenderFrameEvent.Post event) {
         commonMod.onRenderTickEnd();
     }
 
-    @SubscribeEvent(priority = EventPriority.LOWEST)
-    public void onRecipes(RecipesUpdatedEvent e) {
-        commonMod.onRecipesUpdated();
-    }
-
     @SubscribeEvent(priority = EventPriority.LOWEST)
     public void onTags(TagsUpdatedEvent e) {
         commonMod.onTagsUpdated();

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java

@@ -13,7 +13,7 @@
 @Mixin(LivingEntityRenderer.class)
 @ClientOnlyMixin
 public class LivingEntityRendererMixin {
-    @Redirect(method = "render(Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "INVOKE", target = "Lnet/neoforged/bus/api/IEventBus;post(Lnet/neoforged/bus/api/Event;)Lnet/neoforged/bus/api/Event;", ordinal = 0))
+    @Redirect(method = "render(Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "INVOKE", target = "Lnet/neoforged/bus/api/IEventBus;post(Lnet/neoforged/bus/api/Event;)Lnet/neoforged/bus/api/Event;", ordinal = 0))
     private Event fireCheckingPoseStack(IEventBus instance, Event event) {
         PoseStack stack = ((RenderLivingEvent)event).getPoseStack();
         int size = ((PoseStackAccessor)stack).getPoseStack().size();

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java

@@ -13,7 +13,7 @@
 @Mixin(PlayerRenderer.class)
 @ClientOnlyMixin
 public class PlayerRendererMixin {
-    @Redirect(method = "render(Lnet/minecraft/client/player/AbstractClientPlayer;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "INVOKE", target = "Lnet/neoforged/bus/api/IEventBus;post(Lnet/neoforged/bus/api/Event;)Lnet/neoforged/bus/api/Event;", ordinal = 0))
+    @Redirect(method = "render(Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V", at = @At(value = "INVOKE", target = "Lnet/neoforged/bus/api/IEventBus;post(Lnet/neoforged/bus/api/Event;)Lnet/neoforged/bus/api/Event;", ordinal = 0), remap = false)
     private Event fireCheckingPoseStack(IEventBus instance, Event event) {
         PoseStack stack = ((RenderPlayerEvent)event).getPoseStack();
         int size = ((PoseStackAccessor)stack).getPoseStack().size();