Merge remote-tracking branch 'origin/master'

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+layout.json

addon.gradle

@@ -1,6 +0,0 @@
-jar {
-    manifest {
-        attributes 'FMLCorePlugin': 'mrtjp.relocation.asm.RelocationPlugin'
-        attributes 'FMLCorePluginContainsFMLMod': true
-    }
-}

dependencies.gradle

@@ -1,3 +1,4 @@
 dependencies {
+    api('com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev')
     api 'com.github.GTNewHorizons:MrTJPCore:1.3.6:dev'
 }

gradle.properties

@@ -128,7 +128,7 @@ mixinsPackage =
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only
 # Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
-coreModClass =
+coreModClass = asm.RelocationPlugin
 
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!

gradle/gradle-daemon-jvm.properties

@@ -7,6 +7,6 @@ toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0
 toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/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/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
 toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
-toolchainVendor=ADOPTIUM
 toolchainVersion=25

src/main/resources/dependancies.info

@@ -1,6 +0,0 @@
-[{
- 	"repo": "https://github.com/GTNewHorizons/MrTJPCore/releases/download/1.1.1/",
- 	"file": "MrTJPCore-1.7.10-1.1.1.jar",
- 	"dev": "MrTJPCore-1.7.10-1.1.1-dev.jar",
- 	"class": "mrtjp.core.handler.MrTJPCoreMod"
-}]

src/main/scala/mrtjp/relocation/asm/RelocationPlugin.scala

@@ -0,0 +1,19 @@
+package mrtjp.relocation.asm
+
+import java.util.{Map => JMap}
+import cpw.mods.fml.relauncher.IFMLLoadingPlugin
+
+@IFMLLoadingPlugin.MCVersion("1.7.10")
+@IFMLLoadingPlugin.TransformerExclusions(value =
+  Array("mrtjp.relocation.asm.*", "scala")
+)
+class RelocationPlugin extends IFMLLoadingPlugin {
+
+  override def getASMTransformerClass = Array(
+    "mrtjp.relocation.asm.Transformer"
+  )
+  override def getSetupClass = null
+  override def getModContainerClass = null
+  override def getAccessTransformerClass = null
+  override def injectData(data: JMap[String, AnyRef]): Unit = {}
+}

src/main/scala/mrtjp/relocation/asm/Transformer.scala

@@ -5,12 +5,9 @@
  */
 package mrtjp.relocation.asm
 
-import java.util.{Map => JMap}
-
 import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper.{
   INSTANCE => mapper
 }
-import cpw.mods.fml.relauncher.{IFMLCallHook, IFMLLoadingPlugin}
 import mrtjp.relocation.handler.RelocationMod
 import net.minecraft.launchwrapper.{IClassTransformer, Launch}
 import org.objectweb.asm.Opcodes._
@@ -19,24 +16,6 @@ import org.objectweb.asm.{ClassReader, ClassWriter}
 
 import scala.collection.JavaConversions._
 
-/** Add "Dfml.coreMods.load=mrtjp.relocation.asm.RelocationPlugin" to launch
-  * configs to enable in a development workspace.
-  */
-@IFMLLoadingPlugin.MCVersion("1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions(value =
-  Array("mrtjp.relocation.asm.*", "scala")
-)
-class RelocationPlugin extends IFMLLoadingPlugin with IFMLCallHook {
-  override def getASMTransformerClass = Array(
-    "mrtjp.relocation.asm.Transformer"
-  )
-  override def getSetupClass = "mrtjp.relocation.asm.RelocationPlugin"
-  override def getModContainerClass = null
-  override def getAccessTransformerClass = null
-  override def injectData(data: JMap[String, AnyRef]): Unit = {}
-  override def call(): Void = null
-}
-
 class Transformer extends IClassTransformer {
   type MethodChecker = (String, MethodNode) => Boolean
   type InsTransformer = MethodNode => Unit

src/main/scala/mrtjp/relocation/events.scala

@@ -52,7 +52,9 @@ object RelocationClientEventHandler {
 
   @SubscribeEvent
   def clientTick(event: TickEvent.ClientTickEvent) {
-    if (event.phase == TickEvent.Phase.END)
+    if (event.phase == TickEvent.Phase.END) {
       MovementManager2.onTick(true)
+      MovingRenderer.onTick()
+    }
   }
 }

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

@@ -106,6 +106,13 @@ object MovingRenderer {
         render(b.x, b.y, b.z, renderPos(s, frame))
   }
 
+  def onTick() = {
+    if (oldWorld != null && world == null) {
+      oldWorld = null
+      renderBlocks = null
+    }
+  }
+
   def onPreRenderTick(time: Float) {
     isRendering = true
     frame = time