From e596814669d4c83dba2ec004e00d5ccf14fbb513 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Tue, 15 Sep 2020 00:19:36 +0200
Subject: [PATCH] Crash fix, world time fix, Java 8 support

Skip dimensions that are already registered (#1)
Fix world time setting (#2)
Use Jabel to support Java 8
I'm not giving my vars up
---
 pom.xml                                       | 46 +++++++++++++++++--
 .../customdimensions/CustomDimensions.java    | 14 +++++-
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ecb9bda..86eb3ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,21 @@
 
     <groupId>com.github.TBMCPlugins</groupId>
     <artifactId>CustomDimensions</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>10</source>
-                    <target>10</target>
+                    <!-- Make sure we're not using Java 9+ APIs -->
+                    <release>8</release>
+                    <source>14</source>
+                    <target>14</target>
+                    <compilerArgs>
+                        <arg>-Xplugin:jabel</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>
@@ -25,6 +31,10 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -34,6 +44,36 @@
             <version>1.16.3-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.bsideup.jabel</groupId>
+            <artifactId>jabel-javac-plugin</artifactId>
+            <version>0.3.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>intellij-idea-only</id>
+            <activation>
+                <property>
+                    <name>idea.maven.embedder.version</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <release>14</release>
+                            <compilerArgs>
+                                <arg>--enable-preview</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file
diff --git a/src/main/java/buttondevteam/customdimensions/CustomDimensions.java b/src/main/java/buttondevteam/customdimensions/CustomDimensions.java
index 418493b..b7cdd19 100644
--- a/src/main/java/buttondevteam/customdimensions/CustomDimensions.java
+++ b/src/main/java/buttondevteam/customdimensions/CustomDimensions.java
@@ -91,8 +91,16 @@ public class CustomDimensions extends JavaPlugin implements Listener {
 				List<MobSpawner> spawners = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(worlddata));
 
 				ResourceKey<DimensionManager> dimManResKey = ResourceKey.a(IRegistry.K, dimKey.a());
+				var dimRegistry = ((RegistryMaterials<DimensionManager>) console.customRegistry.a());
+				{
+					var key = dimRegistry.getKey(dimensionmanager);
+					if (key != null) { //The loaded manager is the same
+						getLogger().warning("Dimension manager already loaded with key " + key + "! Skipping");
+						continue;
+					}
+				}
 				//Replace existing dimension manager, correctly setting the ID up (which is -1 for default worlds...)
-				((RegistryMaterials<DimensionManager>) console.customRegistry.a()).a(OptionalInt.empty(), dimManResKey, dimensionmanager, Lifecycle.stable());
+				dimRegistry.a(OptionalInt.empty(), dimManResKey, dimensionmanager, Lifecycle.stable());
 
 				var worldloadlistener = console.worldLoadListenerFactory.create(11);
 
@@ -100,7 +108,9 @@ public class CustomDimensions extends JavaPlugin implements Listener {
 						worlddata, worldKey, dimensionmanager, worldloadlistener, chunkgenerator,
 						false, //isDebugWorld
 						BiomeManager.a(worlddata.getGeneratorSettings().getSeed()), //Biome seed
-						spawners, false, org.bukkit.World.Environment.NORMAL, null);
+						spawners,
+						true, //Update world time
+						org.bukkit.World.Environment.NORMAL, null);
 
 				if (Bukkit.getWorld(name.toLowerCase(Locale.ENGLISH)) == null) {
 					getLogger().warning("Failed to load custom dimension " + name);