Porting the mixins away

common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java

@@ -6,7 +6,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public final class Materials {
-	private static final ResourceLocation MINECART_LOCATION = new ResourceLocation("textures/entity/minecart.png");
+	private static final ResourceLocation MINECART_LOCATION = ResourceLocation.withDefaultNamespace("textures/entity/minecart.png");
 
 	public static final Material CHUNK_SOLID_SHADED = SimpleMaterial.builder()
 			.build();

common/src/lib/java/dev/engine_room/flywheel/lib/util/ResourceUtil.java

@@ -16,7 +16,7 @@ private ResourceUtil() {
 	}
 
 	/**
-	 * Same as {@link ResourceLocation#ResourceLocation(String)}, but defaults to Flywheel namespace.
+	 * Same as {@link ResourceLocation#withDefaultNamespace(String)}, but defaults to Flywheel namespace.
 	 */
 	public static ResourceLocation parseFlywheelDefault(String location) {
 		String namespace = Flywheel.ID;
@@ -30,7 +30,7 @@ public static ResourceLocation parseFlywheelDefault(String location) {
 			}
 		}
 
-		return new ResourceLocation(namespace, path);
+		return ResourceLocation.fromNamespaceAndPath(namespace, path);
 	}
 
 	/**

common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java

@@ -44,7 +44,7 @@
  */
 public class ShadowComponent implements EntityComponent {
 	private static final Material SHADOW_MATERIAL = SimpleMaterial.builder()
-			.texture(new ResourceLocation("textures/misc/shadow.png"))
+			.texture(ResourceLocation.withDefaultNamespace("textures/misc/shadow.png"))
 			.mipmap(false)
 			.polygonOffset(true) // vanilla shadows use "view offset" but this seems to work fine
 			.transparency(Transparency.TRANSLUCENT)

common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java

@@ -2,6 +2,8 @@
 
 import java.util.SortedSet;
 
+import net.minecraft.client.DeltaTracker;
+
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 import org.objectweb.asm.Opcodes;
@@ -50,8 +52,9 @@ abstract class LevelRendererMixin {
 
 	//	@Inject(method = "renderLevel", at = @At("HEAD"))
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"))
-	private void flywheel$beginRender(float partialTick, long nanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, Matrix4f frustrumMatrix, CallbackInfo ci) {
-		flywheel$renderContext = RenderContextImpl.create((LevelRenderer) (Object) this, level, renderBuffers, new PoseStack(), projectionMatrix, camera, partialTick);
+	private void flywheel$beginRender(DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, Matrix4f frustrumMatrix, CallbackInfo ci) {
+		// fixme - is the delta stuff correct? no idea!
+		flywheel$renderContext = RenderContextImpl.create((LevelRenderer) (Object) this, level, renderBuffers, new PoseStack(), projectionMatrix, camera, deltaTracker.getGameTimeDeltaTicks());
 
 		FlwImplXplat.INSTANCE.dispatchBeginFrameEvent(flywheel$renderContext);
 	}
@@ -102,17 +105,18 @@ abstract class LevelRendererMixin {
 		flywheel$dispatch(RenderStage.AFTER_TRANSLUCENT_TERRAIN);
 	}
 
-	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V", ordinal = 6, shift = Shift.AFTER))
+	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V", ordinal = 6, shift = Shift.AFTER))
 	private void flywheel$onStage$afterTranslucentTerrain(CallbackInfo ci) {
 		flywheel$dispatch(RenderStage.AFTER_TRANSLUCENT_TERRAIN);
 	}
 
 	@Group(name = "onStage$afterParticles", min = 2, max = 2)
-	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;F)V", shift = Shift.AFTER))
+	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;F)V", shift = Shift.AFTER))
 	private void flywheel$onStage$afterParticles$fabric(CallbackInfo ci) {
 		flywheel$dispatch(RenderStage.AFTER_PARTICLES);
 	}
 
+	//fixme no neofrog 1.21 yet
 	@Group(name = "onStage$afterParticles")
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/culling/Frustum;)V", shift = Shift.AFTER))
 	private void flywheel$onStage$afterParticles$forge(CallbackInfo ci) {

common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixNormalScalingMixin.java

@@ -17,20 +17,21 @@ abstract class FixNormalScalingMixin {
 	 * applied, which negates the matrix again, resulting in the matrix being the
 	 * same as in the beginning.
 	 */
-	@Inject(method = "scale(FFF)V", at = @At(value = "INVOKE", target = "Lorg/joml/Matrix3f;scale(F)Lorg/joml/Matrix3f;", shift = Shift.AFTER, remap = false), cancellable = true)
+	@Inject(method = "scale(FFF)V", at = @At(value = "INVOKE", target = "Lorg/joml/Matrix4f;scale(FFF)Lorg/joml/Matrix4f;", shift = Shift.AFTER, remap = false), cancellable = true)
 	private void flywheel$returnAfterNegate(float x, float y, float z, CallbackInfo ci) {
 		ci.cancel();
 	}
 
-	/**
-	 * Minecraft takes the inverse cube root of the product of all scales to provide a
-	 * rough estimate for normalization so that it does not need to be done later. It
-	 * does not make sense for this "normalization factor" to be negative though, as
-	 * that would invert all normals. Additionally, Minecraft's fastInvCubeRoot method
-	 * does not work for negative numbers.
-	 */
-	@ModifyArg(method = "scale(FFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;fastInvCubeRoot(F)F"))
-	private float flywheel$absInvCbrtInput(float input) {
-		return Math.abs(input);
-	}
+	//fixme not needed anymore?
+//	/**
+//	 * Minecraft takes the inverse cube root of the product of all scales to provide a
+//	 * rough estimate for normalization so that it does not need to be done later. It
+//	 * does not make sense for this "normalization factor" to be negative though, as
+//	 * that would invert all normals. Additionally, Minecraft's fastInvCubeRoot method
+//	 * does not work for negative numbers.
+//	 */
+//	@ModifyArg(method = "scale(FFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Mth;fastInvCubeRoot(F)F"))
+//	private float flywheel$absInvCbrtInput(float input) {
+//		return Math.abs(input);
+//	}
 }

fabric/src/main/java/dev/engine_room/flywheel/impl/FabricFlwConfig.java

@@ -99,7 +99,7 @@ private void readBackend(JsonObject object) {
 		if (backendJson instanceof JsonPrimitive primitive && primitive.isString()) {
 			var value = primitive.getAsString();
 			try {
-				this.backend = Backend.REGISTRY.getOrThrow(new ResourceLocation(value));
+				this.backend = Backend.REGISTRY.getOrThrow(ResourceLocation.withDefaultNamespace(value));
 				return;
 			} catch (ResourceLocationException e) {
 				msg = "'backend' value '" + value + "' is not a valid resource location";

fabric/src/main/java/dev/engine_room/flywheel/impl/FlywheelFabric.java

@@ -17,7 +17,6 @@
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
 import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.loader.api.FabricLoader;

fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/MinecraftMixin.java

@@ -15,7 +15,7 @@ abstract class MinecraftMixin {
 	@Shadow
 	public ClientLevel level;
 
-	@Inject(method = "setLevel(Lnet/minecraft/client/multiplayer/ClientLevel;)V", at = @At("HEAD"))
+	@Inject(method = "setLevel(Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/gui/screens/ReceivingLevelScreen$Reason;)V", at = @At("HEAD"))
 	private void flywheel$onSetLevel(CallbackInfo ci) {
 		if (level != null) {
 			LevelAttached.invalidateLevel(level);