Update to MC 1.21.4

Author: rubensworks

README.md

@@ -24,14 +24,7 @@ All stable releases (including deobfuscated builds) can be found on [CurseForge]
 
 ### Branching Strategy
 
-For every major Minecraft version, two branches exist:
-
-* `master-{mc_version}`: Latest (potentially unstable) development.
-* `release-{mc_version}`: Latest stable release for that Minecraft version. This is also tagged with all mod releases.
-
-### Building and setting up a development environment
-
-This mod uses [Project Lombok](http://projectlombok.org/) -- an annotation processor that allows us you to generate constructors, getters and setters using annotations -- to speed up recurring tasks and keep part of our codebase clean at the same time. Because of this it is advised that you install a plugin for your IDE that supports Project Lombok. Should you encounter any weird errors concerning missing getter or setter methods, it's probably because your code has not been processed by Project Lombok's processor. A list of Project Lombok plugins can be found [here](http://projectlombok.org/download.html).
+For every major Minecraft version, a `master-{mc_version} branch exists.
 
 ### License
 All code and images are licenced under the [MIT License](https://github.com/CyclopsMC/IntegratedScripting/blob/master-1.19-lts/LICENSE.txt)

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'net.neoforged.gradle.userdev' version '7.0.145'
+    id 'net.neoforged.gradle.userdev' version '7.0.171'
     id 'net.darkhax.curseforgegradle' version '1.0.8'
 	id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
@@ -185,15 +185,15 @@ runs {
 
     server {
         systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
-        programArgument '--nogui'
+        argument '--nogui'
     }
 
     gameTestServer {
         systemProperty 'neoforge.enabledGameTestNamespaces', "cyclopscore,${mod_id}"
     }
 
-    data {
-        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    clientData {
+        arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.integratedscripting
 java_version=21
 
 # Common
-minecraft_version=1.21.1
+minecraft_version=1.21.4
 mod_name=IntegratedScripting
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedscripting
@@ -15,17 +15,17 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-scripting
 description=Create scripts for handling operations in Integrated Dynamics.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-parchment_version=2024.07.07
-parchment_minecraft_version=1.21
+parchment_version=2024.12.07
+parchment_minecraft_version=1.21.4
 curseforge_project_id=889785
 modrinth_project_id=uDJkuFRe
 
 # NeoForge
-neoforge_version=21.1.2
+neoforge_version=21.4.33-beta
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/integrated-scripting.json
 
 # Dependencies
-cyclopscore_version=1.25.5-643
-integrateddynamics_version=1.24.1-993
-commoncapabilities_version=2.9.3-147
+cyclopscore_version=1.25.5-704
+integrateddynamics_version=1.24.1-1059
+commoncapabilities_version=2.9.7-194

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/cyclops/integratedscripting/GeneralConfig.java

@@ -1,54 +1,47 @@
 package org.cyclops.integratedscripting;
 
-import net.neoforged.fml.config.ModConfig;
-import org.cyclops.cyclopscore.config.ConfigurableProperty;
-import org.cyclops.cyclopscore.config.extendedconfig.DummyConfig;
-import org.cyclops.cyclopscore.tracking.Versions;
+import org.cyclops.cyclopscore.config.ConfigurablePropertyCommon;
+import org.cyclops.cyclopscore.config.ModConfigLocation;
+import org.cyclops.cyclopscore.config.extendedconfig.DummyConfigCommon;
+import org.cyclops.cyclopscore.init.IModBase;
 
 /**
  * A config with general options for this mod.
  * @author rubensworks
  *
  */
-public class GeneralConfig extends DummyConfig {
+public class GeneralConfig extends DummyConfigCommon<IModBase> {
 
-    @ConfigurableProperty(category = "core", comment = "If the version checker should be enabled.")
+    @ConfigurablePropertyCommon(category = "core", comment = "If the version checker should be enabled.")
     public static boolean versionChecker = true;
 
-    @ConfigurableProperty(category = "general", comment = "The base energy usage for the scripting drive.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "The base energy usage for the scripting drive.", minimalValue = 0, configLocation = ModConfigLocation.SERVER)
     public static int scriptingDriveBaseConsumption = 2;
-    @ConfigurableProperty(category = "general", comment = "The base energy usage for the scripting terminal.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "The base energy usage for the scripting terminal.", minimalValue = 0, configLocation = ModConfigLocation.SERVER)
     public static int terminalScriptingBaseConsumption = 1;
-    @ConfigurableProperty(category = "general", comment = "The minimum number of ticks inbetween sending a script change packet from client to server.", minimalValue = 0, configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "The minimum number of ticks inbetween sending a script change packet from client to server.", minimalValue = 0, configLocation = ModConfigLocation.SERVER)
     public static int terminalScriptingClientSyncTickInterval = 20;
 
-    @ConfigurableProperty(category = "general", comment = "If new processes can be created from guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If new processes can be created from guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowCreateProcess = false;
-    @ConfigurableProperty(category = "general", comment = "If new threads can be created from guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If new threads can be created from guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowCreateThread = false;
-    @ConfigurableProperty(category = "general", comment = "If IO is allowed from guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If IO is allowed from guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowIo = false;
-    @ConfigurableProperty(category = "general", comment = "If host class loading is allowed from guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If host class loading is allowed from guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowHostClassLoading = false;
-    @ConfigurableProperty(category = "general", comment = "If experimental options can be used in guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If experimental options can be used in guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowExperimentalOptions = false;
-    @ConfigurableProperty(category = "general", comment = "If environment variables can be accessed from guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If environment variables can be accessed from guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowEnvironment = false;
-    @ConfigurableProperty(category = "general", comment = "If the native interface can be accessed from guest languages.", configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "If the native interface can be accessed from guest languages.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowNative = false;
-    @ConfigurableProperty(category = "general", comment = "The maximum number of statements that can be executed in one evaluation. This is to avoid infinite loops or very complex programs. Set to -1 to disable limit (not recommended).", configLocation = ModConfig.Type.SERVER, minimalValue = -1)
+    @ConfigurablePropertyCommon(category = "general", comment = "The maximum number of statements that can be executed in one evaluation. This is to avoid infinite loops or very complex programs. Set to -1 to disable limit (not recommended).", configLocation = ModConfigLocation.SERVER, minimalValue = -1)
     public static int graalStatementLimit = 16384;
-    @ConfigurableProperty(category = "general", comment = "The maximum number of lines in stdout and stderr script log files. Set to -1 to disable limit.", minimalValue = -1, configLocation = ModConfig.Type.SERVER)
+    @ConfigurablePropertyCommon(category = "general", comment = "The maximum number of lines in stdout and stderr script log files. Set to -1 to disable limit.", minimalValue = -1, configLocation = ModConfigLocation.SERVER)
     public static int maxLogLines = 2096;
 
     public GeneralConfig() {
         super(IntegratedScripting._instance, "general");
     }
-
-    @Override
-    public void onRegistered() {
-        if(versionChecker) {
-            Versions.registerMod(getMod(), IntegratedScripting._instance, Reference.VERSION_URL);
-        }
-    }
 }

src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java

@@ -19,10 +19,9 @@
 import net.neoforged.neoforge.event.tick.ServerTickEvent;
 import net.neoforged.neoforge.registries.NewRegistryEvent;
 import org.apache.logging.log4j.Level;
-import org.cyclops.cyclopscore.config.ConfigHandler;
-import org.cyclops.cyclopscore.helper.MinecraftHelpers;
+import org.cyclops.cyclopscore.config.ConfigHandlerCommon;
 import org.cyclops.cyclopscore.infobook.IInfoBookRegistry;
-import org.cyclops.cyclopscore.init.ModBaseVersionable;
+import org.cyclops.cyclopscore.init.ModBaseNeoForge;
 import org.cyclops.cyclopscore.proxy.IClientProxy;
 import org.cyclops.cyclopscore.proxy.ICommonProxy;
 import org.cyclops.integrateddynamics.IntegratedDynamics;
@@ -56,7 +55,7 @@
  *
  */
 @Mod(Reference.MOD_ID)
-public class IntegratedScripting extends ModBaseVersionable<IntegratedScripting> {
+public class IntegratedScripting extends ModBaseNeoForge<IntegratedScripting> {
 
     public static IntegratedScripting _instance;
 
@@ -81,7 +80,7 @@ public void onRegistriesCreate(NewRegistryEvent event) {
                 .registerHandler(ScriptVariableFacadeHandler.getInstance());
 
         // Load client models
-        if (MinecraftHelpers.isClientSide()) {
+        if (getModHelpers().getMinecraftHelpers().isClientSide()) {
             ScriptingVariableModelProviders.load();
         }
 
@@ -145,7 +144,7 @@ protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTa
     }
 
     @Override
-    protected void onConfigsRegister(ConfigHandler configHandler) {
+    protected void onConfigsRegister(ConfigHandlerCommon configHandler) {
         super.onConfigsRegister(configHandler);
 
         configHandler.addConfigurable(new GeneralConfig());

src/main/java/org/cyclops/integratedscripting/Reference.java

@@ -1,6 +1,6 @@
 package org.cyclops.integratedscripting;
 
-import org.cyclops.cyclopscore.helper.MinecraftHelpers;
+import org.cyclops.cyclopscore.helper.IModHelpers;
 
 /**
  * Class that can hold basic static things that are better not hard-coded
@@ -13,7 +13,7 @@ public class Reference {
 
     // Mod info
     public static final String MOD_ID = "integratedscripting";
-    public static final String VERSION_URL = "https://raw.githubusercontent.com/CyclopsMC/Versions/master/" + MinecraftHelpers.getMinecraftVersionMajorMinor() + "/IntegratedREST.txt";
+    public static final String VERSION_URL = "https://raw.githubusercontent.com/CyclopsMC/Versions/master/" + IModHelpers.get().getMinecraftHelpers().getMinecraftVersionMajorMinor() + "/IntegratedREST.txt";
 
     // MOD ID's
     public static final String MOD_FORGE = "forge";

src/main/java/org/cyclops/integratedscripting/block/BlockMendesiteConfig.java

@@ -2,21 +2,22 @@
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
-import org.cyclops.cyclopscore.config.extendedconfig.BlockConfig;
+import org.cyclops.cyclopscore.config.extendedconfig.BlockConfigCommon;
+import org.cyclops.cyclopscore.init.IModBase;
 import org.cyclops.integratedscripting.IntegratedScripting;
 
 /**
  * Config for the Mendesite block.
  * @author rubensworks
  *
  */
-public class BlockMendesiteConfig extends BlockConfig {
+public class BlockMendesiteConfig extends BlockConfigCommon<IModBase> {
 
     public BlockMendesiteConfig() {
         super(
                 IntegratedScripting._instance,
                 "mendesite",
-                eConfig -> new Block(Block.Properties.of()
+                (eConfig, properties) -> new Block(properties
                         .sound(SoundType.SNOW)
                         .strength(1.5F)
                         .noOcclusion()),

src/main/java/org/cyclops/integratedscripting/block/BlockScriptingDrive.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.level.block.state.properties.DirectionProperty;
+import net.minecraft.world.level.block.state.properties.EnumProperty;
 import org.cyclops.integrateddynamics.core.block.BlockWithEntityGuiCabled;
 import org.cyclops.integratedscripting.blockentity.BlockEntityScriptingDrive;
 
@@ -27,7 +27,7 @@ public class BlockScriptingDrive extends BlockWithEntityGuiCabled {
 
     public static final MapCodec<BlockScriptingDrive> CODEC = simpleCodec(BlockScriptingDrive::new);
 
-    public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
+    public static final EnumProperty<Direction> FACING = BlockStateProperties.HORIZONTAL_FACING;
 
     public BlockScriptingDrive(Properties properties) {
         super(properties, BlockEntityScriptingDrive::new);

src/main/java/org/cyclops/integratedscripting/block/BlockScriptingDriveConfig.java

@@ -1,21 +1,21 @@
 package org.cyclops.integratedscripting.block;
 
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
-import org.cyclops.cyclopscore.config.extendedconfig.BlockConfig;
+import org.cyclops.cyclopscore.config.extendedconfig.BlockConfigCommon;
+import org.cyclops.cyclopscore.init.IModBase;
 import org.cyclops.integratedscripting.IntegratedScripting;
 
 /**
  * Config for {@link BlockScriptingDrive}.
  * @author rubensworks
  */
-public class BlockScriptingDriveConfig extends BlockConfig {
+public class BlockScriptingDriveConfig extends BlockConfigCommon<IModBase> {
 
     public BlockScriptingDriveConfig() {
         super(
                 IntegratedScripting._instance,
                 "scripting_drive",
-                eConfig -> new BlockScriptingDrive(Block.Properties.of()
+                (eConfig, properties) -> new BlockScriptingDrive(properties
                         .strength(2.0F, 5.0F)
                         .sound(SoundType.METAL)),
                 getDefaultItemConstructor(IntegratedScripting._instance)