From ad5490868280a646a5a59ce885081883802b7e20 Mon Sep 17 00:00:00 2001 From: Su5eD Date: Wed, 9 Aug 2023 12:58:26 +0200 Subject: [PATCH] Re-add removed access wideners These are still required by mods, even though we don't use them ourselves. --- fabric-biome-api-v1/build.gradle | 4 ++ .../fabric-biome-api-v1.accesswidener | 57 +++++++++++++++++++ .../src/main/resources/fabric.mod.json | 1 + fabric-item-group-api-v1/build.gradle | 2 +- .../fabric-item-group-api-v1.accesswidener | 21 +++++++ .../src/main/resources/fabric.mod.json | 1 + gradle.properties | 2 +- 7 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener create mode 100644 fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.accesswidener diff --git a/fabric-biome-api-v1/build.gradle b/fabric-biome-api-v1/build.gradle index 4d5ccb2d0..f81f424ce 100644 --- a/fabric-biome-api-v1/build.gradle +++ b/fabric-biome-api-v1/build.gradle @@ -1,6 +1,10 @@ archivesBaseName = "fabric-biome-api-v1" version = getSubprojectVersion(project) +loom { + accessWidenerPath = file("src/main/resources/fabric-biome-api-v1.accesswidener") +} + testDependencies(project, [ ':fabric-api-base', // ':fabric-resource-loader-v0', diff --git a/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener new file mode 100644 index 000000000..6009599f0 --- /dev/null +++ b/fabric-biome-api-v1/src/main/resources/fabric-biome-api-v1.accesswidener @@ -0,0 +1,57 @@ +accessWidener v1 named +accessible class net/minecraft/world/biome/Biome$Weather + +# Top-Level Biome Fields Access +accessible field net/minecraft/world/biome/Biome weather Lnet/minecraft/world/biome/Biome$Weather; +mutable field net/minecraft/world/biome/Biome weather Lnet/minecraft/world/biome/Biome$Weather; +accessible field net/minecraft/world/biome/Biome generationSettings Lnet/minecraft/world/biome/GenerationSettings; +accessible field net/minecraft/world/biome/Biome spawnSettings Lnet/minecraft/world/biome/SpawnSettings; + +# Biome Weather +accessible method net/minecraft/world/biome/Biome$Weather (ZFLnet/minecraft/world/biome/Biome$TemperatureModifier;F)V + +# Biome Effects +accessible field net/minecraft/world/biome/BiomeEffects fogColor I +mutable field net/minecraft/world/biome/BiomeEffects fogColor I +accessible field net/minecraft/world/biome/BiomeEffects waterColor I +mutable field net/minecraft/world/biome/BiomeEffects waterColor I +accessible field net/minecraft/world/biome/BiomeEffects waterFogColor I +mutable field net/minecraft/world/biome/BiomeEffects waterFogColor I +accessible field net/minecraft/world/biome/BiomeEffects skyColor I +mutable field net/minecraft/world/biome/BiomeEffects skyColor I +accessible field net/minecraft/world/biome/BiomeEffects foliageColor Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects foliageColor Ljava/util/Optional; +accessible field net/minecraft/world/biome/BiomeEffects grassColor Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects grassColor Ljava/util/Optional; +accessible field net/minecraft/world/biome/BiomeEffects grassColorModifier Lnet/minecraft/world/biome/BiomeEffects$GrassColorModifier; +mutable field net/minecraft/world/biome/BiomeEffects grassColorModifier Lnet/minecraft/world/biome/BiomeEffects$GrassColorModifier; +accessible field net/minecraft/world/biome/BiomeEffects particleConfig Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects particleConfig Ljava/util/Optional; +accessible field net/minecraft/world/biome/BiomeEffects loopSound Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects loopSound Ljava/util/Optional; +accessible field net/minecraft/world/biome/BiomeEffects moodSound Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects moodSound Ljava/util/Optional; +accessible field net/minecraft/world/biome/BiomeEffects additionsSound Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects additionsSound Ljava/util/Optional; +accessible field net/minecraft/world/biome/BiomeEffects music Ljava/util/Optional; +mutable field net/minecraft/world/biome/BiomeEffects music Ljava/util/Optional; + +# Spawn Settings / Density +accessible field net/minecraft/world/biome/SpawnSettings creatureSpawnProbability F +mutable field net/minecraft/world/biome/SpawnSettings creatureSpawnProbability F +accessible field net/minecraft/world/biome/SpawnSettings spawners Ljava/util/Map; +mutable field net/minecraft/world/biome/SpawnSettings spawners Ljava/util/Map; +accessible field net/minecraft/world/biome/SpawnSettings spawnCosts Ljava/util/Map; +mutable field net/minecraft/world/biome/SpawnSettings spawnCosts Ljava/util/Map; + +accessible method net/minecraft/world/biome/SpawnSettings$SpawnDensity (DD)V + +# Generation Settings +accessible field net/minecraft/world/biome/GenerationSettings carvers Ljava/util/Map; +mutable field net/minecraft/world/biome/GenerationSettings carvers Ljava/util/Map; +accessible field net/minecraft/world/biome/GenerationSettings features Ljava/util/List; +mutable field net/minecraft/world/biome/GenerationSettings features Ljava/util/List; +accessible field net/minecraft/world/biome/GenerationSettings flowerFeatures Ljava/util/function/Supplier; +mutable field net/minecraft/world/biome/GenerationSettings flowerFeatures Ljava/util/function/Supplier; +accessible field net/minecraft/world/biome/GenerationSettings allowedFeatures Ljava/util/function/Supplier; +mutable field net/minecraft/world/biome/GenerationSettings allowedFeatures Ljava/util/function/Supplier; diff --git a/fabric-biome-api-v1/src/main/resources/fabric.mod.json b/fabric-biome-api-v1/src/main/resources/fabric.mod.json index bfa2b40d3..21c70d68f 100644 --- a/fabric-biome-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-biome-api-v1/src/main/resources/fabric.mod.json @@ -23,6 +23,7 @@ "mixins": [ "fabric-biome-api-v1.mixins.json" ], + "accessWidener" : "fabric-biome-api-v1.accesswidener", "custom": { "fabric-api:module-lifecycle": "experimental" } diff --git a/fabric-item-group-api-v1/build.gradle b/fabric-item-group-api-v1/build.gradle index 2b3e87d3e..5df79d898 100644 --- a/fabric-item-group-api-v1/build.gradle +++ b/fabric-item-group-api-v1/build.gradle @@ -7,5 +7,5 @@ moduleDependencies(project, [ ]) loom { -// accessWidenerPath = file('src/main/resources/fabric-item-group-api-v1.accesswidener') + accessWidenerPath = file('src/main/resources/fabric-item-group-api-v1.accesswidener') } diff --git a/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.accesswidener b/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.accesswidener new file mode 100644 index 000000000..37fb42263 --- /dev/null +++ b/fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.accesswidener @@ -0,0 +1,21 @@ +accessWidener v2 named + +transitive-accessible field net/minecraft/item/ItemGroups BUILDING_BLOCKS Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups COLORED_BLOCKS Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups NATURAL Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups FUNCTIONAL Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups REDSTONE Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups HOTBAR Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups SEARCH Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups TOOLS Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups COMBAT Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups FOOD_AND_DRINK Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/registry/RegistryKey; +transitive-accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups displayContext Lnet/minecraft/item/ItemGroup$DisplayContext; +transitive-accessible class net/minecraft/item/ItemGroup$StackVisibility + +transitive-accessible class net/minecraft/item/ItemGroup$Entries +accessible class net/minecraft/item/ItemGroup$EntriesImpl diff --git a/fabric-item-group-api-v1/src/main/resources/fabric.mod.json b/fabric-item-group-api-v1/src/main/resources/fabric.mod.json index db18583ca..eb24c8ad0 100644 --- a/fabric-item-group-api-v1/src/main/resources/fabric.mod.json +++ b/fabric-item-group-api-v1/src/main/resources/fabric.mod.json @@ -23,6 +23,7 @@ "mixins": [ "fabric-item-group-api-v1.mixins.json" ], + "accessWidener": "fabric-item-group-api-v1.accesswidener", "custom": { "fabric-api:module-lifecycle": "stable" } diff --git a/gradle.properties b/gradle.properties index 8d3af83f8..2ff151da8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,5 +67,5 @@ fabric-client-tags-api-v1-version=1.1.1 loom.platform=forge forge_version=1.20.1-47.1.3 pack_format=15 -forgified_version=1.7.2 +forgified_version=1.8.0 forge_fabric_loader_version=2.2.1+0.14.21+1.20.1