1.16.4 release

Load before hyperverse and create automatic releases

.github/workflows/maven.yml

@@ -0,0 +1,57 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    tags:
+    - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Get version information
+      id: version
+      uses: ncipollo/semantic-version-action@v1
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+        java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
+        architecture: x86 # (x64 or x86) - defaults to x64
+    - run: wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+    - run: java -jar BuildTools.jar --rev 1.16.4
+    - name: Cache Maven packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+    - name: Build with Maven
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: mvn -B package --file pom.xml
+    - run: mkdir staging && cp target/*.jar staging
+    - name: Generate release diff
+      env:
+        BEGIN_COMMIT: ${{ steps.version.outputs.previous_tag }}
+        END_COMMIT: ${{ steps.version.outputs.tag }}
+      run: git fetch --tags --force && git log --pretty=format:"* %s (%h)" ${BEGIN_COMMIT}..${END_COMMIT} > release_notes.md
+    - name: Create release
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: staging/*
+        allowUpdates: true
+        bodyFile: "release_notes.md"
+        draft: false
+        prerelease: false
+        token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,5 +1,6 @@
+![Java CI with Maven](https://github.com/TBMCPlugins/CustomDimensions/workflows/Java%20CI%20with%20Maven/badge.svg)
 # CustomDimensions
-Custom dimension support for 1.16.3 Bukkit/Spigot/Paper servers
+Custom dimension support for 1.16.4 Bukkit/Spigot/Paper servers
 
 ## Usage
 See on [SpigotMC](https://www.spigotmc.org/resources/1-16-custom-dimensions.83731/)

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.TBMCPlugins</groupId>
     <artifactId>CustomDimensions</artifactId>
-    <version>1.2</version>
+    <version>1.6.0</version>
     <build>
         <plugins>
             <plugin>
@@ -23,6 +23,28 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>buttondevteam.customdimensions.bstats</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -41,7 +63,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.16.3-R0.1-SNAPSHOT</version>
+            <version>1.16.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -50,6 +72,12 @@
             <version>0.3.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -76,4 +104,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

src/main/java/buttondevteam/customdimensions/CustomDimensions.java

@@ -2,23 +2,30 @@ package buttondevteam.customdimensions;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Callables;
 import com.mojang.serialization.Lifecycle;
-import net.minecraft.server.v1_16_R2.*;
+import net.minecraft.server.v1_16_R3.*;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.WorldType;
-import org.bukkit.craftbukkit.v1_16_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 
 public class CustomDimensions extends JavaPlugin implements Listener {
+	private Metrics metrics;
+
 	@Override
 	public void onEnable() {
-		//Bukkit.getPluginManager().registerEvents(this, this);
+		metrics = new Metrics(this, 10545);
 		getLogger().info("Loading custom dimensions...");
 		try {
 			load();
@@ -36,93 +43,120 @@ public class CustomDimensions extends JavaPlugin implements Listener {
 		GeneratorSettings mainGenSettings = saveData.getGeneratorSettings();
 		RegistryMaterials<WorldDimension> dimensionRegistry = mainGenSettings.d();
 
-		var dimIterator = dimensionRegistry.d().iterator();
-
 		var mainWorld = Bukkit.getWorlds().get(0);
 
 		var convertable = Convertable.a(Bukkit.getWorldContainer().toPath());
 
-		while (dimIterator.hasNext()) {
-			Map.Entry<ResourceKey<WorldDimension>, WorldDimension> dimEntry = dimIterator.next();
-			ResourceKey<WorldDimension> dimKey = dimEntry.getKey();
+		if (!getConfig().contains("ignored")) {
+			getConfig().set("ignored", Lists.newArrayList("single_biome"));
+			saveConfig();
+		}
+		var ignored = getConfig().getStringList("ignored");
+		int allCount = -3, loadedCount = 0, ignoredCount = 0; //-3: overworld, nether, end
+		for (var dimEntry : dimensionRegistry.d()) {
+			allCount++;
+			if (ignored.contains(dimEntry.getKey().a().getKey())) {
+				getLogger().info(dimEntry.getKey() + " is on the ignore list");
+				ignoredCount++;
+				continue;
+			}
+			try {
+				if (loadDimension(dimEntry.getKey(), dimEntry.getValue(), convertable, console, mainWorld))
+					loadedCount++;
+			} catch (Exception e) {
+				getLogger().warning("Failed to load dimension " + dimEntry.getKey());
+				e.printStackTrace();
+			}
+		}
+		metrics.addCustomChart(new SimplePie("all_custom_dimensions", Callables.returning(allCount + "")));
+		metrics.addCustomChart(new SimplePie("loaded_custom_dimensions", Callables.returning(loadedCount + "")));
+		metrics.addCustomChart(new SimplePie("ignored_custom_dimensions", Callables.returning(ignoredCount + "")));
+	}
 
-			if (dimKey != WorldDimension.OVERWORLD //The default dimensions are already loaded
-					&& dimKey != WorldDimension.THE_NETHER
-					&& dimKey != WorldDimension.THE_END) {
-				ResourceKey<World> worldKey = ResourceKey.a(IRegistry.L, dimKey.a());
-				DimensionManager dimensionmanager = dimEntry.getValue().b();
-				ChunkGenerator chunkgenerator = dimEntry.getValue().c();
-				var name = dimKey.a().getKey();
-				getLogger().info("Loading " + name);
-				var session = convertable.new ConversionSession(name, dimKey) { //The original session isn't prepared for custom dimensions
-					@Override
-					public File a(ResourceKey<World> resourcekey) {
-						return new File(this.folder.toFile(), "custom");
-					}
-				};
-				MinecraftServer.convertWorld(session);
+	private boolean loadDimension(ResourceKey<WorldDimension> dimKey, WorldDimension dimension,
+	                              Convertable convertable, DedicatedServer console, org.bukkit.World mainWorld) throws IOException {
+		if (dimKey == WorldDimension.OVERWORLD //The default dimensions are already loaded
+				|| dimKey == WorldDimension.THE_NETHER
+				|| dimKey == WorldDimension.THE_END)
+			return false;
+		ResourceKey<World> worldKey = ResourceKey.a(IRegistry.L, dimKey.a());
+		DimensionManager dimensionmanager = dimension.b();
+		ChunkGenerator chunkgenerator = dimension.c();
+		String name = getConfig().getString("worldNames." + dimKey.a());
+		if (name == null)
+			name = dimKey.a().getKey();
+		if (Bukkit.getWorld(name) != null) {
+			getLogger().info(name + " already loaded");
+			return false;
+		}
+		getLogger().info("Loading " + name);
+		var session = convertable.new ConversionSession(name, dimKey) { //The original session isn't prepared for custom dimensions
+			@Override
+			public File a(ResourceKey<World> resourcekey) {
+				return new File(this.folder.toFile(), "custom");
+			}
+		};
+		MinecraftServer.convertWorld(session);
 
-				//Load world settings or create default values
-				RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a(DynamicOpsNBT.a, console.dataPackResources.h(), console.customRegistry);
-				WorldDataServer worlddata = (WorldDataServer) session.a(registryreadops, console.datapackconfiguration);
-				if (worlddata == null) {
-					Properties properties = new Properties();
-					properties.put("level-seed", Objects.toString(mainWorld.getSeed()));
-					properties.put("generate-structures", Objects.toString(true));
-					properties.put("level-type", WorldType.NORMAL.getName());
-					GeneratorSettings dimGenSettings = GeneratorSettings.a(console.getCustomRegistry(), properties);
-					WorldSettings worldSettings = new WorldSettings(name,
-							EnumGamemode.getById(Bukkit.getDefaultGameMode().getValue()),
-							false, //Hardcore
-							EnumDifficulty.EASY, false, new GameRules(), console.datapackconfiguration);
-					worlddata = new WorldDataServer(worldSettings, dimGenSettings, Lifecycle.stable());
-				}
+		//Load world settings or create default values
+		RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a(DynamicOpsNBT.a, console.dataPackResources.h(), console.customRegistry);
+		WorldDataServer worlddata = (WorldDataServer) session.a(registryreadops, console.datapackconfiguration);
+		if (worlddata == null) {
+			Properties properties = new Properties();
+			properties.put("level-seed", Objects.toString(mainWorld.getSeed()));
+			properties.put("generate-structures", Objects.toString(true));
+			properties.put("level-type", WorldType.NORMAL.getName());
+			GeneratorSettings dimGenSettings = GeneratorSettings.a(console.getCustomRegistry(), properties);
+			WorldSettings worldSettings = new WorldSettings(name,
+					EnumGamemode.getById(Bukkit.getDefaultGameMode().getValue()),
+					false, //Hardcore
+					EnumDifficulty.EASY, false, new GameRules(), console.datapackconfiguration);
+			worlddata = new WorldDataServer(worldSettings, dimGenSettings, Lifecycle.stable());
+		}
 
-				worlddata.checkName(name);
-				worlddata.a(console.getServerModName(), console.getModded().isPresent());
-				if (console.options.has("forceUpgrade")) {
-					net.minecraft.server.v1_16_R2.Main.convertWorld(session, DataConverterRegistry.a(),
-							console.options.has("eraseCache"), () -> true,
-							worlddata.getGeneratorSettings().d().d().stream()
-									.map((entry2) -> ResourceKey.a(IRegistry.K, entry2.getKey().a()))
-									.collect(ImmutableSet.toImmutableSet()));
-				}
+		worlddata.checkName(name);
+		worlddata.a(console.getServerModName(), console.getModded().isPresent());
+		if (console.options.has("forceUpgrade")) {
+			net.minecraft.server.v1_16_R3.Main.convertWorld(session, DataConverterRegistry.a(),
+					console.options.has("eraseCache"), () -> true,
+					worlddata.getGeneratorSettings().d().d().stream()
+							.map((entry2) -> ResourceKey.a(IRegistry.K, entry2.getKey().a()))
+							.collect(ImmutableSet.toImmutableSet()));
+		}
 
-				List<MobSpawner> spawners = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(worlddata));
+		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;
-					}
-				}
+		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 different - different dimension type
 				//Replace existing dimension manager, correctly setting the ID up (which is -1 for default worlds...)
 				dimRegistry.a(OptionalInt.empty(), dimManResKey, dimensionmanager, Lifecycle.stable());
-
-				var worldloadlistener = console.worldLoadListenerFactory.create(11);
-
-				WorldServer worldserver = new WorldServer(console, console.executorService, session,
-						worlddata, worldKey, dimensionmanager, worldloadlistener, chunkgenerator,
-						false, //isDebugWorld
-						BiomeManager.a(worlddata.getGeneratorSettings().getSeed()), //Biome seed
-						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);
-				} else {
-					console.initWorld(worldserver, worlddata, worlddata, worlddata.getGeneratorSettings());
-					worldserver.setSpawnFlags(true, true);
-					console.worldServer.put(worldserver.getDimensionKey(), worldserver);
-					Bukkit.getPluginManager().callEvent(new WorldInitEvent(worldserver.getWorld()));
-					console.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
-					Bukkit.getPluginManager().callEvent(new WorldLoadEvent(worldserver.getWorld()));
-				}
 			}
 		}
+
+		var worldloadlistener = console.worldLoadListenerFactory.create(11);
+
+		WorldServer worldserver = new WorldServer(console, console.executorService, session,
+				worlddata, worldKey, dimensionmanager, worldloadlistener, chunkgenerator,
+				false, //isDebugWorld
+				BiomeManager.a(worlddata.getGeneratorSettings().getSeed()), //Biome seed
+				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);
+			return false;
+		} else {
+			console.initWorld(worldserver, worlddata, worlddata, worlddata.getGeneratorSettings());
+			worldserver.setSpawnFlags(true, true);
+			console.worldServer.put(worldserver.getDimensionKey(), worldserver);
+			Bukkit.getPluginManager().callEvent(new WorldInitEvent(worldserver.getWorld()));
+			console.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
+			Bukkit.getPluginManager().callEvent(new WorldLoadEvent(worldserver.getWorld()));
+			return true;
+		}
 	}
 }

src/main/resources/plugin.yml

@@ -1,6 +1,7 @@
 name: CustomDimensions
 main: buttondevteam.customdimensions.CustomDimensions
-version: '1.2'
+version: '1.6'
 api-version: '1.16'
 loadbefore:
-  - Multiverse-Core
+  - Multiverse-Core
+  - Hyperverse