From a5c3d6d323335bad2f759d5b38dd0989da63dbd3 Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sat, 8 Jun 2024 20:08:08 -0500 Subject: [PATCH] Fix paper compatibility (#645) * Update libraries * Add temporary fix for paper * Update to java 17 * Rename 1.18 package * Rename 1.19 and 1.20 packages * Switch from spigot to paper * Delete Entities.java * Move to new packages * Fix worldutils --- .github/workflows/maven.yml | 44 ++++++++-------- .github/workflows/publish.yml | 44 ++++++++-------- README.md | 10 ++-- modules/Movecraft/pom.xml | 23 +++------ .../net/countercraft/movecraft/Movecraft.java | 22 ++------ .../async/translation/TranslationTask.java | 3 +- .../Movecraft/src/main/resources/config.yml | 1 - modules/api/pom.xml | 28 +++++----- .../countercraft/movecraft/WorldHandler.java | 5 +- .../movecraft/config/Settings.java | 9 +--- .../movecraft/craft/type/CraftType.java | 8 ++- .../movecraft/support/AsyncChunk.java | 9 ++-- .../movecraft/support/MovecraftState.java | 5 ++ .../countercraft/movecraft/util/Entities.java | 51 ------------------- .../movecraft/util/WorldUtils.java | 31 ----------- modules/{v1_18_R2 => v1_18}/pom.xml | 16 +++--- .../compat/v1_18}/IWorldHandler.java | 8 +-- .../compat/v1_18}/NextTickProvider.java | 7 +-- .../movecraft/support/v1_18}/IAsyncChunk.java | 2 +- .../support/v1_18}/ISmoothTeleport.java | 2 +- modules/{v1_19_R3 => v1_19}/pom.xml | 16 +++--- .../compat/v1_19}/IWorldHandler.java | 7 +-- .../compat/v1_19}/NextTickProvider.java | 2 +- .../movecraft/support/v1_19}/IAsyncChunk.java | 2 +- .../support/v1_19}/ISmoothTeleport.java | 2 +- modules/{v1_20_R4 => v1_20}/pom.xml | 16 +++--- .../compat/v1_20}/IWorldHandler.java | 8 +-- .../compat/v1_20}/NextTickProvider.java | 2 +- .../movecraft/support/v1_20}/IAsyncChunk.java | 2 +- .../support/v1_20}/ISmoothTeleport.java | 2 +- pom.xml | 10 ++-- 31 files changed, 136 insertions(+), 261 deletions(-) delete mode 100644 modules/api/src/main/java/net/countercraft/movecraft/util/Entities.java delete mode 100644 modules/api/src/main/java/net/countercraft/movecraft/util/WorldUtils.java rename modules/{v1_18_R2 => v1_18}/pom.xml (93%) rename modules/{v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2 => v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18}/IWorldHandler.java (98%) rename modules/{v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2 => v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18}/NextTickProvider.java (85%) rename modules/{v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2 => v1_18/src/main/java/net/countercraft/movecraft/support/v1_18}/IAsyncChunk.java (97%) rename modules/{v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2 => v1_18/src/main/java/net/countercraft/movecraft/support/v1_18}/ISmoothTeleport.java (98%) rename modules/{v1_19_R3 => v1_19}/pom.xml (93%) rename modules/{v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3 => v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19}/IWorldHandler.java (99%) rename modules/{v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3 => v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19}/NextTickProvider.java (96%) rename modules/{v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3 => v1_19/src/main/java/net/countercraft/movecraft/support/v1_19}/IAsyncChunk.java (97%) rename modules/{v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3 => v1_19/src/main/java/net/countercraft/movecraft/support/v1_19}/ISmoothTeleport.java (98%) rename modules/{v1_20_R4 => v1_20}/pom.xml (93%) rename modules/{v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4 => v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20}/IWorldHandler.java (98%) rename modules/{v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4 => v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20}/NextTickProvider.java (96%) rename modules/{v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4 => v1_20/src/main/java/net/countercraft/movecraft/support/v1_20}/IAsyncChunk.java (97%) rename modules/{v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4 => v1_20/src/main/java/net/countercraft/movecraft/support/v1_20}/ISmoothTeleport.java (98%) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7cc30544f..ddf6498c9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,7 +9,7 @@ on: jobs: # Build 1.18.2 NMS - v1_18_R2: + v1_18: runs-on: ubuntu-latest steps: - name: Set up JDK 17 # 1.18.2 can only be built with Java 17 @@ -25,15 +25,15 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_18_R2 - restore-keys: ${{ runner.os }}-v1_18_R2 + key: ${{ runner.os }}-v1_18 + restore-keys: ${{ runner.os }}-v1_18 - name: Cache Maven packages id: cacheMain uses: actions/cache@v3 with: path: ~/.m2 - key: ${{ runner.os }}-m2-v1_18_R2 - restore-keys: ${{ runner.os }}-m2-v1_18_R2 + key: ${{ runner.os }}-m2-v1_18 + restore-keys: ${{ runner.os }}-m2-v1_18 - name: Setup BuildTools run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar @@ -51,7 +51,7 @@ jobs: run: cd BuildTools && java -jar BuildTools.jar --rev 1.18.2 --remapped # Build 1.19.4 NMS - v1_19_R3: + v1_19: runs-on: ubuntu-latest steps: - name: Set up JDK 17 # 1.19.4 can only be built with Java 17 @@ -67,15 +67,15 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_19_R3 - restore-keys: ${{ runner.os }}-v1_19_R3 + key: ${{ runner.os }}-v1_19 + restore-keys: ${{ runner.os }}-v1_19 - name: Cache Maven packages id: cacheMain uses: actions/cache@v3 with: path: ~/.m2 - key: ${{ runner.os }}-m2-v1_19_R3 - restore-keys: ${{ runner.os }}-m2-v1_19_R3 + key: ${{ runner.os }}-m2-v1_19 + restore-keys: ${{ runner.os }}-m2-v1_19 - name: Setup BuildTools run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar @@ -93,7 +93,7 @@ jobs: run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped # Build 1.20.6 NMS - v1_20_R4: + v1_20: runs-on: ubuntu-latest steps: - name: Set up JDK 21 # 1.20.6 can only be built with Java 21 @@ -109,15 +109,15 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_20_R4 - restore-keys: ${{ runner.os }}-v1_20_R4 + key: ${{ runner.os }}-v1_20 + restore-keys: ${{ runner.os }}-v1_20 - name: Cache Maven packages id: cacheMain uses: actions/cache@v3 with: path: ~/.m2 - key: ${{ runner.os }}-m2-v1_20_R4 - restore-keys: ${{ runner.os }}-m2-v1_20_R4 + key: ${{ runner.os }}-m2-v1_20 + restore-keys: ${{ runner.os }}-m2-v1_20 - name: Setup BuildTools run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar @@ -137,7 +137,7 @@ jobs: # Build Movecraft build: runs-on: ubuntu-latest - needs: [v1_18_R2, v1_19_R3, v1_20_R4] + needs: [v1_18, v1_19, v1_20] steps: - name: Checkout Movecraft @@ -160,8 +160,8 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_18_R2 - restore-keys: ${{ runner.os }}-v1_18_R2 + key: ${{ runner.os }}-v1_18 + restore-keys: ${{ runner.os }}-v1_18 - name: Cache 1.19.4 Maven package uses: actions/cache@v3 with: @@ -169,8 +169,8 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_19_R3 - restore-keys: ${{ runner.os }}-v1_19_R3 + key: ${{ runner.os }}-v1_19 + restore-keys: ${{ runner.os }}-v1_19 - name: Cache 1.20.6 Maven package uses: actions/cache@v3 with: @@ -178,8 +178,8 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_20_R4 - restore-keys: ${{ runner.os }}-v1_20_R4 + key: ${{ runner.os }}-v1_20 + restore-keys: ${{ runner.os }}-v1_20 - name: Build with Maven run: mvn -T 1C -B package --file pom.xml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f56154ca5..85bd962f0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ on: jobs: # Build 1.18.2 NMS - v1_18_R2: + v1_18: runs-on: ubuntu-latest steps: - name: Set up JDK 17 # 1.18.2 can only be built with Java 17 @@ -23,15 +23,15 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_18_R2 - restore-keys: ${{ runner.os }}-v1_18_R2 + key: ${{ runner.os }}-v1_18 + restore-keys: ${{ runner.os }}-v1_18 - name: Cache Maven packages id: cacheMain uses: actions/cache@v3 with: path: ~/.m2 - key: ${{ runner.os }}-m2-v1_18_R2 - restore-keys: ${{ runner.os }}-m2-v1_18_R2 + key: ${{ runner.os }}-m2-v1_18 + restore-keys: ${{ runner.os }}-m2-v1_18 - name: Setup BuildTools run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar @@ -49,7 +49,7 @@ jobs: run: cd BuildTools && java -jar BuildTools.jar --rev 1.18.2 --remapped # Build 1.19.4 NMS - v1_19_R3: + v1_19: runs-on: ubuntu-latest steps: - name: Set up JDK 17 # 1.19.4 can only be built with Java 17 @@ -65,15 +65,15 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_19_R3 - restore-keys: ${{ runner.os }}-v1_19_R3 + key: ${{ runner.os }}-v1_19 + restore-keys: ${{ runner.os }}-v1_19 - name: Cache Maven packages id: cacheMain uses: actions/cache@v3 with: path: ~/.m2 - key: ${{ runner.os }}-m2-v1_19_R3 - restore-keys: ${{ runner.os }}-m2-v1_19_R3 + key: ${{ runner.os }}-m2-v1_19 + restore-keys: ${{ runner.os }}-m2-v1_19 - name: Setup BuildTools run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar @@ -91,7 +91,7 @@ jobs: run: cd BuildTools && java -jar BuildTools.jar --rev 1.19.4 --remapped # Build 1.20.6 NMS - v1_20_R4: + v1_20: runs-on: ubuntu-latest steps: - name: Set up JDK 21 # 1.20.6 can only be built with Java 21 @@ -107,15 +107,15 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_20_R4 - restore-keys: ${{ runner.os }}-v1_20_R4 + key: ${{ runner.os }}-v1_20 + restore-keys: ${{ runner.os }}-v1_20 - name: Cache Maven packages id: cacheMain uses: actions/cache@v3 with: path: ~/.m2 - key: ${{ runner.os }}-m2-v1_20_R4 - restore-keys: ${{ runner.os }}-m2-v1_20_R4 + key: ${{ runner.os }}-m2-v1_20 + restore-keys: ${{ runner.os }}-m2-v1_20 - name: Setup BuildTools run: mkdir BuildTools && wget -O BuildTools/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar @@ -135,7 +135,7 @@ jobs: # Build Movecraft build: runs-on: ubuntu-latest - needs: [v1_18_R2, v1_19_R3, v1_20_R4] + needs: [v1_18, v1_19, v1_20] steps: - name: Checkout Movecraft @@ -158,8 +158,8 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_18_R2 - restore-keys: ${{ runner.os }}-v1_18_R2 + key: ${{ runner.os }}-v1_18 + restore-keys: ${{ runner.os }}-v1_18 - name: Cache 1.19.4 Maven package uses: actions/cache@v3 with: @@ -167,8 +167,8 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.19.4-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_19_R3 - restore-keys: ${{ runner.os }}-v1_19_R3 + key: ${{ runner.os }}-v1_19 + restore-keys: ${{ runner.os }}-v1_19 - name: Cache 1.20.6 Maven package uses: actions/cache@v3 with: @@ -176,8 +176,8 @@ jobs: ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/ ~/.m2/repository/org/spigotmc/spigot-parent/ ~/.m2/repository/org/spigotmc/minecraft-server/ - key: ${{ runner.os }}-v1_20_R4 - restore-keys: ${{ runner.os }}-v1_20_R4 + key: ${{ runner.os }}-v1_20 + restore-keys: ${{ runner.os }}-v1_20 - name: Build with Maven run: mvn -T 1C -B package --file pom.xml diff --git a/README.md b/README.md index b00828283..bd2f8d35c 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,18 @@ Movecraft This is a maintained fork of Movecraft, which aims to add legacy version support as well as performance fixes. -**Movecraft requires at least Java 13** +**Movecraft requires at least Java 17** ## Download -Public builds, as well as builds as old as v5.0 (for 1.9), are located on the [Spigot forums](https://www.spigotmc.org/resources/movecraft.31321/). +Releases can be found on the [releases tab](https://github.com/APDevTeam/Movecraft/releases). -Preliminary builds (including 1.14+ support), can be found on the [releases tab](https://github.com/APDevTeam/Movecraft/releases). - -Development builds can be found under the [actions tab](https://github.com/APDevTeam/Movecraft/actions?query=workflow%3A%22Java+CI%22). Use at your own risk! +Previous builds between v5.0 (for 1.9) and v7 (for 1.12), are located on the [Spigot forums](https://www.spigotmc.org/resources/movecraft.31321/). Legacy builds as old as v0.7.1 (for 1.0.0) can be found on the original [Bukkit page](https://dev.bukkit.org/projects/movecraft). +Development builds can be found under the [actions tab](https://github.com/APDevTeam/Movecraft/actions?query=workflow%3A%22Java+CI%22). Use at your own risk! + ## Support Please check the [Wiki](https://github.com/APDevTeam/Movecraft/wiki) and [FAQ](https://github.com/APDevTeam/Movecraft/wiki/Frequently-Asked-Questions) pages before asking for help! diff --git a/modules/Movecraft/pom.xml b/modules/Movecraft/pom.xml index 31c69edd5..4e3ea2952 100644 --- a/modules/Movecraft/pom.xml +++ b/modules/Movecraft/pom.xml @@ -22,29 +22,22 @@ - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - net.countercraft - movecraft-v1_18_r2 + movecraft-v1_18 ${revision} jar net.countercraft - movecraft-v1_19_r3 + movecraft-v1_19 ${revision} jar net.countercraft - movecraft-v1_20_R4 + movecraft-v1_20 ${revision} jar @@ -125,8 +118,8 @@ maven-compiler-plugin 3.8.1 - 16 - 16 + 17 + 17 @@ -166,19 +159,19 @@ false - net.countercraft:movecraft-v1_18_r2 + net.countercraft:movecraft-v1_18 ** - net.countercraft:movecraft-v1_19_r3 + net.countercraft:movecraft-v1_19 ** - net.countercraft:movecraft-v1_20_R4 + net.countercraft:movecraft-v1_20 ** diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java index 9c4f1dc00..96c7957ab 100644 --- a/modules/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java +++ b/modules/Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java @@ -138,18 +138,17 @@ public void onEnable() { logger.info("No PilotTool setting, using default of stick"); } - String packageName = getServer().getClass().getPackage().getName(); - String version = packageName.substring(packageName.lastIndexOf('.') + 1); - getLogger().info("Loading support for " + version); + String minecraftVersion = getServer().getMinecraftVersion(); + getLogger().info("Loading support for " + minecraftVersion); try { - final Class worldHandlerClazz = Class.forName("net.countercraft.movecraft.compat." + version + ".IWorldHandler"); + final Class worldHandlerClazz = Class.forName("net.countercraft.movecraft.compat." + WorldHandler.getPackageName(minecraftVersion) + ".IWorldHandler"); // Check if we have a NMSHandler class at that location. if (WorldHandler.class.isAssignableFrom(worldHandlerClazz)) { // Make sure it actually implements NMS worldHandler = (WorldHandler) worldHandlerClazz.getConstructor().newInstance(); // Set our handler // Try to setup the smooth teleport handler try { - final Class smoothTeleportClazz = Class.forName("net.countercraft.movecraft.support." + version + ".ISmoothTeleport"); + final Class smoothTeleportClazz = Class.forName("net.countercraft.movecraft.support." + WorldHandler.getPackageName(minecraftVersion) + ".ISmoothTeleport"); if (SmoothTeleport.class.isAssignableFrom(smoothTeleportClazz)) { smoothTeleport = (SmoothTeleport) smoothTeleportClazz.getConstructor().newInstance(); } @@ -207,22 +206,11 @@ public void onEnable() { } } - Settings.DisableShadowBlocks = EnumSet.noneOf(Material.class); //REMOVE FOR PUBLIC VERSION -// for(String s : getConfig().getStringList("DisableShadowBlocks")){ -// Settings.DisableShadowBlocks.add(Material.valueOf(s)); -// } - Settings.ForbiddenRemoteSigns = new HashSet<>(); - for(String s : getConfig().getStringList("ForbiddenRemoteSigns")) { Settings.ForbiddenRemoteSigns.add(s.toLowerCase()); } - if(!Settings.CompatibilityMode) { - for(Material typ : Settings.DisableShadowBlocks) { - worldHandler.disableShadow(typ); - } - } adventure = BukkitAudiences.create(this); if(shuttingDown && Settings.IGNORE_RESET) { @@ -232,7 +220,6 @@ public void onEnable() { return; } - // Startup procedure boolean datapackInitialized = initializeDatapack(); asyncManager = new AsyncManager(); @@ -242,7 +229,6 @@ public void onEnable() { CraftManager.initialize(datapackInitialized); Bukkit.getScheduler().runTaskTimer(this, WorldManager.INSTANCE::run, 0,1); - getServer().getPluginManager().registerEvents(new InteractListener(), this); getCommand("movecraft").setExecutor(new MovecraftCommand()); diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/translation/TranslationTask.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/translation/TranslationTask.java index 6f3729a68..e2713343f 100644 --- a/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/translation/TranslationTask.java +++ b/modules/Movecraft/src/main/java/net/countercraft/movecraft/async/translation/TranslationTask.java @@ -26,7 +26,6 @@ import net.countercraft.movecraft.mapUpdater.update.ItemDropUpdateCommand; import net.countercraft.movecraft.mapUpdater.update.UpdateCommand; import net.countercraft.movecraft.util.Tags; -import net.countercraft.movecraft.util.WorldUtils; import net.countercraft.movecraft.util.hitboxes.HitBox; import net.countercraft.movecraft.util.hitboxes.MutableHitBox; import net.countercraft.movecraft.util.hitboxes.SolidHitBox; @@ -197,7 +196,7 @@ else if (world.equals(craft.getWorld()) int centreMinY = oldHitBox.getMinYAt(midPoint.getX(), midPoint.getZ()); int groundY = centreMinY; World w = craft.getWorld(); - while (groundY - 1 >= WorldUtils.getWorldMinHeightLimit(w) + while (groundY - 1 >= w.getMinHeight() && (w.getBlockAt(midPoint.getX(), groundY - 1, midPoint.getZ()).getType().isAir() || craft.getType().getMaterialSetProperty(CraftType.PASSTHROUGH_BLOCKS).contains( w.getBlockAt(midPoint.getX(), groundY - 1, midPoint.getZ()).getType()))) { diff --git a/modules/Movecraft/src/main/resources/config.yml b/modules/Movecraft/src/main/resources/config.yml index a0fd4dfc0..309288f83 100644 --- a/modules/Movecraft/src/main/resources/config.yml +++ b/modules/Movecraft/src/main/resources/config.yml @@ -26,5 +26,4 @@ ForbiddenRemoteSigns: # These strings will be ignored when searching for signs t - "Mounted" - "Denied" - "[private]" -CompatibilityMode: false GeneratedDatapack: false # Set to false to re-generate datapack on startup \ No newline at end of file diff --git a/modules/api/pom.xml b/modules/api/pom.xml index 7c2f32419..dcabe345b 100644 --- a/modules/api/pom.xml +++ b/modules/api/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 5.9.0 + 5.10.2 ${junit.jupiter.version} 1.2.0 4.13.2 @@ -36,17 +36,21 @@ dmulloy2-repo https://repo.dmulloy2.net/nexus/repository/public/ + + papermc + https://repo.papermc.io/repository/maven-public/ + - org.spigotmc - spigot-api + io.papermc.paper + paper-api 1.18.2-R0.1-SNAPSHOT org.jetbrains annotations - 23.1.0 + 24.1.0 provided @@ -70,34 +74,34 @@ org.openjdk.jmh jmh-core - 1.35 + 1.37 org.openjdk.jmh jmh-generator-annprocess - 1.35 + 1.37 org.roaringbitmap RoaringBitmap - 0.9.32 + 1.0.6 compile it.unimi.dsi fastutil - 8.5.9 + 8.5.13 compile net.kyori adventure-api - 4.12.0 + 4.17.0 net.kyori adventure-platform-bukkit - 4.1.2 + 4.3.2 @@ -117,8 +121,8 @@ net/countercraft/movecraft/** - 13 - 13 + 17 + 17 diff --git a/modules/api/src/main/java/net/countercraft/movecraft/WorldHandler.java b/modules/api/src/main/java/net/countercraft/movecraft/WorldHandler.java index c1e22f55b..67579b1b1 100644 --- a/modules/api/src/main/java/net/countercraft/movecraft/WorldHandler.java +++ b/modules/api/src/main/java/net/countercraft/movecraft/WorldHandler.java @@ -15,7 +15,10 @@ public abstract class WorldHandler { public abstract void translateCraft(@NotNull Craft craft, @NotNull MovecraftLocation newLocation, @NotNull World world); public abstract void setBlockFast(@NotNull Location location, @NotNull BlockData data); public abstract void setBlockFast(@NotNull Location location, @NotNull MovecraftRotation rotation, @NotNull BlockData data); - public abstract void disableShadow(@NotNull Material type); public abstract @Nullable Location getAccessLocation(@NotNull InventoryView inventoryView); public abstract void setAccessLocation(@NotNull InventoryView inventoryView, @NotNull Location location); + + public static @NotNull String getPackageName(@NotNull String minecraftVersion) { + return "v1_" + minecraftVersion.substring(minecraftVersion.indexOf('.') + 1, minecraftVersion.lastIndexOf('.')); + } } diff --git a/modules/api/src/main/java/net/countercraft/movecraft/config/Settings.java b/modules/api/src/main/java/net/countercraft/movecraft/config/Settings.java index dd96bd392..74c94b49c 100644 --- a/modules/api/src/main/java/net/countercraft/movecraft/config/Settings.java +++ b/modules/api/src/main/java/net/countercraft/movecraft/config/Settings.java @@ -29,15 +29,10 @@ public class Settings { public static boolean IGNORE_RESET = false; public static boolean Debug = false; public static boolean DisableNMSCompatibilityCheck = false; - public static int THREAD_POOL_SIZE = 5; - public static List DATA_BLOCKS; public static String LOCALE; public static Material PilotTool = Material.STICK; public static int SilhouetteViewDistance = 200; public static int SilhouetteBlockCount = 20; - public static boolean CompatibilityMode = false; - public static boolean DelayColorChanges = false; - public static double SinkRateTicks = 20.0; public static double SinkCheckTicks = 100.0; public static boolean ProtectPilotedCrafts = false; public static boolean DisableSpillProtection = false; @@ -52,7 +47,5 @@ public class Settings { public static double ManOverboardDistSquared = 1000000; public static int MaxRemoteSigns = -1; public static boolean CraftsUseNetherPortals = false; - - public static EnumSet DisableShadowBlocks; public static HashSet ForbiddenRemoteSigns; -} \ No newline at end of file +} diff --git a/modules/api/src/main/java/net/countercraft/movecraft/craft/type/CraftType.java b/modules/api/src/main/java/net/countercraft/movecraft/craft/type/CraftType.java index 5c3a6b334..2ed26e40d 100644 --- a/modules/api/src/main/java/net/countercraft/movecraft/craft/type/CraftType.java +++ b/modules/api/src/main/java/net/countercraft/movecraft/craft/type/CraftType.java @@ -41,7 +41,6 @@ import net.countercraft.movecraft.processing.MovecraftWorld; import net.countercraft.movecraft.util.Pair; import net.countercraft.movecraft.util.Tags; -import net.countercraft.movecraft.util.WorldUtils; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; import org.bukkit.Bukkit; @@ -478,8 +477,7 @@ public static void registerTypeValidator(Predicate validator, String if(w == null) return type.getIntProperty(MAX_HEIGHT_ABOVE_GROUND); - return Math.min(type.getIntProperty(MAX_HEIGHT_ABOVE_GROUND), - w.getMaxHeight() - WorldUtils.getWorldMinHeightLimit(w)); + return Math.min(type.getIntProperty(MAX_HEIGHT_ABOVE_GROUND), w.getMaxHeight() - w.getMinHeight()); } )); registerProperty(new BooleanProperty("canDirectControl", CAN_DIRECT_CONTROL, type -> true)); @@ -712,7 +710,7 @@ else if (o instanceof Integer) var w = Bukkit.getWorld(i.getKey()); if(w == null) throw new IllegalArgumentException("World '" + i.getKey() + "' does not exist."); - if(value < WorldUtils.getWorldMinHeightLimit(w) || value > w.getMaxHeight()) + if(value < w.getMinHeight() || value > w.getMaxHeight()) return false; } return true; @@ -730,7 +728,7 @@ else if (o instanceof Integer) var w = Bukkit.getWorld(i.getKey()); if(w == null) throw new IllegalArgumentException("World '" + i.getKey() + "' does not exist."); - if(value < WorldUtils.getWorldMinHeightLimit(w) || value > w.getMaxHeight()) + if(value < w.getMinHeight() || value > w.getMaxHeight()) return false; } return true; diff --git a/modules/api/src/main/java/net/countercraft/movecraft/support/AsyncChunk.java b/modules/api/src/main/java/net/countercraft/movecraft/support/AsyncChunk.java index 8794699f2..31d411cb2 100644 --- a/modules/api/src/main/java/net/countercraft/movecraft/support/AsyncChunk.java +++ b/modules/api/src/main/java/net/countercraft/movecraft/support/AsyncChunk.java @@ -1,6 +1,7 @@ package net.countercraft.movecraft.support; import net.countercraft.movecraft.MovecraftLocation; +import net.countercraft.movecraft.WorldHandler; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Material; @@ -15,17 +16,15 @@ public abstract class AsyncChunk { private static final Constructor constructor; static { - String packageName = Bukkit.getServer().getClass().getPackage().getName(); - String version = packageName.substring(packageName.lastIndexOf('.') + 1); Constructor temp = null; try { - Class.forName("net.countercraft.movecraft.support.v1_18_R2.IAsyncChunk"); - final Class clazz = Class.forName("net.countercraft.movecraft.support." + version + ".IAsyncChunk"); + Class.forName("net.countercraft.movecraft.support.v1_18.IAsyncChunk"); + final Class clazz = Class.forName("net.countercraft.movecraft.support." + WorldHandler.getPackageName(Bukkit.getServer().getMinecraftVersion()) + ".IAsyncChunk"); if (AsyncChunk.class.isAssignableFrom(clazz)) { temp = clazz.getConstructor(Chunk.class); } } catch (ClassNotFoundException | NoSuchMethodException | SecurityException exception) { - Bukkit.getLogger().severe(String.format("Error in registering Chunk accessor for version %s from the classpath.", version)); + Bukkit.getLogger().severe(String.format("Error in registering Chunk accessor for version %s from the classpath.", Bukkit.getServer().getMinecraftVersion())); exception.printStackTrace(); } constructor = temp; diff --git a/modules/api/src/main/java/net/countercraft/movecraft/support/MovecraftState.java b/modules/api/src/main/java/net/countercraft/movecraft/support/MovecraftState.java index 8e8abdb1c..4bd39a924 100644 --- a/modules/api/src/main/java/net/countercraft/movecraft/support/MovecraftState.java +++ b/modules/api/src/main/java/net/countercraft/movecraft/support/MovecraftState.java @@ -151,6 +151,11 @@ public boolean isPlaced() { return true; } + @Override + public boolean isCollidable() { + throw new UnsupportedOperationException(); + } + @Override public void setMetadata(@NotNull String s, @NotNull MetadataValue metadataValue) { throw new UnsupportedOperationException(); diff --git a/modules/api/src/main/java/net/countercraft/movecraft/util/Entities.java b/modules/api/src/main/java/net/countercraft/movecraft/util/Entities.java deleted file mode 100644 index 551f0fe05..000000000 --- a/modules/api/src/main/java/net/countercraft/movecraft/util/Entities.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.countercraft.movecraft.util; - -import org.bukkit.Bukkit; -import org.bukkit.entity.EntityType; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class Entities { - - private static Method getID = null; - private static Method getType = null; - private static Constructor minecraftKey = null; - private static Object registryInstance = null; - - static { - String packageName = Bukkit.getServer().getClass().getPackage().getName(); - String version = packageName.substring(packageName.lastIndexOf('.') + 1); - try { - Field registry = Class.forName("net.minecraft.server." + version + ".IRegistry").getField("ENTITY_TYPE"); - registryInstance = registry.get(null); - getID = registry.getDeclaringClass().getMethod("a", Object.class); - var minecraftKeyClass = Class.forName("net.minecraft.server." + version + ".MinecraftKey"); - getType = registry.getDeclaringClass().getMethod("get", minecraftKeyClass); - - minecraftKey = minecraftKeyClass.getConstructor(String.class); - } catch (ClassNotFoundException | NoSuchFieldException | NoSuchMethodException | IllegalAccessException e) { - e.printStackTrace(); - } - } - - /** - * Spigot has stopped updating their internal entity ID's, thus breaking any context in which their use is required - * This will get the actual entity id of an EntityType, from the servers EntityType registry - * @param type entity type to get an id from - * @return correct entity id - */ - @SuppressWarnings("deprecation") - public static int getTypeID(EntityType type){ - try { - var key = minecraftKey.newInstance(type.getName()); - var baseType = getType.invoke(registryInstance, key); - return (int) getID.invoke(registryInstance, baseType); - } catch (IllegalAccessException | InvocationTargetException | InstantiationException e) { - e.printStackTrace(); - return -1; - } - } -} diff --git a/modules/api/src/main/java/net/countercraft/movecraft/util/WorldUtils.java b/modules/api/src/main/java/net/countercraft/movecraft/util/WorldUtils.java deleted file mode 100644 index bf867b6b5..000000000 --- a/modules/api/src/main/java/net/countercraft/movecraft/util/WorldUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.countercraft.movecraft.util; - -import org.bukkit.Bukkit; -import org.bukkit.World; - -public class WorldUtils { - private static Integer minecraftVersion = null; - - private static boolean is1_17OrNewer() { - if(minecraftVersion == null) { - var packageName = Bukkit.getServer().getClass().getPackage().getName(); - var packageVersion = packageName.substring(packageName.lastIndexOf('.') + 1); - var parts = packageVersion.split("_"); - minecraftVersion = Integer.valueOf(parts[1]); - } - return minecraftVersion >= 17; - } - - public static int getWorldMinHeightLimit(World w) { - if(!is1_17OrNewer()) - return 0; - - try { - return (int) World.class.getMethod("getMinHeight").invoke(w); - } - catch (Exception e) { - e.printStackTrace(); - return 0; - } - } -} diff --git a/modules/v1_18_R2/pom.xml b/modules/v1_18/pom.xml similarity index 93% rename from modules/v1_18_R2/pom.xml rename to modules/v1_18/pom.xml index 127a542b1..f69285382 100644 --- a/modules/v1_18_R2/pom.xml +++ b/modules/v1_18/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - movecraft-v1_18_r2 - Movecraft-v1_18_R2 + movecraft-v1_18 + Movecraft-v1_18 jar @@ -38,11 +38,11 @@ 3.8.1 - net/countercraft/movecraft/compat/v1_18_R2/** - net/countercraft/movecraft/support/v1_18_R2/** + net/countercraft/movecraft/compat/v1_18/** + net/countercraft/movecraft/support/v1_18/** - 13 - 13 + 17 + 17 @@ -51,8 +51,8 @@ 2.4 - net/countercraft/movecraft/compat/v1_18_R2/** - net/countercraft/movecraft/support/v1_18_R2/** + net/countercraft/movecraft/compat/v1_18/** + net/countercraft/movecraft/support/v1_18/** diff --git a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2/IWorldHandler.java b/modules/v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/IWorldHandler.java similarity index 98% rename from modules/v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2/IWorldHandler.java rename to modules/v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/IWorldHandler.java index 7a3273961..c4923e6ad 100644 --- a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2/IWorldHandler.java +++ b/modules/v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/IWorldHandler.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.compat.v1_18_R2; +package net.countercraft.movecraft.compat.v1_18; import net.countercraft.movecraft.MovecraftLocation; import net.countercraft.movecraft.MovecraftRotation; @@ -21,7 +21,6 @@ import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.ticks.LevelChunkTicks; import net.minecraft.world.ticks.ScheduledTick; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -261,11 +260,6 @@ public void setBlockFast(@NotNull Location location, @NotNull MovecraftRotation setBlockFast(world, BlockPos, blockData); } - @Override - public void disableShadow(@NotNull Material type) { - // Disabled - } - @Override public @Nullable Location getAccessLocation(@NotNull InventoryView inventoryView) { AbstractContainerMenu menu = ((CraftInventoryView) inventoryView).getHandle(); diff --git a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2/NextTickProvider.java b/modules/v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/NextTickProvider.java similarity index 85% rename from modules/v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2/NextTickProvider.java rename to modules/v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/NextTickProvider.java index d0951ad6b..6f06f05ee 100644 --- a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/compat/v1_18_R2/NextTickProvider.java +++ b/modules/v1_18/src/main/java/net/countercraft/movecraft/compat/v1_18/NextTickProvider.java @@ -1,20 +1,15 @@ -package net.countercraft.movecraft.compat.v1_18_R2; +package net.countercraft.movecraft.compat.v1_18; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.ticks.LevelChunkTicks; -import net.minecraft.world.ticks.LevelTicks; import net.minecraft.world.ticks.ScheduledTick; -import org.bukkit.Bukkit; -import org.bukkit.World; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Field; import java.util.List; -import java.util.Queue; import java.util.stream.Stream; public class NextTickProvider { diff --git a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2/IAsyncChunk.java b/modules/v1_18/src/main/java/net/countercraft/movecraft/support/v1_18/IAsyncChunk.java similarity index 97% rename from modules/v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2/IAsyncChunk.java rename to modules/v1_18/src/main/java/net/countercraft/movecraft/support/v1_18/IAsyncChunk.java index f00641615..8d07b48d5 100644 --- a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2/IAsyncChunk.java +++ b/modules/v1_18/src/main/java/net/countercraft/movecraft/support/v1_18/IAsyncChunk.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.support.v1_18_R2; +package net.countercraft.movecraft.support.v1_18; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2/ISmoothTeleport.java b/modules/v1_18/src/main/java/net/countercraft/movecraft/support/v1_18/ISmoothTeleport.java similarity index 98% rename from modules/v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2/ISmoothTeleport.java rename to modules/v1_18/src/main/java/net/countercraft/movecraft/support/v1_18/ISmoothTeleport.java index 3f123aec3..5c8beb91f 100644 --- a/modules/v1_18_R2/src/main/java/net/countercraft/movecraft/support/v1_18_R2/ISmoothTeleport.java +++ b/modules/v1_18/src/main/java/net/countercraft/movecraft/support/v1_18/ISmoothTeleport.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.support.v1_18_R2; +package net.countercraft.movecraft.support.v1_18; import net.countercraft.movecraft.SmoothTeleport; import net.countercraft.movecraft.util.ReflectUtils; diff --git a/modules/v1_19_R3/pom.xml b/modules/v1_19/pom.xml similarity index 93% rename from modules/v1_19_R3/pom.xml rename to modules/v1_19/pom.xml index 21dbda78c..43d5e94e0 100644 --- a/modules/v1_19_R3/pom.xml +++ b/modules/v1_19/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - movecraft-v1_19_r3 - Movecraft-v1_19_R3 + movecraft-v1_19 + Movecraft-v1_19 jar @@ -38,11 +38,11 @@ 3.8.1 - net/countercraft/movecraft/compat/v1_19_R3/** - net/countercraft/movecraft/support/v1_19_R3/** + net/countercraft/movecraft/compat/v1_19/** + net/countercraft/movecraft/support/v1_19/** - 13 - 13 + 17 + 17 @@ -51,8 +51,8 @@ 2.4 - net/countercraft/movecraft/compat/v1_19_R3/** - net/countercraft/movecraft/support/v1_19_R3/** + net/countercraft/movecraft/compat/v1_19/** + net/countercraft/movecraft/support/v1_19/** diff --git a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3/IWorldHandler.java b/modules/v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19/IWorldHandler.java similarity index 99% rename from modules/v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3/IWorldHandler.java rename to modules/v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19/IWorldHandler.java index 3c397b018..568577933 100644 --- a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3/IWorldHandler.java +++ b/modules/v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19/IWorldHandler.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.compat.v1_19_R3; +package net.countercraft.movecraft.compat.v1_19; import net.countercraft.movecraft.MovecraftLocation; import net.countercraft.movecraft.MovecraftRotation; @@ -247,11 +247,6 @@ public void setBlockFast(@NotNull Location location, @NotNull MovecraftRotation setBlockFast(world, BlockPos, blockData); } - @Override - public void disableShadow(@NotNull Material type) { - // Disabled - } - @Override public @Nullable Location getAccessLocation(@NotNull InventoryView inventoryView) { AbstractContainerMenu menu = ((CraftInventoryView) inventoryView).getHandle(); diff --git a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3/NextTickProvider.java b/modules/v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19/NextTickProvider.java similarity index 96% rename from modules/v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3/NextTickProvider.java rename to modules/v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19/NextTickProvider.java index e1b1e3245..2a436da5c 100644 --- a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/compat/v1_19_R3/NextTickProvider.java +++ b/modules/v1_19/src/main/java/net/countercraft/movecraft/compat/v1_19/NextTickProvider.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.compat.v1_19_R3; +package net.countercraft.movecraft.compat.v1_19; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3/IAsyncChunk.java b/modules/v1_19/src/main/java/net/countercraft/movecraft/support/v1_19/IAsyncChunk.java similarity index 97% rename from modules/v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3/IAsyncChunk.java rename to modules/v1_19/src/main/java/net/countercraft/movecraft/support/v1_19/IAsyncChunk.java index 6a8f29020..92c842157 100644 --- a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3/IAsyncChunk.java +++ b/modules/v1_19/src/main/java/net/countercraft/movecraft/support/v1_19/IAsyncChunk.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.support.v1_19_R3; +package net.countercraft.movecraft.support.v1_19; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3/ISmoothTeleport.java b/modules/v1_19/src/main/java/net/countercraft/movecraft/support/v1_19/ISmoothTeleport.java similarity index 98% rename from modules/v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3/ISmoothTeleport.java rename to modules/v1_19/src/main/java/net/countercraft/movecraft/support/v1_19/ISmoothTeleport.java index 4b37990e9..705b1211c 100644 --- a/modules/v1_19_R3/src/main/java/net/countercraft/movecraft/support/v1_19_R3/ISmoothTeleport.java +++ b/modules/v1_19/src/main/java/net/countercraft/movecraft/support/v1_19/ISmoothTeleport.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.support.v1_19_R3; +package net.countercraft.movecraft.support.v1_19; import net.countercraft.movecraft.SmoothTeleport; import net.countercraft.movecraft.util.ReflectUtils; diff --git a/modules/v1_20_R4/pom.xml b/modules/v1_20/pom.xml similarity index 93% rename from modules/v1_20_R4/pom.xml rename to modules/v1_20/pom.xml index 45a80daa3..bf59a50b7 100644 --- a/modules/v1_20_R4/pom.xml +++ b/modules/v1_20/pom.xml @@ -10,8 +10,8 @@ 4.0.0 - movecraft-v1_20_R4 - Movecraft-v1_20_R4 + movecraft-v1_20 + Movecraft-v1_20 jar @@ -38,11 +38,11 @@ 3.8.1 - net/countercraft/movecraft/compat/v1_20_R4/** - net/countercraft/movecraft/support/v1_20_R4/** + net/countercraft/movecraft/compat/v1_20/** + net/countercraft/movecraft/support/v1_20/** - 13 - 13 + 17 + 17 @@ -51,8 +51,8 @@ 2.4 - net/countercraft/movecraft/compat/v1_20_R4/** - net/countercraft/movecraft/support/v1_20_R4/** + net/countercraft/movecraft/compat/v1_20/** + net/countercraft/movecraft/support/v1_20/** diff --git a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/IWorldHandler.java b/modules/v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/IWorldHandler.java similarity index 98% rename from modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/IWorldHandler.java rename to modules/v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/IWorldHandler.java index c9ad4a249..ed81e86ba 100644 --- a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/IWorldHandler.java +++ b/modules/v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/IWorldHandler.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.compat.v1_20_R4; +package net.countercraft.movecraft.compat.v1_20; import net.countercraft.movecraft.MovecraftLocation; import net.countercraft.movecraft.MovecraftRotation; @@ -22,7 +22,6 @@ import net.minecraft.world.ticks.ScheduledTick; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.block.Sign; import org.bukkit.block.data.BlockData; import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; import org.bukkit.craftbukkit.v1_20_R4.block.data.CraftBlockData; @@ -248,11 +247,6 @@ public void setBlockFast(@NotNull Location location, @NotNull MovecraftRotation setBlockFast(world, BlockPos, blockData); } - @Override - public void disableShadow(@NotNull Material type) { - // Disabled - } - @Override public @Nullable Location getAccessLocation(@NotNull InventoryView inventoryView) { AbstractContainerMenu menu = ((CraftInventoryView) inventoryView).getHandle(); diff --git a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/NextTickProvider.java b/modules/v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/NextTickProvider.java similarity index 96% rename from modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/NextTickProvider.java rename to modules/v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/NextTickProvider.java index 307d6f2c7..bceb388fc 100644 --- a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/compat/v1_20_R4/NextTickProvider.java +++ b/modules/v1_20/src/main/java/net/countercraft/movecraft/compat/v1_20/NextTickProvider.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.compat.v1_20_R4; +package net.countercraft.movecraft.compat.v1_20; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/IAsyncChunk.java b/modules/v1_20/src/main/java/net/countercraft/movecraft/support/v1_20/IAsyncChunk.java similarity index 97% rename from modules/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/IAsyncChunk.java rename to modules/v1_20/src/main/java/net/countercraft/movecraft/support/v1_20/IAsyncChunk.java index e616d5ebc..fe47278b2 100644 --- a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/IAsyncChunk.java +++ b/modules/v1_20/src/main/java/net/countercraft/movecraft/support/v1_20/IAsyncChunk.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.support.v1_20_R4; +package net.countercraft.movecraft.support.v1_20; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; diff --git a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/ISmoothTeleport.java b/modules/v1_20/src/main/java/net/countercraft/movecraft/support/v1_20/ISmoothTeleport.java similarity index 98% rename from modules/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/ISmoothTeleport.java rename to modules/v1_20/src/main/java/net/countercraft/movecraft/support/v1_20/ISmoothTeleport.java index 6220c9f93..f1224b7ea 100644 --- a/modules/v1_20_R4/src/main/java/net/countercraft/movecraft/support/v1_20_R4/ISmoothTeleport.java +++ b/modules/v1_20/src/main/java/net/countercraft/movecraft/support/v1_20/ISmoothTeleport.java @@ -1,4 +1,4 @@ -package net.countercraft.movecraft.support.v1_20_R4; +package net.countercraft.movecraft.support.v1_20; import net.countercraft.movecraft.SmoothTeleport; import net.countercraft.movecraft.util.ReflectUtils; diff --git a/pom.xml b/pom.xml index f0cb5d7c8..c2ed7eb5e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,9 @@ modules/api - modules/v1_18_R2 - modules/v1_19_R3 - modules/v1_20_R4 + modules/v1_18 + modules/v1_19 + modules/v1_20 modules/datapack modules/Movecraft @@ -35,8 +35,8 @@ maven-compiler-plugin 3.8.1 - 13 - 13 + 17 + 17