diff --git a/README.md b/README.md index 859474f..f005f90 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ All other files are licensed under MIT. [![bStats](https://bstats.org/signatures/server-implementation/DivineMC.svg)](https://bstats.org/plugin/server-implementation/DivineMC) ## API -### [Javadoc](https://repo.bx-team.space/javadoc/snapshots/space/bxteam/divinemc/divinemc-api/1.20.6-R0.1-SNAPSHOT) +### [Javadoc](https://repo.bx-team.space/javadoc/snapshots/space/bxteam/divinemc/divinemc-api/1.21-R0.1-SNAPSHOT) ### Dependency Information @@ -52,7 +52,7 @@ All other files are licensed under MIT. space.bxteam.divinemc divinemc-api - 1.20.6-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT provided ``` @@ -65,7 +65,7 @@ repositories { ``` ```groovy dependencies { - compileOnly("space.bxteam.divinemc:divinemc-api:1.20.6-R0.1-SNAPSHOT") + compileOnly("space.bxteam.divinemc:divinemc-api:1.21-R0.1-SNAPSHOT") } ``` diff --git a/gradle.properties b/gradle.properties index 85e5eb5..f80c7a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = space.bxteam.divinemc -mcVersion = 1.20.6 -version = 1.20.6-R0.1-SNAPSHOT +mcVersion = 1.21 +version = 1.21-R0.1-SNAPSHOT purpurRef = f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a org.gradle.caching = true diff --git a/patches/api/0001-Divine-Branding.patch b/patches/unapplied/api/0001-Divine-Branding.patch similarity index 100% rename from patches/api/0001-Divine-Branding.patch rename to patches/unapplied/api/0001-Divine-Branding.patch diff --git a/patches/api/0002-Divine-Configuration.patch b/patches/unapplied/api/0002-Divine-Configuration.patch similarity index 100% rename from patches/api/0002-Divine-Configuration.patch rename to patches/unapplied/api/0002-Divine-Configuration.patch diff --git a/patches/api/0003-Disable-reload-command-by-default.patch b/patches/unapplied/api/0003-Disable-reload-command-by-default.patch similarity index 100% rename from patches/api/0003-Disable-reload-command-by-default.patch rename to patches/unapplied/api/0003-Disable-reload-command-by-default.patch diff --git a/patches/api/0004-Optimize-Paper-Event-Manager.patch b/patches/unapplied/api/0004-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/api/0004-Optimize-Paper-Event-Manager.patch rename to patches/unapplied/api/0004-Optimize-Paper-Event-Manager.patch diff --git a/patches/api/0005-Delete-Timings.patch b/patches/unapplied/api/0005-Delete-Timings.patch similarity index 100% rename from patches/api/0005-Delete-Timings.patch rename to patches/unapplied/api/0005-Delete-Timings.patch diff --git a/patches/api/0006-DivineMC-API-Publish.patch b/patches/unapplied/api/0006-DivineMC-API-Publish.patch similarity index 100% rename from patches/api/0006-DivineMC-API-Publish.patch rename to patches/unapplied/api/0006-DivineMC-API-Publish.patch diff --git a/patches/api/0007-Hide-unnecessary-compilation-warnings.patch b/patches/unapplied/api/0007-Hide-unnecessary-compilation-warnings.patch similarity index 100% rename from patches/api/0007-Hide-unnecessary-compilation-warnings.patch rename to patches/unapplied/api/0007-Hide-unnecessary-compilation-warnings.patch diff --git a/patches/unapplied/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch b/patches/unapplied/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch similarity index 100% rename from patches/unapplied/api/0004-Add-Higher-Java-Version-for-Pufferfish.patch rename to patches/unapplied/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch diff --git a/patches/server/0001-Divine-Branding.patch b/patches/unapplied/server/0001-Divine-Branding.patch similarity index 100% rename from patches/server/0001-Divine-Branding.patch rename to patches/unapplied/server/0001-Divine-Branding.patch diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/unapplied/server/0002-Divine-Configuration.patch similarity index 100% rename from patches/server/0002-Divine-Configuration.patch rename to patches/unapplied/server/0002-Divine-Configuration.patch diff --git a/patches/server/0003-Fix-MC-98160-and-MC-105103.patch b/patches/unapplied/server/0003-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0003-Fix-MC-98160-and-MC-105103.patch rename to patches/unapplied/server/0003-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/unapplied/server/0004-Optimize-default-values-for-configs.patch similarity index 100% rename from patches/server/0004-Optimize-default-values-for-configs.patch rename to patches/unapplied/server/0004-Optimize-default-values-for-configs.patch diff --git a/patches/server/0005-Add-missing-purpur-config-options.patch b/patches/unapplied/server/0005-Add-missing-purpur-config-options.patch similarity index 100% rename from patches/server/0005-Add-missing-purpur-config-options.patch rename to patches/unapplied/server/0005-Add-missing-purpur-config-options.patch diff --git a/patches/server/0006-Fix-MC-93826.patch b/patches/unapplied/server/0006-Fix-MC-93826.patch similarity index 100% rename from patches/server/0006-Fix-MC-93826.patch rename to patches/unapplied/server/0006-Fix-MC-93826.patch diff --git a/patches/server/0007-Don-t-save-Fireworks.patch b/patches/unapplied/server/0007-Don-t-save-Fireworks.patch similarity index 100% rename from patches/server/0007-Don-t-save-Fireworks.patch rename to patches/unapplied/server/0007-Don-t-save-Fireworks.patch diff --git a/patches/server/0008-Fix-MC-110386.patch b/patches/unapplied/server/0008-Fix-MC-110386.patch similarity index 100% rename from patches/server/0008-Fix-MC-110386.patch rename to patches/unapplied/server/0008-Fix-MC-110386.patch diff --git a/patches/server/0009-Fix-MC-31819.patch b/patches/unapplied/server/0009-Fix-MC-31819.patch similarity index 100% rename from patches/server/0009-Fix-MC-31819.patch rename to patches/unapplied/server/0009-Fix-MC-31819.patch diff --git a/patches/server/0010-Fix-MC-172801.patch b/patches/unapplied/server/0010-Fix-MC-172801.patch similarity index 100% rename from patches/server/0010-Fix-MC-172801.patch rename to patches/unapplied/server/0010-Fix-MC-172801.patch diff --git a/patches/server/0011-Fix-MC-2025.patch b/patches/unapplied/server/0011-Fix-MC-2025.patch similarity index 100% rename from patches/server/0011-Fix-MC-2025.patch rename to patches/unapplied/server/0011-Fix-MC-2025.patch diff --git a/patches/server/0012-Fix-MC-65198.patch b/patches/unapplied/server/0012-Fix-MC-65198.patch similarity index 100% rename from patches/server/0012-Fix-MC-65198.patch rename to patches/unapplied/server/0012-Fix-MC-65198.patch diff --git a/patches/server/0013-Fix-MC-7569.patch b/patches/unapplied/server/0013-Fix-MC-7569.patch similarity index 100% rename from patches/server/0013-Fix-MC-7569.patch rename to patches/unapplied/server/0013-Fix-MC-7569.patch diff --git a/patches/server/0014-Fix-MC-93018.patch b/patches/unapplied/server/0014-Fix-MC-93018.patch similarity index 100% rename from patches/server/0014-Fix-MC-93018.patch rename to patches/unapplied/server/0014-Fix-MC-93018.patch diff --git a/patches/server/0015-Remove-Spigot-tick-limiter.patch b/patches/unapplied/server/0015-Remove-Spigot-tick-limiter.patch similarity index 100% rename from patches/server/0015-Remove-Spigot-tick-limiter.patch rename to patches/unapplied/server/0015-Remove-Spigot-tick-limiter.patch diff --git a/patches/server/0016-Boat-Settings.patch b/patches/unapplied/server/0016-Boat-Settings.patch similarity index 100% rename from patches/server/0016-Boat-Settings.patch rename to patches/unapplied/server/0016-Boat-Settings.patch diff --git a/patches/server/0017-Despawn-shulker-bullets-on-owner-death.patch b/patches/unapplied/server/0017-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0017-Despawn-shulker-bullets-on-owner-death.patch rename to patches/unapplied/server/0017-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0018-Reduce-sensor-work.patch b/patches/unapplied/server/0018-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0018-Reduce-sensor-work.patch rename to patches/unapplied/server/0018-Reduce-sensor-work.patch diff --git a/patches/server/0019-Optimize-Paper-Event-Manager.patch b/patches/unapplied/server/0019-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/server/0019-Optimize-Paper-Event-Manager.patch rename to patches/unapplied/server/0019-Optimize-Paper-Event-Manager.patch diff --git a/patches/server/0020-Make-entity-goals-public.patch b/patches/unapplied/server/0020-Make-entity-goals-public.patch similarity index 100% rename from patches/server/0020-Make-entity-goals-public.patch rename to patches/unapplied/server/0020-Make-entity-goals-public.patch diff --git a/patches/server/0021-Optimize-CraftServer.getWorld-UUID.patch b/patches/unapplied/server/0021-Optimize-CraftServer.getWorld-UUID.patch similarity index 100% rename from patches/server/0021-Optimize-CraftServer.getWorld-UUID.patch rename to patches/unapplied/server/0021-Optimize-CraftServer.getWorld-UUID.patch diff --git a/patches/server/0022-Carpet-Fixes-getBiome-Optimize.patch b/patches/unapplied/server/0022-Carpet-Fixes-getBiome-Optimize.patch similarity index 100% rename from patches/server/0022-Carpet-Fixes-getBiome-Optimize.patch rename to patches/unapplied/server/0022-Carpet-Fixes-getBiome-Optimize.patch diff --git a/patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/unapplied/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/unapplied/server/0023-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/unapplied/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch similarity index 100% rename from patches/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch rename to patches/unapplied/server/0024-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch diff --git a/patches/server/0025-lithium-ai.raid.patch b/patches/unapplied/server/0025-lithium-ai.raid.patch similarity index 100% rename from patches/server/0025-lithium-ai.raid.patch rename to patches/unapplied/server/0025-lithium-ai.raid.patch diff --git a/patches/server/0026-lithium-collections.gamerules.patch b/patches/unapplied/server/0026-lithium-collections.gamerules.patch similarity index 100% rename from patches/server/0026-lithium-collections.gamerules.patch rename to patches/unapplied/server/0026-lithium-collections.gamerules.patch diff --git a/patches/server/0027-lithium-collections.entity_by_type.patch b/patches/unapplied/server/0027-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0027-lithium-collections.entity_by_type.patch rename to patches/unapplied/server/0027-lithium-collections.entity_by_type.patch diff --git a/patches/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/unapplied/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch similarity index 100% rename from patches/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch rename to patches/unapplied/server/0028-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch diff --git a/patches/server/0029-lithium-precompute-shape-arrays.patch b/patches/unapplied/server/0029-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0029-lithium-precompute-shape-arrays.patch rename to patches/unapplied/server/0029-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch b/patches/unapplied/server/0030-Carpet-Fixes-Sheep-Optimization.patch similarity index 100% rename from patches/server/0030-Carpet-Fixes-Sheep-Optimization.patch rename to patches/unapplied/server/0030-Carpet-Fixes-Sheep-Optimization.patch diff --git a/patches/server/0031-Snowball-and-Egg-knockback.patch b/patches/unapplied/server/0031-Snowball-and-Egg-knockback.patch similarity index 100% rename from patches/server/0031-Snowball-and-Egg-knockback.patch rename to patches/unapplied/server/0031-Snowball-and-Egg-knockback.patch diff --git a/patches/server/0032-Suppress-errors-from-dirty-attributes.patch b/patches/unapplied/server/0032-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/server/0032-Suppress-errors-from-dirty-attributes.patch rename to patches/unapplied/server/0032-Suppress-errors-from-dirty-attributes.patch diff --git a/patches/server/0033-Carpet-Fixes-RecipeManager-Optimize.patch b/patches/unapplied/server/0033-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from patches/server/0033-Carpet-Fixes-RecipeManager-Optimize.patch rename to patches/unapplied/server/0033-Carpet-Fixes-RecipeManager-Optimize.patch diff --git a/patches/server/0034-No-chat-sign.patch b/patches/unapplied/server/0034-No-chat-sign.patch similarity index 100% rename from patches/server/0034-No-chat-sign.patch rename to patches/unapplied/server/0034-No-chat-sign.patch diff --git a/patches/server/0035-Delete-Timings.patch b/patches/unapplied/server/0035-Delete-Timings.patch similarity index 100% rename from patches/server/0035-Delete-Timings.patch rename to patches/unapplied/server/0035-Delete-Timings.patch diff --git a/patches/server/0036-vmp-spawn_density_cap.patch b/patches/unapplied/server/0036-vmp-spawn_density_cap.patch similarity index 100% rename from patches/server/0036-vmp-spawn_density_cap.patch rename to patches/unapplied/server/0036-vmp-spawn_density_cap.patch diff --git a/patches/server/0037-Fix-sprint-glitch.patch b/patches/unapplied/server/0037-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0037-Fix-sprint-glitch.patch rename to patches/unapplied/server/0037-Fix-sprint-glitch.patch diff --git a/patches/server/0038-Implement-Linear-region-format.patch b/patches/unapplied/server/0038-Implement-Linear-region-format.patch similarity index 100% rename from patches/server/0038-Implement-Linear-region-format.patch rename to patches/unapplied/server/0038-Implement-Linear-region-format.patch diff --git a/patches/server/0039-Parchment-Make-FixLight-use-action-bar.patch b/patches/unapplied/server/0039-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from patches/server/0039-Parchment-Make-FixLight-use-action-bar.patch rename to patches/unapplied/server/0039-Parchment-Make-FixLight-use-action-bar.patch diff --git a/patches/server/0040-Async-Pathfinding.patch b/patches/unapplied/server/0040-Async-Pathfinding.patch similarity index 100% rename from patches/server/0040-Async-Pathfinding.patch rename to patches/unapplied/server/0040-Async-Pathfinding.patch diff --git a/patches/server/0041-C2ME-reduce_allocs.patch b/patches/unapplied/server/0041-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0041-C2ME-reduce_allocs.patch rename to patches/unapplied/server/0041-C2ME-reduce_allocs.patch diff --git a/patches/server/0042-Implement-Secure-Seed.patch b/patches/unapplied/server/0042-Implement-Secure-Seed.patch similarity index 100% rename from patches/server/0042-Implement-Secure-Seed.patch rename to patches/unapplied/server/0042-Implement-Secure-Seed.patch diff --git a/patches/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch b/patches/unapplied/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch similarity index 100% rename from patches/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch rename to patches/unapplied/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch diff --git a/patches/server/0044-C2ME-opts-math.patch b/patches/unapplied/server/0044-C2ME-opts-math.patch similarity index 100% rename from patches/server/0044-C2ME-opts-math.patch rename to patches/unapplied/server/0044-C2ME-opts-math.patch diff --git a/patches/server/0045-Make-minecart-hopper-work-without-players.patch b/patches/unapplied/server/0045-Make-minecart-hopper-work-without-players.patch similarity index 100% rename from patches/server/0045-Make-minecart-hopper-work-without-players.patch rename to patches/unapplied/server/0045-Make-minecart-hopper-work-without-players.patch diff --git a/patches/server/0046-Fix-possible-NPE-during-creating-GUI-graph.patch b/patches/unapplied/server/0046-Fix-possible-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0046-Fix-possible-NPE-during-creating-GUI-graph.patch rename to patches/unapplied/server/0046-Fix-possible-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0047-Block-Log4Shell-exploit.patch b/patches/unapplied/server/0047-Block-Log4Shell-exploit.patch similarity index 100% rename from patches/server/0047-Block-Log4Shell-exploit.patch rename to patches/unapplied/server/0047-Block-Log4Shell-exploit.patch diff --git a/patches/server/0048-Option-to-disable-non-editable-sign-warning.patch b/patches/unapplied/server/0048-Option-to-disable-non-editable-sign-warning.patch similarity index 100% rename from patches/server/0048-Option-to-disable-non-editable-sign-warning.patch rename to patches/unapplied/server/0048-Option-to-disable-non-editable-sign-warning.patch diff --git a/patches/server/0049-lithium-cached_hashcode.patch b/patches/unapplied/server/0049-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0049-lithium-cached_hashcode.patch rename to patches/unapplied/server/0049-lithium-cached_hashcode.patch diff --git a/patches/server/0050-lithium-math.sine_lut.patch b/patches/unapplied/server/0050-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0050-lithium-math.sine_lut.patch rename to patches/unapplied/server/0050-lithium-math.sine_lut.patch diff --git a/patches/unapplied/server/0035-Improve-biome-temperature-cache.patch b/patches/unapplied/server/0051-Improve-biome-temperature-cache.patch similarity index 100% rename from patches/unapplied/server/0035-Improve-biome-temperature-cache.patch rename to patches/unapplied/server/0051-Improve-biome-temperature-cache.patch diff --git a/patches/unapplied/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch b/patches/unapplied/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch similarity index 100% rename from patches/unapplied/server/0038-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch rename to patches/unapplied/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch