update

dependencies.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    api 'com.github.GTNewHorizons:MrTJPCore:1.1.6:dev'
+    api 'com.github.GTNewHorizons:MrTJPCore:1.3.0:dev'
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = ForgeRelocation
 modGroup = mrtjp.relocation
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -85,6 +85,11 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
@@ -117,9 +122,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
 }
 
 

src/main/resources/assets/mcframes/lang/en_US.lang

@@ -1,2 +1,5 @@
+tile.relocation.blockmovingrow.name=Moving Block
+
 tile.mcframes.frame.name=Frame
-tile.mcframes.motor|0.name=Debug Frame Motor
+tile.mcframes.motor.name=Debug Frame Motor
+tile.mcframes.motor|0.name=Debug Frame Motor

src/main/scala/mrtjp/mcframes/frame.scala

@@ -191,9 +191,9 @@ object RenderFrame extends ISimpleBlockRenderingHandler {
   ) {
     TextureUtils.bindAtlas(0)
     val state = CCRenderState.instance
-    state.reset()
+    state.resetInstance()
     state.lightMatrix.locate(w, x, y, z)
-    state.setBrightness(w, x, y, z)
+    state.setBrightnessInstance(w, x, y, z)
 
     if (r.hasOverrideBlockTexture) {
       getOrGenerateModel(0).render(
@@ -206,15 +206,15 @@ object RenderFrame extends ISimpleBlockRenderingHandler {
   def renderInvBlock(r: RenderBlocks, meta: Int) {
     TextureUtils.bindAtlas(0)
     val state = CCRenderState.instance
-    state.reset()
-    state.setDynamic()
-    state.pullLightmap()
+    state.resetInstance()
+    state.setDynamicInstance()
+    state.pullLightmapInstance()
 
-    state.startDrawing()
+    state.startDrawingInstance()
     RenderFrame.render(new Vector3(-0.5, -0.5, -0.5), 0)
 
-    state.render()
-    state.draw()
+    state.renderInstance()
+    state.drawInstance()
   }
 
   def registerIcons(reg: IIconRegister) {

src/main/scala/mrtjp/relocation/movement.scala

@@ -17,17 +17,18 @@ import net.minecraft.client.Minecraft
 import net.minecraft.init.Blocks
 import net.minecraft.world.{ChunkCoordIntPair, World}
 import net.minecraftforge.common.DimensionManager
-
+import scala.collection.concurrent.TrieMap
 import scala.collection.mutable.{
   HashMap => MHashMap,
   MultiMap => MMultiMap,
   Set => MSet
 }
+
 import scala.ref.WeakReference
 
 object MovementManager2 {
   val serverRelocations = MHashMap[Int, WorldStructs]()
-  val clientRelocations = MHashMap[Int, WorldStructs]()
+  val clientRelocations = TrieMap[Int, WorldStructs]()
 
   def relocationMap(isClient: Boolean) =
     if (isClient) clientRelocations else serverRelocations
@@ -106,8 +107,10 @@ object MovementManager2 {
     RelocationSPH.forceSendData()
   }
 
-  def isMoving(w: World, x: Int, y: Int, z: Int) =
-    getWorldStructs(w).contains(x, y, z)
+  def isMoving(w: World, x: Int, y: Int, z: Int) = {
+    if (w == null) false
+    else getWorldStructs(w).contains(x, y, z)
+  }
 
   def addStructToWorld(w: World, b: BlockStruct) {
     getWorldStructs(w).addStruct(b)

src/main/scala/mrtjp/relocation/renders.scala

@@ -32,7 +32,6 @@ object MovingRenderer {
 
   private def mc = Minecraft.getMinecraft
   private def world = mc.theWorld
-  private def tes = Tessellator.instance
 
   private def render(x: Int, y: Int, z: Int, rpos: Vector3) {
     val oldOcclusion = mc.gameSettings.ambientOcclusion
@@ -65,8 +64,9 @@ object MovingRenderer {
     )
 
     for (pass <- 0 to 1) {
-      tes.startDrawingQuads()
-      tes.setTranslation(
+      val tess = Tessellator.instance
+      tess.startDrawingQuads()
+      tess.setTranslation(
         -TileEntityRendererDispatcher.staticPlayerX + MathLib
           .clamp(-1f, 1f, rpos.x.toFloat),
         -TileEntityRendererDispatcher.staticPlayerY + MathLib
@@ -77,7 +77,7 @@ object MovingRenderer {
           rpos.z.toFloat
         )
       )
-      tes.setColorOpaque(1, 1, 1)
+      tess.setColorOpaque(1, 1, 1)
 
       block.getRenderBlockPass
       if (block.canRenderInPass(pass)) {
@@ -86,8 +86,8 @@ object MovingRenderer {
         renderHack = true
       }
 
-      tes.setTranslation(0, 0, 0)
-      tes.draw()
+      tess.setTranslation(0, 0, 0)
+      tess.draw()
     }
     RenderHelper.enableStandardItemLighting()
     mc.entityRenderer.disableLightmap(frame)