Compare commits
No commits in common. "master" and "v1.4" have entirely different histories.
5 changed files with 11 additions and 115 deletions
57
.github/workflows/maven.yml
vendored
57
.github/workflows/maven.yml
vendored
|
@ -1,57 +0,0 @@
|
||||||
# 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 }}
|
|
|
@ -1,6 +1,5 @@
|
||||||
![Java CI with Maven](https://github.com/TBMCPlugins/CustomDimensions/workflows/Java%20CI%20with%20Maven/badge.svg)
|
|
||||||
# CustomDimensions
|
# CustomDimensions
|
||||||
Custom dimension support for 1.16.4 Bukkit/Spigot/Paper servers
|
Custom dimension support for 1.16.3 Bukkit/Spigot/Paper servers
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
See on [SpigotMC](https://www.spigotmc.org/resources/1-16-custom-dimensions.83731/)
|
See on [SpigotMC](https://www.spigotmc.org/resources/1-16-custom-dimensions.83731/)
|
||||||
|
|
30
pom.xml
30
pom.xml
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<groupId>com.github.TBMCPlugins</groupId>
|
<groupId>com.github.TBMCPlugins</groupId>
|
||||||
<artifactId>CustomDimensions</artifactId>
|
<artifactId>CustomDimensions</artifactId>
|
||||||
<version>1.6.0</version>
|
<version>1.4</version>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -23,28 +23,6 @@
|
||||||
</compilerArgs>
|
</compilerArgs>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</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>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
@ -72,12 +50,6 @@
|
||||||
<version>0.3.0</version>
|
<version>0.3.0</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.bstats</groupId>
|
|
||||||
<artifactId>bstats-bukkit</artifactId>
|
|
||||||
<version>2.2.1</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
|
|
|
@ -3,11 +3,8 @@ package buttondevteam.customdimensions;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.util.concurrent.Callables;
|
|
||||||
import com.mojang.serialization.Lifecycle;
|
import com.mojang.serialization.Lifecycle;
|
||||||
import net.minecraft.server.v1_16_R3.*;
|
import net.minecraft.server.v1_16_R3.*;
|
||||||
import org.bstats.bukkit.Metrics;
|
|
||||||
import org.bstats.charts.SimplePie;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.WorldType;
|
import org.bukkit.WorldType;
|
||||||
import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
|
import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
|
||||||
|
@ -21,11 +18,8 @@ import java.io.IOException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class CustomDimensions extends JavaPlugin implements Listener {
|
public class CustomDimensions extends JavaPlugin implements Listener {
|
||||||
private Metrics metrics;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
metrics = new Metrics(this, 10545);
|
|
||||||
getLogger().info("Loading custom dimensions...");
|
getLogger().info("Loading custom dimensions...");
|
||||||
try {
|
try {
|
||||||
load();
|
load();
|
||||||
|
@ -52,42 +46,33 @@ public class CustomDimensions extends JavaPlugin implements Listener {
|
||||||
saveConfig();
|
saveConfig();
|
||||||
}
|
}
|
||||||
var ignored = getConfig().getStringList("ignored");
|
var ignored = getConfig().getStringList("ignored");
|
||||||
int allCount = -3, loadedCount = 0, ignoredCount = 0; //-3: overworld, nether, end
|
|
||||||
for (var dimEntry : dimensionRegistry.d()) {
|
for (var dimEntry : dimensionRegistry.d()) {
|
||||||
allCount++;
|
|
||||||
if (ignored.contains(dimEntry.getKey().a().getKey())) {
|
if (ignored.contains(dimEntry.getKey().a().getKey())) {
|
||||||
getLogger().info(dimEntry.getKey() + " is on the ignore list");
|
getLogger().info(dimEntry.getKey() + " is on the ignore list");
|
||||||
ignoredCount++;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (loadDimension(dimEntry.getKey(), dimEntry.getValue(), convertable, console, mainWorld))
|
loadDimension(dimEntry.getKey(), dimEntry.getValue(), convertable, console, mainWorld);
|
||||||
loadedCount++;
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
getLogger().warning("Failed to load dimension " + dimEntry.getKey());
|
getLogger().warning("Failed to load dimension " + dimEntry.getKey());
|
||||||
e.printStackTrace();
|
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 + "")));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean loadDimension(ResourceKey<WorldDimension> dimKey, WorldDimension dimension,
|
private void loadDimension(ResourceKey<WorldDimension> dimKey, WorldDimension dimension,
|
||||||
Convertable convertable, DedicatedServer console, org.bukkit.World mainWorld) throws IOException {
|
Convertable convertable, DedicatedServer console, org.bukkit.World mainWorld) throws IOException {
|
||||||
if (dimKey == WorldDimension.OVERWORLD //The default dimensions are already loaded
|
if (dimKey == WorldDimension.OVERWORLD //The default dimensions are already loaded
|
||||||
|| dimKey == WorldDimension.THE_NETHER
|
|| dimKey == WorldDimension.THE_NETHER
|
||||||
|| dimKey == WorldDimension.THE_END)
|
|| dimKey == WorldDimension.THE_END)
|
||||||
return false;
|
return;
|
||||||
ResourceKey<World> worldKey = ResourceKey.a(IRegistry.L, dimKey.a());
|
ResourceKey<World> worldKey = ResourceKey.a(IRegistry.L, dimKey.a());
|
||||||
DimensionManager dimensionmanager = dimension.b();
|
DimensionManager dimensionmanager = dimension.b();
|
||||||
ChunkGenerator chunkgenerator = dimension.c();
|
ChunkGenerator chunkgenerator = dimension.c();
|
||||||
String name = getConfig().getString("worldNames." + dimKey.a());
|
var name = dimKey.a().getKey();
|
||||||
if (name == null)
|
|
||||||
name = dimKey.a().getKey();
|
|
||||||
if (Bukkit.getWorld(name) != null) {
|
if (Bukkit.getWorld(name) != null) {
|
||||||
getLogger().info(name + " already loaded");
|
getLogger().info(name + " already loaded");
|
||||||
return false;
|
return;
|
||||||
}
|
}
|
||||||
getLogger().info("Loading " + name);
|
getLogger().info("Loading " + name);
|
||||||
var session = convertable.new ConversionSession(name, dimKey) { //The original session isn't prepared for custom dimensions
|
var session = convertable.new ConversionSession(name, dimKey) { //The original session isn't prepared for custom dimensions
|
||||||
|
@ -148,7 +133,6 @@ public class CustomDimensions extends JavaPlugin implements Listener {
|
||||||
|
|
||||||
if (Bukkit.getWorld(name.toLowerCase(Locale.ENGLISH)) == null) {
|
if (Bukkit.getWorld(name.toLowerCase(Locale.ENGLISH)) == null) {
|
||||||
getLogger().warning("Failed to load custom dimension " + name);
|
getLogger().warning("Failed to load custom dimension " + name);
|
||||||
return false;
|
|
||||||
} else {
|
} else {
|
||||||
console.initWorld(worldserver, worlddata, worlddata, worlddata.getGeneratorSettings());
|
console.initWorld(worldserver, worlddata, worlddata, worlddata.getGeneratorSettings());
|
||||||
worldserver.setSpawnFlags(true, true);
|
worldserver.setSpawnFlags(true, true);
|
||||||
|
@ -156,7 +140,6 @@ public class CustomDimensions extends JavaPlugin implements Listener {
|
||||||
Bukkit.getPluginManager().callEvent(new WorldInitEvent(worldserver.getWorld()));
|
Bukkit.getPluginManager().callEvent(new WorldInitEvent(worldserver.getWorld()));
|
||||||
console.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
|
console.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
|
||||||
Bukkit.getPluginManager().callEvent(new WorldLoadEvent(worldserver.getWorld()));
|
Bukkit.getPluginManager().callEvent(new WorldLoadEvent(worldserver.getWorld()));
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
name: CustomDimensions
|
name: CustomDimensions
|
||||||
main: buttondevteam.customdimensions.CustomDimensions
|
main: buttondevteam.customdimensions.CustomDimensions
|
||||||
version: '1.6'
|
version: '1.4'
|
||||||
api-version: '1.16'
|
api-version: '1.16'
|
||||||
loadbefore:
|
loadbefore:
|
||||||
- Multiverse-Core
|
- Multiverse-Core
|
||||||
- Hyperverse
|
|
||||||
|
|
Loading…
Reference in a new issue