From 084d0d51f191767b1c257d44077e8b4f5e81074c Mon Sep 17 00:00:00 2001 From: ishland Date: Sat, 7 Oct 2023 21:50:34 +0800 Subject: [PATCH] change: unify access wideners This avoids having separate project-mapped jars for every subproject that uses access wideners. But for whatever reasons it still produces a different jar for all submodules that depends on `:c2me-base` --- build.gradle | 13 +++--- .../main/resources/c2me-base.accesswidener | 41 ++++++++++++++++++- .../c2me-client-uncapvd.accesswidener | 5 --- .../src/main/resources/fabric.mod.json | 1 - ...xes-chunkio-threading-issues.accesswidener | 1 - .../src/main/resources/fabric.mod.json | 1 - ...xes-general-threading-issues.accesswidener | 3 -- .../src/main/resources/fabric.mod.json | 1 - ...es-worldgen-threading-issues.accesswidener | 12 ------ .../src/main/resources/fabric.mod.json | 1 - .../resources/c2me-notickvd.accesswidener | 3 -- .../src/main/resources/fabric.mod.json | 1 - .../resources/c2me-opts-allocs.accesswidener | 10 ----- .../src/main/resources/fabric.mod.json | 1 - .../c2me-opts-chunk-access.accesswidener | 4 -- .../src/main/resources/fabric.mod.json | 1 - .../resources/c2me-opts-chunkio.accesswidener | 6 --- .../src/main/resources/fabric.mod.json | 1 - .../resources/c2me-opts-math.accesswidener | 2 - .../src/main/resources/fabric.mod.json | 1 - .../c2me-opts-scheduling.accesswidener | 3 -- .../src/main/resources/fabric.mod.json | 1 - .../c2me-opts-worldgen-general.accesswidener | 9 ---- .../src/main/resources/fabric.mod.json | 1 - .../c2me-opts-worldgen-vanilla.accesswidener | 13 ------ .../src/main/resources/fabric.mod.json | 1 - ...me-rewrites-chunk-serializer.accesswidener | 4 -- .../src/main/resources/fabric.mod.json | 1 - .../c2me-rewrites-chunkio.accesswidener | 7 ---- .../src/main/resources/fabric.mod.json | 1 - .../resources/c2me-server-utils.accesswidener | 1 - .../src/main/resources/fabric.mod.json | 1 - .../c2me-threading-worldgen.accesswidener | 5 --- .../src/main/resources/fabric.mod.json | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- tests/build.gradle | 4 +- 36 files changed, 48 insertions(+), 116 deletions(-) delete mode 100644 c2me-client-uncapvd/src/main/resources/c2me-client-uncapvd.accesswidener delete mode 100644 c2me-fixes-chunkio-threading-issues/src/main/resources/c2me-fixes-chunkio-threading-issues.accesswidener delete mode 100644 c2me-fixes-general-threading-issues/src/main/resources/c2me-fixes-general-threading-issues.accesswidener delete mode 100644 c2me-fixes-worldgen-threading-issues/src/main/resources/c2me-fixes-worldgen-threading-issues.accesswidener delete mode 100644 c2me-notickvd/src/main/resources/c2me-notickvd.accesswidener delete mode 100644 c2me-opts-allocs/src/main/resources/c2me-opts-allocs.accesswidener delete mode 100644 c2me-opts-chunk-access/src/main/resources/c2me-opts-chunk-access.accesswidener delete mode 100644 c2me-opts-chunkio/src/main/resources/c2me-opts-chunkio.accesswidener delete mode 100644 c2me-opts-math/src/main/resources/c2me-opts-math.accesswidener delete mode 100644 c2me-opts-scheduling/src/main/resources/c2me-opts-scheduling.accesswidener delete mode 100644 c2me-opts-worldgen-general/src/main/resources/c2me-opts-worldgen-general.accesswidener delete mode 100644 c2me-opts-worldgen-vanilla/src/main/resources/c2me-opts-worldgen-vanilla.accesswidener delete mode 100644 c2me-rewrites-chunk-serializer/src/main/resources/c2me-rewrites-chunk-serializer.accesswidener delete mode 100644 c2me-rewrites-chunkio/src/main/resources/c2me-rewrites-chunkio.accesswidener delete mode 100644 c2me-server-utils/src/main/resources/c2me-server-utils.accesswidener delete mode 100644 c2me-threading-worldgen/src/main/resources/c2me-threading-worldgen.accesswidener diff --git a/build.gradle b/build.gradle index 741661a0e..90af93f7a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id 'java-library' - id 'fabric-loom' version '1.3-SNAPSHOT' apply false - id 'io.github.juuxel.loom-vineflower' version '1.+' apply false + id 'fabric-loom' version '1.4-SNAPSHOT' apply false id "me.champeau.jmh" version "0.7.1" id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false @@ -41,7 +40,6 @@ configure (allprojects - project(":tests")) { if (project != project(":") && project.parent != project(":")) return apply plugin: 'fabric-loom' - apply plugin: 'io.github.juuxel.loom-quiltflower' apply plugin: 'maven-publish' repositories { @@ -56,10 +54,9 @@ configure (allprojects - project(":tests")) { } loom { - def awFile = file("src/main/resources/${project.name}.accesswidener") - if (awFile.isFile()) { - accessWidenerPath = awFile - } + def file = project(":c2me-base").file("src/main/resources/c2me-base.accesswidener") + accessWidenerPath = file +// logger.lifecycle(String.format("%s: Using access widener at %s", project, file.getAbsolutePath())) runs { server { ideConfigGenerated project.rootProject == project @@ -131,7 +128,7 @@ subprojects { afterEvaluate { afterEvaluate { genSourcesWithFernFlower.enabled = false - genSourcesWithQuiltflower.enabled = false + genSourcesWithVineflower.enabled = false genSourcesWithCfr.enabled = false downloadAssets.enabled = false } diff --git a/c2me-base/src/main/resources/c2me-base.accesswidener b/c2me-base/src/main/resources/c2me-base.accesswidener index ae3f5978a..70589da21 100644 --- a/c2me-base/src/main/resources/c2me-base.accesswidener +++ b/c2me-base/src/main/resources/c2me-base.accesswidener @@ -1,8 +1,45 @@ accessWidener v1 named accessible class net/minecraft/server/world/ChunkTicketManager$NearbyChunkTicketUpdater +accessible class net/minecraft/server/world/ChunkTicketManager$DistanceFromNearestPlayerTracker accessible class net/minecraft/server/world/ServerChunkManager$MainThreadExecutor +accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$TicketManager accessible class net/minecraft/world/storage/StorageIoWorker$Result +accessible class net/minecraft/world/storage/ChunkStreamVersion$Wrapper +accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$MaterialRuleContext +accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$SequenceBlockStateRule +accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$SequenceMaterialRule +accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$BlockStateRule +accessible class net/minecraft/world/chunk/ChunkStatus$GenerationTask +accessible class net/minecraft/structure/WoodlandMansionGenerator$FlagMatrix +accessible class net/minecraft/structure/WoodlandMansionGenerator$MansionParameters +accessible class net/minecraft/structure/WoodlandMansionGenerator$GenerationPiece +accessible class net/minecraft/structure/StrongholdGenerator$PieceData +accessible class net/minecraft/structure/StrongholdGenerator$Piece +accessible class net/minecraft/structure/NetherFortressGenerator$PieceData +accessible class net/minecraft/structure/NetherFortressGenerator$Piece +accessible class net/minecraft/structure/OceanMonumentGenerator$PieceSetting +accessible class net/minecraft/client/option/SimpleOption$Callbacks -accessible field net/minecraft/world/storage/StorageIoWorker$Result nbt Lnet/minecraft/nbt/NbtCompound; -accessible field net/minecraft/world/storage/StorageIoWorker$Result future Ljava/util/concurrent/CompletableFuture; +extendable class net/minecraft/client/option/SimpleOption +extendable class net/minecraft/world/storage/RegionBasedStorage + +accessible method net/minecraft/util/collection/WeightedList (Ljava/util/List;)V +accessible method net/minecraft/nbt/NbtCompound (Ljava/util/Map;)V +accessible method net/minecraft/nbt/NbtList (Ljava/util/List;B)V +accessible method net/minecraft/world/gen/surfacebuilder/MaterialRules$SequenceBlockStateRule (Ljava/util/List;)V +accessible method net/minecraft/world/storage/ChunkStreamVersion (ILnet/minecraft/world/storage/ChunkStreamVersion$Wrapper;Lnet/minecraft/world/storage/ChunkStreamVersion$Wrapper;)V +accessible method net/minecraft/world/storage/RegionBasedStorage (Ljava/nio/file/Path;Z)V + +accessible field net/minecraft/world/storage/StorageIoWorker$Result nbt Lnet/minecraft/nbt/NbtCompound; +accessible field net/minecraft/world/storage/StorageIoWorker$Result future Ljava/util/concurrent/CompletableFuture; +accessible field net/minecraft/util/math/BlockPos BIT_SHIFT_X I +accessible field net/minecraft/util/math/BlockPos SIZE_BITS_X I +accessible field net/minecraft/util/math/BlockPos BIT_SHIFT_Z I +accessible field net/minecraft/util/math/BlockPos SIZE_BITS_Z I +accessible field net/minecraft/util/math/BlockPos BITS_X J +accessible field net/minecraft/util/math/BlockPos BITS_Y J +accessible field net/minecraft/util/math/BlockPos BITS_Z J +accessible field net/minecraft/util/math/noise/SimplexNoiseSampler GRADIENTS [[I +accessible field net/minecraft/world/gen/chunk/AquiferSampler$FluidLevel y I +accessible field net/minecraft/world/gen/chunk/AquiferSampler$FluidLevel state Lnet/minecraft/block/BlockState; diff --git a/c2me-client-uncapvd/src/main/resources/c2me-client-uncapvd.accesswidener b/c2me-client-uncapvd/src/main/resources/c2me-client-uncapvd.accesswidener deleted file mode 100644 index 5ed7c03e5..000000000 --- a/c2me-client-uncapvd/src/main/resources/c2me-client-uncapvd.accesswidener +++ /dev/null @@ -1,5 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/client/option/SimpleOption$Callbacks - -extendable class net/minecraft/client/option/SimpleOption diff --git a/c2me-client-uncapvd/src/main/resources/fabric.mod.json b/c2me-client-uncapvd/src/main/resources/fabric.mod.json index 7f1a209c5..79a586954 100644 --- a/c2me-client-uncapvd/src/main/resources/fabric.mod.json +++ b/c2me-client-uncapvd/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-client-uncapvd.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-fixes-chunkio-threading-issues/src/main/resources/c2me-fixes-chunkio-threading-issues.accesswidener b/c2me-fixes-chunkio-threading-issues/src/main/resources/c2me-fixes-chunkio-threading-issues.accesswidener deleted file mode 100644 index 3fde5170f..000000000 --- a/c2me-fixes-chunkio-threading-issues/src/main/resources/c2me-fixes-chunkio-threading-issues.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v1 named diff --git a/c2me-fixes-chunkio-threading-issues/src/main/resources/fabric.mod.json b/c2me-fixes-chunkio-threading-issues/src/main/resources/fabric.mod.json index 219753a9a..44b73c298 100644 --- a/c2me-fixes-chunkio-threading-issues/src/main/resources/fabric.mod.json +++ b/c2me-fixes-chunkio-threading-issues/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-fixes-chunkio-threading-issues.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-fixes-general-threading-issues/src/main/resources/c2me-fixes-general-threading-issues.accesswidener b/c2me-fixes-general-threading-issues/src/main/resources/c2me-fixes-general-threading-issues.accesswidener deleted file mode 100644 index 62e686e4c..000000000 --- a/c2me-fixes-general-threading-issues/src/main/resources/c2me-fixes-general-threading-issues.accesswidener +++ /dev/null @@ -1,3 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$TicketManager diff --git a/c2me-fixes-general-threading-issues/src/main/resources/fabric.mod.json b/c2me-fixes-general-threading-issues/src/main/resources/fabric.mod.json index 93d347e8d..45547af04 100644 --- a/c2me-fixes-general-threading-issues/src/main/resources/fabric.mod.json +++ b/c2me-fixes-general-threading-issues/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-fixes-general-threading-issues.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-fixes-worldgen-threading-issues/src/main/resources/c2me-fixes-worldgen-threading-issues.accesswidener b/c2me-fixes-worldgen-threading-issues/src/main/resources/c2me-fixes-worldgen-threading-issues.accesswidener deleted file mode 100644 index c31b3f9d4..000000000 --- a/c2me-fixes-worldgen-threading-issues/src/main/resources/c2me-fixes-worldgen-threading-issues.accesswidener +++ /dev/null @@ -1,12 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/structure/WoodlandMansionGenerator$FlagMatrix -accessible class net/minecraft/structure/WoodlandMansionGenerator$MansionParameters -accessible class net/minecraft/structure/WoodlandMansionGenerator$GenerationPiece -accessible class net/minecraft/structure/StrongholdGenerator$PieceData -accessible class net/minecraft/structure/StrongholdGenerator$Piece -accessible class net/minecraft/structure/NetherFortressGenerator$PieceData -accessible class net/minecraft/structure/NetherFortressGenerator$Piece -accessible class net/minecraft/structure/OceanMonumentGenerator$PieceSetting - -accessible method net/minecraft/util/collection/WeightedList (Ljava/util/List;)V diff --git a/c2me-fixes-worldgen-threading-issues/src/main/resources/fabric.mod.json b/c2me-fixes-worldgen-threading-issues/src/main/resources/fabric.mod.json index 117900148..428622e10 100644 --- a/c2me-fixes-worldgen-threading-issues/src/main/resources/fabric.mod.json +++ b/c2me-fixes-worldgen-threading-issues/src/main/resources/fabric.mod.json @@ -14,7 +14,6 @@ "c2me-base": "*", "c2me-fixes-general-threading-issues": "*" }, - "accessWidener": "c2me-fixes-worldgen-threading-issues.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-notickvd/src/main/resources/c2me-notickvd.accesswidener b/c2me-notickvd/src/main/resources/c2me-notickvd.accesswidener deleted file mode 100644 index 72d1591bb..000000000 --- a/c2me-notickvd/src/main/resources/c2me-notickvd.accesswidener +++ /dev/null @@ -1,3 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/server/world/ChunkTicketManager$NearbyChunkTicketUpdater diff --git a/c2me-notickvd/src/main/resources/fabric.mod.json b/c2me-notickvd/src/main/resources/fabric.mod.json index 6564b7447..768f05cfb 100644 --- a/c2me-notickvd/src/main/resources/fabric.mod.json +++ b/c2me-notickvd/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-notickvd.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-allocs/src/main/resources/c2me-opts-allocs.accesswidener b/c2me-opts-allocs/src/main/resources/c2me-opts-allocs.accesswidener deleted file mode 100644 index 31c6fd3d7..000000000 --- a/c2me-opts-allocs/src/main/resources/c2me-opts-allocs.accesswidener +++ /dev/null @@ -1,10 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$MaterialRuleContext -accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$SequenceBlockStateRule -accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$SequenceMaterialRule -accessible class net/minecraft/world/gen/surfacebuilder/MaterialRules$BlockStateRule - -accessible method net/minecraft/nbt/NbtCompound (Ljava/util/Map;)V -accessible method net/minecraft/nbt/NbtList (Ljava/util/List;B)V -accessible method net/minecraft/world/gen/surfacebuilder/MaterialRules$SequenceBlockStateRule (Ljava/util/List;)V diff --git a/c2me-opts-allocs/src/main/resources/fabric.mod.json b/c2me-opts-allocs/src/main/resources/fabric.mod.json index 923999d48..c0a576325 100644 --- a/c2me-opts-allocs/src/main/resources/fabric.mod.json +++ b/c2me-opts-allocs/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-opts-allocs.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-chunk-access/src/main/resources/c2me-opts-chunk-access.accesswidener b/c2me-opts-chunk-access/src/main/resources/c2me-opts-chunk-access.accesswidener deleted file mode 100644 index 1c8cb96e7..000000000 --- a/c2me-opts-chunk-access/src/main/resources/c2me-opts-chunk-access.accesswidener +++ /dev/null @@ -1,4 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/server/world/ServerChunkManager$MainThreadExecutor -accessible class net/minecraft/world/chunk/ChunkStatus$GenerationTask diff --git a/c2me-opts-chunk-access/src/main/resources/fabric.mod.json b/c2me-opts-chunk-access/src/main/resources/fabric.mod.json index b3d2f7943..9d0c220e6 100644 --- a/c2me-opts-chunk-access/src/main/resources/fabric.mod.json +++ b/c2me-opts-chunk-access/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-opts-chunk-access.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-chunkio/src/main/resources/c2me-opts-chunkio.accesswidener b/c2me-opts-chunkio/src/main/resources/c2me-opts-chunkio.accesswidener deleted file mode 100644 index de59a6192..000000000 --- a/c2me-opts-chunkio/src/main/resources/c2me-opts-chunkio.accesswidener +++ /dev/null @@ -1,6 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/world/storage/StorageIoWorker$Result -accessible class net/minecraft/world/storage/ChunkStreamVersion$Wrapper - -accessible method net/minecraft/world/storage/ChunkStreamVersion (ILnet/minecraft/world/storage/ChunkStreamVersion$Wrapper;Lnet/minecraft/world/storage/ChunkStreamVersion$Wrapper;)V diff --git a/c2me-opts-chunkio/src/main/resources/fabric.mod.json b/c2me-opts-chunkio/src/main/resources/fabric.mod.json index c1c84383b..34aafe7ee 100644 --- a/c2me-opts-chunkio/src/main/resources/fabric.mod.json +++ b/c2me-opts-chunkio/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-opts-chunkio.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-math/src/main/resources/c2me-opts-math.accesswidener b/c2me-opts-math/src/main/resources/c2me-opts-math.accesswidener deleted file mode 100644 index 66fdc943e..000000000 --- a/c2me-opts-math/src/main/resources/c2me-opts-math.accesswidener +++ /dev/null @@ -1,2 +0,0 @@ -accessWidener v1 named - diff --git a/c2me-opts-math/src/main/resources/fabric.mod.json b/c2me-opts-math/src/main/resources/fabric.mod.json index a0543798c..f8a0232c5 100644 --- a/c2me-opts-math/src/main/resources/fabric.mod.json +++ b/c2me-opts-math/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-opts-math.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-scheduling/src/main/resources/c2me-opts-scheduling.accesswidener b/c2me-opts-scheduling/src/main/resources/c2me-opts-scheduling.accesswidener deleted file mode 100644 index 62e686e4c..000000000 --- a/c2me-opts-scheduling/src/main/resources/c2me-opts-scheduling.accesswidener +++ /dev/null @@ -1,3 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$TicketManager diff --git a/c2me-opts-scheduling/src/main/resources/fabric.mod.json b/c2me-opts-scheduling/src/main/resources/fabric.mod.json index a5a267cb1..297016610 100644 --- a/c2me-opts-scheduling/src/main/resources/fabric.mod.json +++ b/c2me-opts-scheduling/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-opts-scheduling.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-worldgen-general/src/main/resources/c2me-opts-worldgen-general.accesswidener b/c2me-opts-worldgen-general/src/main/resources/c2me-opts-worldgen-general.accesswidener deleted file mode 100644 index 55495bf23..000000000 --- a/c2me-opts-worldgen-general/src/main/resources/c2me-opts-worldgen-general.accesswidener +++ /dev/null @@ -1,9 +0,0 @@ -accessWidener v1 named - -accessible field net/minecraft/util/math/BlockPos BIT_SHIFT_X I -accessible field net/minecraft/util/math/BlockPos SIZE_BITS_X I -accessible field net/minecraft/util/math/BlockPos BIT_SHIFT_Z I -accessible field net/minecraft/util/math/BlockPos SIZE_BITS_Z I -accessible field net/minecraft/util/math/BlockPos BITS_X J -accessible field net/minecraft/util/math/BlockPos BITS_Y J -accessible field net/minecraft/util/math/BlockPos BITS_Z J diff --git a/c2me-opts-worldgen-general/src/main/resources/fabric.mod.json b/c2me-opts-worldgen-general/src/main/resources/fabric.mod.json index 6751b2105..20704f82a 100644 --- a/c2me-opts-worldgen-general/src/main/resources/fabric.mod.json +++ b/c2me-opts-worldgen-general/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-opts-worldgen-general.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-opts-worldgen-vanilla/src/main/resources/c2me-opts-worldgen-vanilla.accesswidener b/c2me-opts-worldgen-vanilla/src/main/resources/c2me-opts-worldgen-vanilla.accesswidener deleted file mode 100644 index 42a9cc0c2..000000000 --- a/c2me-opts-worldgen-vanilla/src/main/resources/c2me-opts-worldgen-vanilla.accesswidener +++ /dev/null @@ -1,13 +0,0 @@ -accessWidener v1 named - -accessible field net/minecraft/util/math/noise/SimplexNoiseSampler GRADIENTS [[I -accessible field net/minecraft/util/math/BlockPos BIT_SHIFT_X I -accessible field net/minecraft/util/math/BlockPos SIZE_BITS_X I -accessible field net/minecraft/util/math/BlockPos BIT_SHIFT_Z I -accessible field net/minecraft/util/math/BlockPos SIZE_BITS_Z I -accessible field net/minecraft/util/math/BlockPos BITS_X J -accessible field net/minecraft/util/math/BlockPos BITS_Y J -accessible field net/minecraft/util/math/BlockPos BITS_Z J - -accessible field net/minecraft/world/gen/chunk/AquiferSampler$FluidLevel y I -accessible field net/minecraft/world/gen/chunk/AquiferSampler$FluidLevel state Lnet/minecraft/block/BlockState; diff --git a/c2me-opts-worldgen-vanilla/src/main/resources/fabric.mod.json b/c2me-opts-worldgen-vanilla/src/main/resources/fabric.mod.json index 182bb87f4..d3921e466 100644 --- a/c2me-opts-worldgen-vanilla/src/main/resources/fabric.mod.json +++ b/c2me-opts-worldgen-vanilla/src/main/resources/fabric.mod.json @@ -14,7 +14,6 @@ "c2me-base": "*", "c2me-opts-worldgen-general": "*" }, - "accessWidener": "c2me-opts-worldgen-vanilla.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-rewrites-chunk-serializer/src/main/resources/c2me-rewrites-chunk-serializer.accesswidener b/c2me-rewrites-chunk-serializer/src/main/resources/c2me-rewrites-chunk-serializer.accesswidener deleted file mode 100644 index c96838e4b..000000000 --- a/c2me-rewrites-chunk-serializer/src/main/resources/c2me-rewrites-chunk-serializer.accesswidener +++ /dev/null @@ -1,4 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/world/chunk/ChunkStatus$GenerationTask -accessible class net/minecraft/world/chunk/ChunkStatus$LoadTask diff --git a/c2me-rewrites-chunk-serializer/src/main/resources/fabric.mod.json b/c2me-rewrites-chunk-serializer/src/main/resources/fabric.mod.json index 7f08828ae..7619bbe5d 100644 --- a/c2me-rewrites-chunk-serializer/src/main/resources/fabric.mod.json +++ b/c2me-rewrites-chunk-serializer/src/main/resources/fabric.mod.json @@ -18,7 +18,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-rewrites-chunk-serializer.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-rewrites-chunkio/src/main/resources/c2me-rewrites-chunkio.accesswidener b/c2me-rewrites-chunkio/src/main/resources/c2me-rewrites-chunkio.accesswidener deleted file mode 100644 index af8d4889f..000000000 --- a/c2me-rewrites-chunkio/src/main/resources/c2me-rewrites-chunkio.accesswidener +++ /dev/null @@ -1,7 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/world/storage/StorageIoWorker$Result - -extendable class net/minecraft/world/storage/RegionBasedStorage - -accessible method net/minecraft/world/storage/RegionBasedStorage (Ljava/nio/file/Path;Z)V diff --git a/c2me-rewrites-chunkio/src/main/resources/fabric.mod.json b/c2me-rewrites-chunkio/src/main/resources/fabric.mod.json index f4ff3b8ea..1223dddc2 100644 --- a/c2me-rewrites-chunkio/src/main/resources/fabric.mod.json +++ b/c2me-rewrites-chunkio/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-rewrites-chunkio.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-server-utils/src/main/resources/c2me-server-utils.accesswidener b/c2me-server-utils/src/main/resources/c2me-server-utils.accesswidener deleted file mode 100644 index 3fde5170f..000000000 --- a/c2me-server-utils/src/main/resources/c2me-server-utils.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v1 named diff --git a/c2me-server-utils/src/main/resources/fabric.mod.json b/c2me-server-utils/src/main/resources/fabric.mod.json index 2e6bca703..7e82f7277 100644 --- a/c2me-server-utils/src/main/resources/fabric.mod.json +++ b/c2me-server-utils/src/main/resources/fabric.mod.json @@ -13,7 +13,6 @@ "fabricloader": "*", "c2me-base": "*" }, - "accessWidener": "c2me-server-utils.accesswidener", "authors": [ "RelativityMC", diff --git a/c2me-threading-worldgen/src/main/resources/c2me-threading-worldgen.accesswidener b/c2me-threading-worldgen/src/main/resources/c2me-threading-worldgen.accesswidener deleted file mode 100644 index 421cb2da3..000000000 --- a/c2me-threading-worldgen/src/main/resources/c2me-threading-worldgen.accesswidener +++ /dev/null @@ -1,5 +0,0 @@ -accessWidener v1 named - -accessible class net/minecraft/world/chunk/ChunkStatus$GenerationTask -accessible class net/minecraft/server/world/ChunkTicketManager$DistanceFromNearestPlayerTracker -accessible class net/minecraft/server/world/ChunkTicketManager$NearbyChunkTicketUpdater diff --git a/c2me-threading-worldgen/src/main/resources/fabric.mod.json b/c2me-threading-worldgen/src/main/resources/fabric.mod.json index 213664039..3f2bed2a9 100644 --- a/c2me-threading-worldgen/src/main/resources/fabric.mod.json +++ b/c2me-threading-worldgen/src/main/resources/fabric.mod.json @@ -16,7 +16,6 @@ "c2me-fixes-worldgen-threading-issues": "*", "c2me-fixes-worldgen-vanilla-bugs": "*" }, - "accessWidener": "c2me-threading-worldgen.accesswidener", "authors": [ "RelativityMC", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1f017e4ee..27313fbc8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tests/build.gradle b/tests/build.gradle index c8804c84a..8088ac607 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -1,7 +1,6 @@ allprojects { // apply plugin: 'com.ishland.curseforge.modpackresolver' apply plugin: 'fabric-loom' - apply plugin: 'io.github.juuxel.loom-quiltflower' apply plugin: 'java-library' sourceCompatibility = JavaVersion.VERSION_17 @@ -25,6 +24,9 @@ allprojects { content { includeGroup "curse.maven" } } } + loom { + accessWidenerPath = project(":c2me-base").file("src/main/resources/c2me-base.accesswidener") + } afterEvaluate { migrateMappings.configure { outputDir = project.file("src/main/java")