From 4307d5ca0af28d506d96dd667560cb1538926f31 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 20 Jan 2023 23:11:34 +0800 Subject: [PATCH] Update to 23w03a --- .github/workflows/1.19_push.yml | 1 + .../hooks/level/biome/BiomeHooks.java | 8 ++++---- .../hooks/level/biome/ClimateProperties.java | 5 ++--- .../main/resources/architectury.accessWidener | 4 ++-- .../biome/fabric/BiomeModificationsImpl.java | 5 ++--- gradle.properties | 16 ++++++++-------- settings.gradle | 4 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/1.19_push.yml b/.github/workflows/1.19_push.yml index 65f9931b..c47bd120 100644 --- a/.github/workflows/1.19_push.yml +++ b/.github/workflows/1.19_push.yml @@ -10,6 +10,7 @@ on: - "1.19" - "1.19.2" - "1.19.3" + - "1.19.4" workflow_dispatch: inputs: norelease: diff --git a/common/src/main/java/dev/architectury/hooks/level/biome/BiomeHooks.java b/common/src/main/java/dev/architectury/hooks/level/biome/BiomeHooks.java index a4da79ce..70679638 100644 --- a/common/src/main/java/dev/architectury/hooks/level/biome/BiomeHooks.java +++ b/common/src/main/java/dev/architectury/hooks/level/biome/BiomeHooks.java @@ -149,8 +149,8 @@ public final class BiomeHooks { } @Override - public Mutable setPrecipitation(Biome.Precipitation precipitation) { - climateSettings.precipitation = precipitation; + public Mutable setHasPrecipitation(boolean hasPrecipitation) { + climateSettings.hasPrecipitation = hasPrecipitation; return this; } @@ -173,8 +173,8 @@ public final class BiomeHooks { } @Override - public Biome.Precipitation getPrecipitation() { - return climateSettings.precipitation; + public boolean hasPrecipitation() { + return climateSettings.hasPrecipitation; } @Override diff --git a/common/src/main/java/dev/architectury/hooks/level/biome/ClimateProperties.java b/common/src/main/java/dev/architectury/hooks/level/biome/ClimateProperties.java index f45e41d8..6151ea7b 100644 --- a/common/src/main/java/dev/architectury/hooks/level/biome/ClimateProperties.java +++ b/common/src/main/java/dev/architectury/hooks/level/biome/ClimateProperties.java @@ -19,11 +19,10 @@ package dev.architectury.hooks.level.biome; -import net.minecraft.world.level.biome.Biome.Precipitation; import net.minecraft.world.level.biome.Biome.TemperatureModifier; public interface ClimateProperties { - Precipitation getPrecipitation(); + boolean hasPrecipitation(); float getTemperature(); @@ -32,7 +31,7 @@ public interface ClimateProperties { float getDownfall(); interface Mutable extends ClimateProperties { - Mutable setPrecipitation(Precipitation precipitation); + Mutable setHasPrecipitation(boolean hasPrecipitation); Mutable setTemperature(float temperature); diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index d9c0e662..2be094ec 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -59,8 +59,8 @@ accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/Str transitive-accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/String; accessible field net/minecraft/server/packs/repository/PackRepository sources Ljava/util/Set; mutable field net/minecraft/server/packs/repository/PackRepository sources Ljava/util/Set; -accessible field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation; -mutable field net/minecraft/world/level/biome/Biome$ClimateSettings precipitation Lnet/minecraft/world/level/biome/Biome$Precipitation; +accessible field net/minecraft/world/level/biome/Biome$ClimateSettings hasPrecipitation Z +mutable field net/minecraft/world/level/biome/Biome$ClimateSettings hasPrecipitation Z accessible field net/minecraft/world/level/biome/Biome$ClimateSettings temperature F mutable field net/minecraft/world/level/biome/Biome$ClimateSettings temperature F accessible field net/minecraft/world/level/biome/Biome$ClimateSettings temperatureModifier Lnet/minecraft/world/level/biome/Biome$TemperatureModifier; diff --git a/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java b/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java index a7283378..271b8da8 100644 --- a/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java +++ b/fabric/src/main/java/dev/architectury/registry/level/biome/fabric/BiomeModificationsImpl.java @@ -37,7 +37,6 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.biome.*; -import net.minecraft.world.level.biome.Biome.Precipitation; import net.minecraft.world.level.biome.Biome.TemperatureModifier; import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier; import net.minecraft.world.level.levelgen.GenerationStep; @@ -231,8 +230,8 @@ public class BiomeModificationsImpl { private static ClimateProperties.Mutable wrapWeather(Biome biome, WeatherContext context) { return new BiomeHooks.ClimateWrapped(biome) { @Override - public ClimateProperties.Mutable setPrecipitation(Precipitation precipitation) { - context.setPrecipitation(precipitation); + public ClimateProperties.Mutable setHasPrecipitation(boolean hasPrecipitation) { + context.setPrecipitation(hasPrecipitation); return this; } diff --git a/gradle.properties b/gradle.properties index 54233fc8..683f696b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,21 @@ org.gradle.jvmargs=-Xmx6G org.gradle.daemon=false -platforms=fabric,forge +platforms=fabric -minecraft_version=1.19.3 -supported_version=1.19.3 +minecraft_version=23w03a +supported_version=1.19.4 (23w03a) -artifact_type=release +artifact_type=beta archives_base_name=architectury archives_base_name_snapshot=architectury-snapshot -base_version=7.0 +base_version=8.0 maven_group=dev.architectury -fabric_loader_version=0.14.11 -fabric_api_version=0.68.1+1.19.3 -mod_menu_version=3.1.0 +fabric_loader_version=0.14.13 +fabric_api_version=0.72.1+1.19.4 +mod_menu_version=5.0.2 forge_version=44.0.6 diff --git a/settings.gradle b/settings.gradle index 8bfde812..0f4b94fd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,9 +13,9 @@ if (JavaVersion.current().ordinal() + 1 < 17) { include("common") include("fabric") -include("forge") +//include("forge") include("testmod-common") include("testmod-fabric") -include("testmod-forge") +//include("testmod-forge") rootProject.name = "architectury"