Improve CubicPlayerManager and add support for third party modded cubic world generators

gradle.properties

@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -82,12 +106,14 @@ usesMixins = true
 separateMixinSourceSet =
 
 # Adds some debug arguments like verbose output and class export.
-usesMixinDebug = false
+usesMixinDebug = true
 
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage = mixin
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -142,7 +168,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -163,6 +189,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.
@@ -192,3 +224,6 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
+toolchainVendor=ADOPTIUM
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gtnewhorizons.gtnhsettingsconvention") version("1.0.42")
+    id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.24")
 }

src/main/java/com/cardinalstar/cubicchunks/CubicChunks.java

@@ -74,7 +74,7 @@
 import cpw.mods.fml.relauncher.Side;
 
 @ParametersAreNonnullByDefault
-@Mod(modid = CubicChunks.MODID, useMetadata = true)
+@Mod(modid = CubicChunks.MODID, useMetadata = true, dependencies = "required-after:RegionLib;")
 public class CubicChunks {
 
     public static final int MAX_RENDER_DISTANCE = 64;

src/main/java/com/cardinalstar/cubicchunks/CubicChunksConfig.java

@@ -42,11 +42,6 @@
 @Config(modid = CubicChunks.MODID, category = "general")
 public class CubicChunksConfig {
 
-    @Config.Comment("Eliminates a few data copies in compatibility generator. May break some mods."
-        + " Disable if you experience issues in modded dimensions or world types")
-    @Config.LangKey("cubicchunks.config.optimized_compatibility_generator")
-    public static boolean optimizedCompatibilityGenerator = true;
-
     @Config.Ignore
     public static Map<Integer, FillerInfo> configuredDimensionalFillerMap = new HashMap<>();
 

src/main/java/com/cardinalstar/cubicchunks/api/CCAPI.java

@@ -13,6 +13,7 @@
 import com.cardinalstar.cubicchunks.world.api.ICubeProviderServer;
 import com.cardinalstar.cubicchunks.world.api.ICubeProviderServer.Requirement;
 import com.cardinalstar.cubicchunks.world.column.EmptyEBS;
+import com.cardinalstar.cubicchunks.world.cube.Cube;
 import com.google.common.collect.AbstractIterator;
 
 @SuppressWarnings("unused")
@@ -46,22 +47,22 @@ public static ICube getCube(World world, int cubeX, int cubeY, int cubeZ, Requir
     }
 
     /// Gets all loaded cubes in a column.
-    public static Collection<ICube> getLoadedCubes(Chunk chunk) {
+    public static Collection<Cube> getLoadedCubes(Chunk chunk) {
         // noinspection unchecked
-        return (Collection<ICube>) ((IColumn) chunk).getLoadedCubes();
+        return (Collection<Cube>) ((IColumn) chunk).getLoadedCubes();
     }
 
     /// Gets all loaded block storages in a column.
     public static Iterable<ExtendedBlockStorage> getLoadedBlockStorages(Chunk chunk) {
         return () -> new AbstractIterator<>() {
 
-            private final Iterator<? extends ICube> iter = ((IColumn) chunk).getLoadedCubes()
+            private final Iterator<? extends Cube> iter = ((IColumn) chunk).getLoadedCubes()
                 .iterator();
 
             @Override
             protected ExtendedBlockStorage computeNext() {
                 while (iter.hasNext()) {
-                    ICube cube = iter.next();
+                    Cube cube = iter.next();
 
                     if (cube == null) continue;
 

src/main/java/com/cardinalstar/cubicchunks/api/IColumn.java

@@ -26,7 +26,10 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
+
 import com.cardinalstar.cubicchunks.util.XZAddressable;
+import com.cardinalstar.cubicchunks.world.cube.Cube;
 
 @ParametersAreNonnullByDefault
 public interface IColumn extends XZAddressable {
@@ -85,7 +88,10 @@ public interface IColumn extends XZAddressable {
      *
      * @return the cubes
      */
-    Collection<? extends ICube> getLoadedCubes();
+    Collection<? extends Cube> getLoadedCubes();
+
+    /// Returns an array of contained EBSes that need to be ticked.
+    ExtendedBlockStorage[] getTickableStorages();
 
     /**
      * Iterate over all loaded cubes in this column in order. If {@code startY < endY}, order is bottom to top,
@@ -96,43 +102,40 @@ public interface IColumn extends XZAddressable {
      *
      * @return an iterator over all loaded cubes between {@code startY} and {@code endY} (inclusive)
      */
-    Iterable<? extends ICube> getLoadedCubes(int startY, int endY);
+    Iterable<? extends Cube> getLoadedCubes(int startY, int endY);
 
     /**
      * Retrieve the cube at the specified location if it is loaded.
      *
      * @param cubeY cube y position
-     *
      * @return the cube at that position, or {@code null} if it is not loaded
      */
     @Nullable
-    ICube getLoadedCube(int cubeY);
+    Cube getLoadedCube(int cubeY);
 
     /**
      * Retrieve the cube at the specified location
      *
      * @param cubeY cube y position
-     *
      * @return the cube at that position
      */
-    ICube getCube(int cubeY);
+    Cube getCube(int cubeY);
 
     /**
      * Add a cube to this column
      *
      * @param cube the cube being added
      */
-    void addCube(ICube cube);
+    void addCube(Cube cube);
 
     /**
      * Remove the cube at the specified height
      *
      * @param cubeY cube y position
-     *
      * @return the removed cube if it existed, otherwise {@code null}
      */
     @Nullable
-    ICube removeCube(int cubeY);
+    Cube removeCube(int cubeY);
 
     /**
      * Check if there are any loaded cube in this column
@@ -149,5 +152,5 @@ public interface IColumn extends XZAddressable {
      *
      * @param cube the cube to precache
      */
-    void preCacheCube(ICube cube);
+    void preCacheCube(Cube cube);
 }

src/main/java/com/cardinalstar/cubicchunks/api/ICube.java

@@ -186,6 +186,9 @@ public interface ICube extends XYZAddressable, MetaContainer {
     @Nullable
     ExtendedBlockStorage getStorage();
 
+    /// Returns true when this cube's [ExtendedBlockStorage] needs to be ticked.
+    boolean shouldTick();
+
     /**
      * Retrieve a map of positions to their respective tile entities
      *

src/main/java/com/cardinalstar/cubicchunks/api/XYZAddressable.java

@@ -1,25 +1,27 @@
-package com.cardinalstar.cubicchunks.api;/*
-                                          * This file is part of Cubic Chunks Mod, licensed under the MIT License (MIT).
-                                          * Copyright (c) 2015-2021 OpenCubicChunks
-                                          * Copyright (c) 2015-2021 contributors
-                                          * Permission is hereby granted, free of charge, to any person obtaining a copy
-                                          * of this software and associated documentation files (the "Software"), to
-                                          * deal
-                                          * in the Software without restriction, including without limitation the rights
-                                          * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-                                          * copies of the Software, and to permit persons to whom the Software is
-                                          * furnished to do so, subject to the following conditions:
-                                          * The above copyright notice and this permission notice shall be included in
-                                          * all copies or substantial portions of the Software.
-                                          * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-                                          * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-                                          * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-                                          * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-                                          * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-                                          * FROM,
-                                          * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-                                          * THE SOFTWARE.
-                                          */
+/*
+ * This file is part of Cubic Chunks Mod, licensed under the MIT License (MIT).
+ * Copyright (c) 2015-2021 OpenCubicChunks
+ * Copyright (c) 2015-2021 contributors
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.cardinalstar.cubicchunks.api;
 
 public interface XYZAddressable {