Initial port to 1.20.4 NeoForge.

CompactMods · Feb 21, 2024 · 15da1c2 · 15da1c2
1 parent bb2d5fa
commit 15da1c2
Show file tree

Hide file tree

Showing 357 changed files with 5,066 additions and 9,249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,9 @@ raw-assets/
 forge-main/src/generated/resources/.cache/
 
 forge-main/src/generated/
+
+neoforge-main/runs/
+
+.architectury-transformer/
+
+neoforge-datagen/runs/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "core"]
+	path = core
+	url = https://github.com/compactmods/compactmachines-core.git
diff --git a/...machines/forge/compat/InterModCompat.java → 1.19.2-compat/InterModCompat.java b/...machines/forge/compat/InterModCompat.java → 1.19.2-compat/InterModCompat.java
@@ -1,13 +1,13 @@
-package dev.compactmods.machines.forge.compat;
+package dev.compactmods.machines.neoforge.compat;
 
 import dev.compactmods.machines.api.core.Constants;
-import dev.compactmods.machines.forge.compat.carryon.CarryOnCompat;
-import dev.compactmods.machines.forge.compat.curios.CuriosCompat;
-import dev.compactmods.machines.forge.compat.theoneprobe.TheOneProbeCompat;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import dev.compactmods.machines.neoforge.compat.carryon.CarryOnCompat;
+import dev.compactmods.machines.neoforge.compat.curios.CuriosCompat;
+import dev.compactmods.machines.neoforge.compat.theoneprobe.TheOneProbeCompat;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
 
 @Mod.EventBusSubscriber(modid = Constants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class InterModCompat {

diff --git a/...s/forge/compat/carryon/CarryOnCompat.java → 1.19.2-compat/carryon/CarryOnCompat.java b/...s/forge/compat/carryon/CarryOnCompat.java → 1.19.2-compat/carryon/CarryOnCompat.java
@@ -1,10 +1,10 @@
-package dev.compactmods.machines.forge.compat.carryon;
+package dev.compactmods.machines.neoforge.compat.carryon;
 
-import dev.compactmods.machines.forge.machine.Machines;
-import dev.compactmods.machines.forge.machine.block.LegacySizedCompactMachineBlock;
+import dev.compactmods.machines.neoforge.machine.Machines;
+import dev.compactmods.machines.neoforge.machine.block.LegacySizedCompactMachineBlock;
 import dev.compactmods.machines.api.room.RoomSize;
-import net.minecraftforge.fml.InterModComms;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.neoforged.fml.InterModComms;
+import net.neoforged.registries.ForgeRegistries;
 
 public class CarryOnCompat {
 

diff --git a/...nes/forge/compat/curios/CuriosCompat.java → 1.19.2-compat/curios/CuriosCompat.java b/...nes/forge/compat/curios/CuriosCompat.java → 1.19.2-compat/curios/CuriosCompat.java
@@ -1,12 +1,13 @@
-package dev.compactmods.machines.forge.compat.curios;
+package dev.compactmods.machines.neoforge.compat.curios;
 
 import dev.compactmods.machines.api.core.Constants;
 import dev.compactmods.machines.api.shrinking.PSDTags;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.fml.InterModComms;
+import net.neoforged.client.event.TextureStitchEvent;
+import net.neoforged.fml.InterModComms;
+import net.neoforged.neoforge.client.event.TextureAtlasStitchedEvent;
 import top.theillusivec4.curios.api.CuriosApi;
 import top.theillusivec4.curios.api.SlotTypeMessage;
 
@@ -28,10 +29,6 @@ private static boolean isPsd(ItemStack stack) {
         return stack.is(PSDTags.ITEM);
     }
 
-    public static void addTextures(final TextureStitchEvent.Pre stitch) {
-        stitch.addSprite(CURIO_TEXTURE);
-    }
-
     public static boolean hasPsdCurio(@Nonnull LivingEntity ent) {
         return CuriosApi.getCuriosHelper()
                 .findFirstCurio(ent, CuriosCompat::isPsd)

diff --git a/.../compat/jei/CompactMachinesJeiPlugin.java → ...-compat/jei/CompactMachinesJeiPlugin.java b/.../compat/jei/CompactMachinesJeiPlugin.java → ...-compat/jei/CompactMachinesJeiPlugin.java
@@ -1,14 +1,14 @@
-package dev.compactmods.machines.forge.compat.jei;
+package dev.compactmods.machines.neoforge.compat.jei;
 
 import dev.compactmods.machines.api.core.Constants;
 import dev.compactmods.machines.api.core.JeiInfo;
 import dev.compactmods.machines.api.room.Rooms;
-import dev.compactmods.machines.forge.machine.Machines;
-import dev.compactmods.machines.forge.machine.item.LegacyCompactMachineItem;
-import dev.compactmods.machines.forge.machine.item.MachineItemUtil;
-import dev.compactmods.machines.forge.machine.item.UnboundCompactMachineItem;
-import dev.compactmods.machines.forge.shrinking.Shrinking;
-import dev.compactmods.machines.forge.tunnel.Tunnels;
+import dev.compactmods.machines.neoforge.machine.Machines;
+import dev.compactmods.machines.neoforge.machine.item.LegacyCompactMachineItem;
+import dev.compactmods.machines.neoforge.machine.item.MachineItemUtil;
+import dev.compactmods.machines.neoforge.machine.item.UnboundCompactMachineItem;
+import dev.compactmods.machines.neoforge.shrinking.Shrinking;
+import dev.compactmods.machines.neoforge.tunnel.Tunnels;
 import dev.compactmods.machines.i18n.TranslationUtil;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
@@ -17,8 +17,8 @@
 import mezz.jei.api.registration.ISubtypeRegistration;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.server.ServerLifecycleHooks;
+import net.neoforged.registries.ForgeRegistries;
+import net.neoforged.server.ServerLifecycleHooks;
 
 import java.util.stream.Collectors;
 

diff --git a/...compat/theoneprobe/TheOneProbeCompat.java → ...compat/theoneprobe/TheOneProbeCompat.java b/...compat/theoneprobe/TheOneProbeCompat.java → ...compat/theoneprobe/TheOneProbeCompat.java
@@ -1,6 +1,6 @@
-package dev.compactmods.machines.forge.compat.theoneprobe;
+package dev.compactmods.machines.neoforge.compat.theoneprobe;
 
-import net.minecraftforge.fml.InterModComms;
+import net.neoforged.fml.InterModComms;
 
 public class TheOneProbeCompat {
     public static void sendIMC() {

diff --git a/...e/compat/theoneprobe/TheOneProbeMain.java → ...2-compat/theoneprobe/TheOneProbeMain.java b/...e/compat/theoneprobe/TheOneProbeMain.java → ...2-compat/theoneprobe/TheOneProbeMain.java
@@ -1,9 +1,9 @@
-package dev.compactmods.machines.forge.compat.theoneprobe;
+package dev.compactmods.machines.neoforge.compat.theoneprobe;
 
-import dev.compactmods.machines.forge.compat.theoneprobe.elements.PlayerFaceElement;
-import dev.compactmods.machines.forge.compat.theoneprobe.overrides.CompactMachineNameOverride;
-import dev.compactmods.machines.forge.compat.theoneprobe.providers.CompactMachineProvider;
-import dev.compactmods.machines.forge.compat.theoneprobe.providers.TunnelProvider;
+import dev.compactmods.machines.neoforge.compat.theoneprobe.elements.PlayerFaceElement;
+import dev.compactmods.machines.neoforge.compat.theoneprobe.overrides.CompactMachineNameOverride;
+import dev.compactmods.machines.neoforge.compat.theoneprobe.providers.CompactMachineProvider;
+import dev.compactmods.machines.neoforge.compat.theoneprobe.providers.TunnelProvider;
 import mcjty.theoneprobe.api.IElement;
 import mcjty.theoneprobe.api.IElementFactory;
 import mcjty.theoneprobe.api.ITheOneProbe;

diff --git a/...eprobe/elements/MachineTunnelElement.java → ...eprobe/elements/MachineTunnelElement.java b/...eprobe/elements/MachineTunnelElement.java → ...eprobe/elements/MachineTunnelElement.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.forge.compat.theoneprobe.elements;
+package dev.compactmods.machines.neoforge.compat.theoneprobe.elements;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import mcjty.theoneprobe.api.IElement;

diff --git a/...eoneprobe/elements/PlayerFaceElement.java → ...eoneprobe/elements/PlayerFaceElement.java b/...eoneprobe/elements/PlayerFaceElement.java → ...eoneprobe/elements/PlayerFaceElement.java
@@ -1,4 +1,4 @@
-package dev.compactmods.machines.forge.compat.theoneprobe.elements;
+package dev.compactmods.machines.neoforge.compat.theoneprobe.elements;
 
 import com.mojang.authlib.GameProfile;
 import com.mojang.blaze3d.vertex.PoseStack;

diff --git a/...overrides/CompactMachineNameOverride.java → ...overrides/CompactMachineNameOverride.java b/...overrides/CompactMachineNameOverride.java → ...overrides/CompactMachineNameOverride.java
@@ -1,9 +1,9 @@
-package dev.compactmods.machines.forge.compat.theoneprobe.overrides;
+package dev.compactmods.machines.neoforge.compat.theoneprobe.overrides;
 
 import dev.compactmods.machines.api.core.CMTags;
-import dev.compactmods.machines.forge.machine.entity.BoundCompactMachineBlockEntity;
-import dev.compactmods.machines.forge.machine.item.BoundCompactMachineItem;
-import dev.compactmods.machines.forge.room.Rooms;
+import dev.compactmods.machines.neoforge.machine.entity.BoundCompactMachineBlockEntity;
+import dev.compactmods.machines.neoforge.machine.item.BoundCompactMachineItem;
+import dev.compactmods.machines.neoforge.room.Rooms;
 import dev.compactmods.machines.room.exceptions.NonexistentRoomException;
 import mcjty.theoneprobe.Tools;
 import mcjty.theoneprobe.api.CompoundText;

diff --git a/...obe/providers/CompactMachineProvider.java → ...obe/providers/CompactMachineProvider.java b/...obe/providers/CompactMachineProvider.java → ...obe/providers/CompactMachineProvider.java
@@ -1,12 +1,12 @@
-package dev.compactmods.machines.forge.compat.theoneprobe.providers;
+package dev.compactmods.machines.neoforge.compat.theoneprobe.providers;
 
 import dev.compactmods.machines.api.core.CMTags;
 import dev.compactmods.machines.api.core.Constants;
 import dev.compactmods.machines.api.core.Tooltips;
 import dev.compactmods.machines.api.dimension.CompactDimension;
-import dev.compactmods.machines.forge.compat.theoneprobe.elements.PlayerFaceElement;
-import dev.compactmods.machines.forge.machine.entity.BoundCompactMachineBlockEntity;
-import dev.compactmods.machines.forge.tunnel.TunnelItem;
+import dev.compactmods.machines.neoforge.compat.theoneprobe.elements.PlayerFaceElement;
+import dev.compactmods.machines.neoforge.machine.entity.BoundCompactMachineBlockEntity;
+import dev.compactmods.machines.neoforge.tunnel.TunnelItem;
 import dev.compactmods.machines.i18n.TranslationUtil;
 import dev.compactmods.machines.room.graph.CompactRoomProvider;
 import dev.compactmods.machines.tunnel.graph.TunnelConnectionGraph;

diff --git a/...theoneprobe/providers/TunnelProvider.java → ...theoneprobe/providers/TunnelProvider.java b/...theoneprobe/providers/TunnelProvider.java → ...theoneprobe/providers/TunnelProvider.java
@@ -1,8 +1,8 @@
-package dev.compactmods.machines.forge.compat.theoneprobe.providers;
+package dev.compactmods.machines.neoforge.compat.theoneprobe.providers;
 
-import dev.compactmods.machines.forge.tunnel.TunnelWallBlock;
-import dev.compactmods.machines.forge.tunnel.TunnelWallEntity;
-import dev.compactmods.machines.forge.tunnel.Tunnels;
+import dev.compactmods.machines.neoforge.tunnel.TunnelWallBlock;
+import dev.compactmods.machines.neoforge.tunnel.TunnelWallEntity;
+import dev.compactmods.machines.neoforge.tunnel.Tunnels;
 import dev.compactmods.machines.api.core.Constants;
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
 import mcjty.theoneprobe.api.*;

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,44 @@
+# Contributing
+
+## Project Setup
+- Pull the main branch.
+- Initialize the git submodule `core`.
+- Let NeoGradle initialize everything.
+- Rebuild the main mod source, `neoforge-main`. You should get no errors.
+- Check the `Neoforge-main: Client` run configuration.
+
+## Temporary IDE run configuration fix
+Update the `MOD_CLASSES` environment variable. Right now there is a NG bug that causes prefixes to use project names, and not read the core project
+MANIFEST files correctly. In order to run the game, the generated prefixes for paths must change:
+
+It will generate something like this: (newlines and `PROJECT_ROOT_HERE` added for readability)
+```
+MOD_CLASSES=
+    compactmachines%%PROJECT_ROOT_HERE\neoforge-main\build\resources\main\;
+    compactmachines%%PROJECT_ROOT_HERE\neoforge-main\build\classes\java\main\;
+    core%%PROJECT_ROOT_HERE\core\core\build\resources\main\;
+    core%%PROJECT_ROOT_HERE\core\core\build\classes\java\main\;
+    room-api%%PROJECT_ROOT_HERE\core\room-api\build\resources\main\;
+    room-api%%PROJECT_ROOT_HERE\core\room-api\build\classes\java\main\;
+    room-upgrade-api%%PROJECT_ROOT_HERE\core\room-upgrade-api\build\resources\main\;
+    room-upgrade-api%%PROJECT_ROOT_HERE\core\room-upgrade-api\build\classes\java\main\;
+    core-api%%PROJECT_ROOT_HERE\core\core-api\build\resources\main\;
+    core-api%%PROJECT_ROOT_HERE\core\core-api\build\classes\java\main
+```
+
+You must change this to be:
+```
+MOD_CLASSES=
+    compactmachines%%PROJECT_ROOT_HERE\neoforge-main\build\resources\main\;
+    compactmachines%%PROJECT_ROOT_HERE\neoforge-main\build\classes\java\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\core\build\resources\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\core\build\classes\java\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\room-api\build\resources\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\room-api\build\classes\java\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\room-upgrade-api\build\resources\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\room-upgrade-api\build\classes\java\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\core-api\build\resources\main\;
+    compactmachines%%PROJECT_ROOT_HERE\core\core-api\build\classes\java\main
+```
+
+It is recommended to duplicate this profile after fixing it so it is not overridden accidentally.
diff --git a/assets/core-chip.aseprite b/assets/core-chip.aseprite
diff --git a/assets/enlarger.png b/assets/enlarger.png
diff --git a/assets/interfaceitem.png b/assets/interfaceitem.png
diff --git a/assets/personal_shrinking_device.aseprite b/assets/personal_shrinking_device.aseprite
diff --git a/assets/quantumentangler.png b/assets/quantumentangler.png
diff --git a/assets/quantumentangler_entangled.png b/assets/quantumentangler_entangled.png
diff --git a/assets/shrinker.png b/assets/shrinker.png
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("net.neoforged.gradle.common") version ("7.0.93")
+    id("org.jetbrains.gradle.plugin.idea-ext") version ("1.1.7")
+}
diff --git a/core b/core
diff --git a/forge-builtin/build.gradle.kts b/forge-builtin/build.gradle.kts
diff --git a/forge-builtin/src/main/java/dev/compactmods/machines/forgebuiltin/CMBuiltInAddon.java b/forge-builtin/src/main/java/dev/compactmods/machines/forgebuiltin/CMBuiltInAddon.java
diff --git a/forge-builtin/src/main/java/dev/compactmods/machines/forgebuiltin/tunnel/BuiltInTunnels.java b/forge-builtin/src/main/java/dev/compactmods/machines/forgebuiltin/tunnel/BuiltInTunnels.java