Major package refactor and cleanup, for 1.19.1

Author: robotgryphon

build.gradle

@@ -107,8 +107,7 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
-            // arg '-mixin.config=compactmachines.mixin.json'
-            args '--username', 'Dev'
+            args '--username', 'Nano'
             args '--width', 1920
             args '--height', 1080
 
@@ -135,8 +134,6 @@ minecraft {
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
 
-            arg '-mixin.config=compactmachines.mixin.json'
-
             mods {
                 compactmachines {
                     source sourceSets.tunnels

gradle.properties

@@ -3,15 +3,15 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.19
-forge_version=41.0.99
-parchment_version=1.18.2-2022.07.03-1.19
+minecraft_version=1.19.1
+forge_version=42.0.1
+parchment_version=1.18.2-2022.07.17-1.19.1
 
 mod_id=compactmachines
 
 # Dependencies and Libs
-jei_mc_version=1.19
-jei_version=11.0.0.222
+jei_mc_version=1.19.1
+jei_version=11.2.0.241
 #top_version=1.16-3.1.4-22
 
 # Curseforge

src/api/java/dev/compactmods/machines/api/core/Advancements.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.resources.ResourceLocation;
 
-public class Advancements {
+public abstract class Advancements {
     public static final ResourceLocation HOW_DID_YOU_GET_HERE = new ResourceLocation(Constants.MOD_ID, "how_did_you_get_here");
     public static final ResourceLocation ROOT = new ResourceLocation(Constants.MOD_ID, "root");
     public static final ResourceLocation FOUNDATIONS = new ResourceLocation(Constants.MOD_ID, "foundations");

src/api/java/dev/compactmods/machines/api/core/CMCommands.java

@@ -4,7 +4,7 @@
 
 import static dev.compactmods.machines.api.core.Constants.MOD_ID;
 
-public class CMCommands {
+public abstract class CMCommands {
     public static final ResourceLocation LEVEL_REGISTERED = new ResourceLocation(MOD_ID, "level_registered");
     public static final ResourceLocation LEVEL_NOT_FOUND = new ResourceLocation(MOD_ID, "level_not_found");
 

src/api/java/dev/compactmods/machines/api/core/CMTags.java

@@ -5,7 +5,7 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 
-public class CMTags {
+public abstract class CMTags {
 
     public static final TagKey<Item> ROOM_UPGRADE_ITEM = ItemTags.create(new ResourceLocation(Constants.MOD_ID, "room_upgrade"));
 }

src/api/java/dev/compactmods/machines/api/core/Constants.java

@@ -1,9 +1,6 @@
 package dev.compactmods.machines.api.core;
 
-import net.minecraft.resources.ResourceLocation;
-
 public abstract class Constants {
     public static final String MOD_ID = "compactmachines";
 
-    public static final ResourceLocation TUNNEL_ID = new ResourceLocation(MOD_ID, "tunnel");
 }

src/api/java/dev/compactmods/machines/api/core/JeiInfo.java

@@ -1,9 +1,8 @@
 package dev.compactmods.machines.api.core;
 
-import com.mojang.datafixers.kinds.Const;
 import net.minecraft.resources.ResourceLocation;
 
-public class JeiInfo {
+public abstract class JeiInfo {
     public static final ResourceLocation MACHINE = new ResourceLocation(Constants.MOD_ID, "machines");
 
     public static final ResourceLocation SHRINKING_DEVICE = new ResourceLocation(Constants.MOD_ID, "shrinking_device");

src/api/java/dev/compactmods/machines/api/room/IRoomInformation.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.room;
+package dev.compactmods.machines.api.room;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.util.StringRepresentable;

…/compactmods/machines/room/RoomSize.java …pactmods/machines/api/room/RoomSize.javasrc/main/java/dev/compactmods/machines/room/RoomSize.java renamed to src/api/java/dev/compactmods/machines/api/room/RoomSize.java src/main/java/dev/compactmods/machines/room/RoomSize.java renamed to src/api/java/dev/compactmods/machines/api/room/RoomSize.java

@@ -1,5 +1,8 @@
 package dev.compactmods.machines.api.tunnels;
 
+import dev.compactmods.machines.api.core.Constants;
+import net.minecraft.resources.ResourceLocation;
+
 public interface TunnelDefinition {
     /**
      * The color of a non-indicator (the same color as the wall)
@@ -17,6 +20,7 @@ public interface TunnelDefinition {
      * a machine room.
      */
     int EXPORT_COLOR = 0xffe6a709;
+    ResourceLocation TUNNEL_ID = new ResourceLocation(Constants.MOD_ID, "tunnel");
 
     /**
      * The central ring color of the tunnel. Shown in the tunnel item and on blocks.