Multiloader ~ 1.20.4 Port

buildSrc/build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
 repositories {
     gradlePluginPortal()
     mavenCentral()
-    maven("https://maven.minecraftforge.net/") {
-        name = "MinecraftForge"
+    maven("https://maven.neoforged.net/releases/") {
+        name = "NeoForged"
     }
     maven("https://maven.architectury.dev/") {
         name = "Architectury"

buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt

@@ -48,12 +48,12 @@ class SubprojectPlugin: Plugin<Project> {
         }
     }
 
-    @Suppress("UnstableApiUsage")
     private fun setupLoom(project: Project) {
         val loom = project.the<LoomGradleExtensionAPI>()
         loom.silentMojangMappingsLicense()
 
-        loom.mixin.defaultRefmapName = "flywheel.refmap.json"
+        //fixme is this still needed?
+//        loom.mixin.defaultRefmapName = "flywheel.refmap.json"
     }
 
     private fun setupJava(project: Project) {
@@ -182,6 +182,6 @@ val processResourcesExpandProperties = listOf(
     "minecraft_semver_version_range",
     "minecraft_maven_version_range",
     "fabric_api_version_range",
-    "forge_version_range",
+    "neoforge_version_range",
 )
 

common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java

@@ -53,7 +53,7 @@ public interface TextureMapper {
 		void map(Vector2f uv);
 
 		static TextureMapper toSprite(TextureAtlasSprite sprite) {
-			return uv -> uv.set(sprite.getU(uv.x * 16), sprite.getV(uv.y * 16));
+			return uv -> uv.set(sprite.getU(uv.x), sprite.getV(uv.y));
 		}
 	}
 

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

@@ -102,7 +102,7 @@ abstract class LevelRendererMixin {
 		flywheel$dispatch(RenderStage.AFTER_TRANSLUCENT_TERRAIN);
 	}
 
-	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderChunkLayer(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;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V", ordinal = 6, shift = Shift.AFTER))
 	private void flywheel$onStage$afterTranslucentTerrain(CallbackInfo ci) {
 		flywheel$dispatch(RenderStage.AFTER_TRANSLUCENT_TERRAIN);
 	}

common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/RebuildTaskMixin.java

@@ -9,9 +9,9 @@
 import dev.engine_room.flywheel.lib.visual.VisualizationHelper;
 import net.minecraft.world.level.block.entity.BlockEntity;
 
-@Mixin(targets = "net.minecraft.client.renderer.chunk.ChunkRenderDispatcher$RenderChunk$RebuildTask")
+@Mixin(targets = "net.minecraft.client.renderer.chunk.SectionRenderDispatcher$RenderSection$RebuildTask")
 abstract class RebuildTaskMixin {
-	@Inject(method = "handleBlockEntity(Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk$RebuildTask$CompileResults;Lnet/minecraft/world/level/block/entity/BlockEntity;)V", at = @At("HEAD"), cancellable = true)
+	@Inject(method = "handleBlockEntity(Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection$RebuildTask$CompileResults;Lnet/minecraft/world/level/block/entity/BlockEntity;)V", at = @At("HEAD"), cancellable = true)
 	private void flywheel$tryAddBlockEntity(@Coerce Object compileResults, BlockEntity blockEntity, CallbackInfo ci) {
 		if (VisualizationHelper.tryAddBlockEntity(blockEntity)) {
 			ci.cancel();

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

@@ -7,6 +7,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Coerce;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -30,14 +31,14 @@ abstract class MinecraftMixin {
 		FabricFlwConfig.INSTANCE.load();
 	}
 
-	@Inject(method = "method_24040", at = @At("HEAD"))
-	private void flywheel$onEndInitialResourceReload(Optional<Throwable> error, CallbackInfo ci) {
+	@Inject(method = "method_53522", at = @At("HEAD"))
+	private void flywheel$onEndInitialResourceReload(@Coerce Object gameLoadCookie, Optional<Throwable> error, CallbackInfo ci) {
 		EndClientResourceReloadCallback.EVENT.invoker()
 				.onEndClientResourceReload((Minecraft) (Object) this, resourceManager, true, error);
 	}
 
 	@Inject(method = "method_24228", at = @At("HEAD"))
-	private void flywheel$onEndManualResourceReload(boolean recovery, CompletableFuture<Void> future,
+	private void flywheel$onEndManualResourceReload(boolean recovery, @Coerce Object gameLoadCookie, CompletableFuture<Void> future,
 													Optional<Throwable> error, CallbackInfo ci) {
 		EndClientResourceReloadCallback.EVENT.invoker()
 				.onEndClientResourceReload((Minecraft) (Object) this, resourceManager, false, error);

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

@@ -22,8 +22,8 @@ abstract class MinecraftMixin {
 		}
 	}
 
-	@Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At("HEAD"))
-	private void flywheel$onClearLevel(CallbackInfo ci) {
+	@Inject(method = "disconnect(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At("HEAD"))
+	private void flywheel$onDisconnect(CallbackInfo ci) {
 		if (level != null) {
 			LevelAttached.invalidateLevel(level);
 		}

forge/build.gradle.kts

@@ -61,12 +61,6 @@ defaultPackageInfos {
 }
 
 loom {
-    forge {
-        mixinConfig("flywheel.backend.mixins.json")
-        mixinConfig("flywheel.impl.mixins.json")
-        mixinConfig("flywheel.impl.sodium.mixins.json")
-    }
-
     runs {
         configureEach {
             property("forge.logging.markers", "")
@@ -75,8 +69,12 @@ loom {
     }
 }
 
+repositories {
+    maven("https://maven.neoforged.net/releases/")
+}
+
 dependencies {
-    forge("net.minecraftforge:forge:${property("minecraft_version")}-${property("forge_version")}")
+    neoForge("net.neoforged:neoforge:${property("neoforge_version")}")
 
     modCompileOnly("maven.modrinth:embeddium:${property("embeddium_version")}")
     modCompileOnly("maven.modrinth:oculus:${property("oculus_version")}")

forge/gradle.properties

@@ -1 +1 @@
-loom.platform = forge
+loom.platform = neoforge

forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java

@@ -1,6 +1,6 @@
 package dev.engine_room.flywheel.api.event;
 
-import net.minecraftforge.eventbus.api.Event;
+import net.neoforged.bus.api.Event;
 
 /**
  * This event is posted to the Forge event bus.

forge/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadEvent.java

@@ -4,8 +4,8 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
+import net.neoforged.bus.api.Event;
+import net.neoforged.fml.event.IModBusEvent;
 
 /**
  * This event is posted to mod event buses.

forge/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererEvent.java

@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraftforge.eventbus.api.Event;
+import net.neoforged.bus.api.Event;
 
 /**
  * This event is posted to the Forge event bus.

forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java

@@ -7,7 +7,7 @@
 import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.RenderBuffers;
-import net.minecraftforge.eventbus.api.Event;
+import net.neoforged.bus.api.Event;
 
 /**
  * This event is posted to the Forge event bus.

forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java

@@ -20,8 +20,8 @@
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.FluidState;
-import net.minecraftforge.client.ChunkRenderTypeSet;
-import net.minecraftforge.client.model.data.ModelData;
+import net.neoforged.neoforge.client.ChunkRenderTypeSet;
+import net.neoforged.neoforge.client.model.data.ModelData;
 
 final class BakedModelBufferer {
 	static final RenderType[] CHUNK_LAYERS = RenderType.chunkBufferLayers().toArray(RenderType[]::new);

forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java

@@ -16,7 +16,7 @@
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.client.model.data.ModelData;
+import net.neoforged.neoforge.client.model.data.ModelData;
 
 public final class ForgeBakedModelBuilder extends BakedModelBuilder {
 	@Nullable

forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java

@@ -14,7 +14,7 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.client.model.data.ModelData;
+import net.neoforged.neoforge.client.model.data.ModelData;
 
 public final class ForgeBlockModelBuilder extends BlockModelBuilder {
 	@Nullable

forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java

@@ -15,7 +15,7 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraftforge.client.model.data.ModelData;
+import net.neoforged.neoforge.client.model.data.ModelData;
 
 public final class ForgeMultiBlockModelBuilder extends MultiBlockModelBuilder {
 	@Nullable

forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java

@@ -6,7 +6,7 @@
 
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.client.event.ModelEvent;
+import net.neoforged.neoforge.client.event.ModelEvent;
 
 @ApiStatus.Internal
 public final class PartialModelEventHandler {

forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java

@@ -15,9 +15,9 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.Entity;
-import net.minecraftforge.client.event.RegisterClientCommandsEvent;
-import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
-import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
+import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent;
+import net.neoforged.neoforge.common.ModConfigSpec.BooleanValue;
+import net.neoforged.neoforge.common.ModConfigSpec.ConfigValue;
 
 public final class FlwCommands {
 	private FlwCommands() {

forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java

@@ -8,22 +8,22 @@
 import dev.engine_room.flywheel.api.event.RenderStage;
 import dev.engine_room.flywheel.api.event.RenderStageEvent;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraftforge.common.MinecraftForge;
+import net.neoforged.neoforge.common.NeoForge;
 
 public class FlwImplXplatImpl implements FlwImplXplat {
 	@Override
 	public void dispatchBeginFrameEvent(RenderContext context) {
-		MinecraftForge.EVENT_BUS.post(new BeginFrameEvent(context));
+		NeoForge.EVENT_BUS.post(new BeginFrameEvent(context));
 	}
 
 	@Override
 	public void dispatchReloadLevelRendererEvent(@Nullable ClientLevel level) {
-		MinecraftForge.EVENT_BUS.post(new ReloadLevelRendererEvent(level));
+		NeoForge.EVENT_BUS.post(new ReloadLevelRendererEvent(level));
 	}
 
 	@Override
 	public void dispatchRenderStageEvent(RenderContext context, RenderStage stage) {
-		MinecraftForge.EVENT_BUS.post(new RenderStageEvent(context, stage));
+		NeoForge.EVENT_BUS.post(new RenderStageEvent(context, stage));
 	}
 
 	@Override

forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java

@@ -20,8 +20,8 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.util.ObfuscationReflectionHelper;
 
 public class FlwLibXplatImpl implements FlwLibXplat {
 	@Override
@@ -33,7 +33,7 @@ public BlockRenderDispatcher createVanillaBlockRenderDispatcher() {
 				field.setAccessible(true);
 				field.set(dispatcher, field.get(defaultDispatcher));
 			}
-			ObfuscationReflectionHelper.setPrivateValue(BlockRenderDispatcher.class, dispatcher, new ModelBlockRenderer(Minecraft.getInstance().getBlockColors()), "f_110900_");
+			ObfuscationReflectionHelper.setPrivateValue(BlockRenderDispatcher.class, dispatcher, new ModelBlockRenderer(Minecraft.getInstance().getBlockColors()), "modelRenderer");
 		} catch (Exception e) {
 			FlwImpl.LOGGER.error("Failed to initialize vanilla BlockRenderDispatcher!", e);
 			return defaultDispatcher;

forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java

@@ -17,41 +17,38 @@
 import dev.engine_room.flywheel.lib.util.LevelAttached;
 import net.minecraft.client.Minecraft;
 import net.minecraft.commands.synchronization.ArgumentTypeInfos;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.CustomizeGuiOverlayEvent;
-import net.minecraftforge.client.event.RegisterClientReloadListenersEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.entity.EntityJoinLevelEvent;
-import net.minecraftforge.event.entity.EntityLeaveLevelEvent;
-import net.minecraftforge.event.level.LevelEvent;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.CrashReportCallables;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegisterEvent;
+import net.minecraft.core.registries.Registries;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.CrashReportCallables;
+import net.neoforged.fml.DistExecutor;
+import net.neoforged.fml.LogicalSide;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.neoforge.client.event.CustomizeGuiOverlayEvent;
+import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.TickEvent;
+import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
+import net.neoforged.neoforge.event.entity.EntityLeaveLevelEvent;
+import net.neoforged.neoforge.event.level.LevelEvent;
+import net.neoforged.neoforge.registries.RegisterEvent;
 
 @Mod(Flywheel.ID)
 public final class FlywheelForge {
 	@UnknownNullability
 	private static ArtifactVersion version;
 
-	public FlywheelForge() {
+	public FlywheelForge(IEventBus modEventBus, ModContainer modContainer) {
 		ModLoadingContext modLoadingContext = ModLoadingContext.get();
 
-		version = modLoadingContext
-				.getActiveContainer()
+		version = modContainer
 				.getModInfo()
 				.getVersion();
 
-		IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;
-		IEventBus modEventBus = FMLJavaModLoadingContext.get()
-				.getModEventBus();
+		IEventBus forgeEventBus = NeoForge.EVENT_BUS;
 
 		ForgeFlwConfig.INSTANCE.registerSpecs(modLoadingContext);
 
@@ -86,7 +83,7 @@ private static void registerImplEventListeners(IEventBus forgeEventBus, IEventBu
 		forgeEventBus.addListener((CustomizeGuiOverlayEvent.DebugText e) -> {
 			Minecraft minecraft = Minecraft.getInstance();
 
-			if (!minecraft.options.renderDebug) {
+			if (!minecraft.getDebugOverlay().showDebugScreen()) {
 				return;
 			}
 
@@ -100,9 +97,9 @@ private static void registerImplEventListeners(IEventBus forgeEventBus, IEventBu
 			ArgumentTypeInfos.registerByClass(DebugModeArgument.class, DebugModeArgument.INFO);
 		});
 		modEventBus.addListener((RegisterEvent e) -> {
-			if (e.getRegistryKey().equals(ForgeRegistries.Keys.COMMAND_ARGUMENT_TYPES)) {
-				e.register(ForgeRegistries.Keys.COMMAND_ARGUMENT_TYPES, Flywheel.rl("backend"), () -> BackendArgument.INFO);
-				e.register(ForgeRegistries.Keys.COMMAND_ARGUMENT_TYPES, Flywheel.rl("debug_mode"), () -> DebugModeArgument.INFO);
+			if (e.getRegistryKey().equals(Registries.COMMAND_ARGUMENT_TYPE)) {
+				e.register(Registries.COMMAND_ARGUMENT_TYPE, Flywheel.rl("backend"), () -> BackendArgument.INFO);
+				e.register(Registries.COMMAND_ARGUMENT_TYPE, Flywheel.rl("debug_mode"), () -> DebugModeArgument.INFO);
 			}
 		});
 	}

forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java

@@ -7,18 +7,18 @@
 import dev.engine_room.flywheel.api.backend.BackendManager;
 import net.minecraft.ResourceLocationException;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.config.ModConfig;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.config.ModConfig;
+import net.neoforged.neoforge.common.ModConfigSpec;
 
 public class ForgeFlwConfig implements FlwConfig {
 	public static final ForgeFlwConfig INSTANCE = new ForgeFlwConfig();
 
 	public final ClientConfig client;
-	private final ForgeConfigSpec clientSpec;
+	private final ModConfigSpec clientSpec;
 
 	private ForgeFlwConfig() {
-		Pair<ClientConfig, ForgeConfigSpec> clientPair = new ForgeConfigSpec.Builder().configure(ClientConfig::new);
+		Pair<ClientConfig, ModConfigSpec> clientPair = new ModConfigSpec.Builder().configure(ClientConfig::new);
 		this.client = clientPair.getLeft();
 		clientSpec = clientPair.getRight();
 	}
@@ -68,11 +68,11 @@ public void registerSpecs(ModLoadingContext context) {
 	}
 
 	public static class ClientConfig {
-		public final ForgeConfigSpec.ConfigValue<String> backend;
-		public final ForgeConfigSpec.BooleanValue limitUpdates;
-		public final ForgeConfigSpec.IntValue workerThreads;
+		public final ModConfigSpec.ConfigValue<String> backend;
+		public final ModConfigSpec.BooleanValue limitUpdates;
+		public final ModConfigSpec.IntValue workerThreads;
 
-		private ClientConfig(ForgeConfigSpec.Builder builder) {
+		private ClientConfig(ModConfigSpec.Builder builder) {
 			backend = builder.comment("Select the backend to use.")
 					.define("backend", Backend.REGISTRY.getIdOrThrow(BackendManager.getDefaultBackend()).toString());