From dbb955808fa1d04d1d01d2fe0f673199674bee2a Mon Sep 17 00:00:00 2001 From: Emma Pointer-Null Date: Sat, 19 Mar 2022 08:58:32 -0400 Subject: [PATCH] Update to 22w11a (#222) * Update to 22w11a * fix aw * update fapi ver --- .../hooks/level/biome/BiomeHooks.java | 12 ------------ .../hooks/level/biome/BiomeProperties.java | 6 ------ .../main/resources/architectury.accessWidener | 2 -- .../mixin/fabric/MixinChunkSerializer.java | 10 ++++++---- .../mixin/fabric/client/MixinScreen.java | 5 ++--- .../biome/fabric/BiomeModificationsImpl.java | 6 ------ fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 16 ++++++++-------- settings.gradle | 4 ++-- 9 files changed, 19 insertions(+), 44 deletions(-) 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 060cc21f..5819c8c9 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 @@ -25,7 +25,6 @@ import net.minecraft.sounds.SoundEvent; 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.BiomeCategory; import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver; @@ -85,11 +84,6 @@ public final class BiomeHooks { public SpawnProperties getSpawnProperties() { return spawnProperties; } - - @Override - public BiomeCategory getCategory() { - return biome.biomeCategory; - } } public static class MutableBiomeWrapped extends BiomeWrapped implements BiomeProperties.Mutable { @@ -134,12 +128,6 @@ public final class BiomeHooks { public SpawnProperties.Mutable getSpawnProperties() { return (SpawnProperties.Mutable) super.getSpawnProperties(); } - - @Override - public Mutable setCategory(BiomeCategory category) { - biome.biomeCategory = category; - return this; - } } public static class ClimateWrapped implements ClimateProperties.Mutable { diff --git a/common/src/main/java/dev/architectury/hooks/level/biome/BiomeProperties.java b/common/src/main/java/dev/architectury/hooks/level/biome/BiomeProperties.java index 123499a7..2e56cd9d 100644 --- a/common/src/main/java/dev/architectury/hooks/level/biome/BiomeProperties.java +++ b/common/src/main/java/dev/architectury/hooks/level/biome/BiomeProperties.java @@ -19,8 +19,6 @@ package dev.architectury.hooks.level.biome; -import net.minecraft.world.level.biome.Biome.BiomeCategory; - public interface BiomeProperties { ClimateProperties getClimateProperties(); @@ -30,8 +28,6 @@ public interface BiomeProperties { SpawnProperties getSpawnProperties(); - BiomeCategory getCategory(); - interface Mutable extends BiomeProperties { @Override ClimateProperties.Mutable getClimateProperties(); @@ -44,7 +40,5 @@ public interface BiomeProperties { @Override SpawnProperties.Mutable getSpawnProperties(); - - Mutable setCategory(BiomeCategory category); } } diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index 8a469517..366f5279 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -58,8 +58,6 @@ accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/Str 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 Lnet/minecraft/world/level/biome/Biome$ClimateSettings; -accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory; -mutable field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory; 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 temperature F diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinChunkSerializer.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinChunkSerializer.java index bc59bb4d..d9492b38 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinChunkSerializer.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinChunkSerializer.java @@ -21,6 +21,7 @@ package dev.architectury.mixin.fabric; import com.mojang.serialization.Codec; import dev.architectury.event.events.common.ChunkEvent; +import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -49,9 +50,10 @@ public class MixinChunkSerializer { @Inject(method = "read", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILHARD) private static void load(ServerLevel serverLevel, PoiManager poiManager, ChunkPos chunkPos, CompoundTag compoundTag, CallbackInfoReturnable cir, ChunkPos chunkPos2, UpgradeData upgradeData, - boolean bl, ListTag listTag, int i, LevelChunkSection levelChunkSections[], boolean bl2, ChunkSource chunkSource, - LevelLightEngine levelLightEngine, Registry registry, Codec> codec, long m, ChunkStatus.ChunkType chunkType, - BlendingData blendingData, ChunkAccess chunkAccess2) { - ChunkEvent.LOAD_DATA.invoker().load(chunkAccess2, serverLevel, compoundTag); + boolean bl, ListTag listTag, int i, LevelChunkSection[] levelChunkSections, boolean bl2, + ChunkSource chunkSource, LevelLightEngine levelLightEngine, Registry registry, + Codec>> codec, boolean bl3, long m, + ChunkStatus.ChunkType chunkType, BlendingData blendingData, ChunkAccess chunkAccess) { + ChunkEvent.LOAD_DATA.invoker().load(chunkAccess, serverLevel, compoundTag); } } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java index 3e1ff1c6..9d224783 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java @@ -74,9 +74,8 @@ public abstract class MixinScreen implements ScreenInputDelegate { return inputDelegate; } - @Inject(method = "init(Lnet/minecraft/client/Minecraft;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;clearWidgets()V", ordinal = 0), - cancellable = true) - private void preInit(Minecraft minecraft, int i, int j, CallbackInfo ci) { + @Inject(method = "rebuildWidgets", at = @At(value = "HEAD"), cancellable = true) + private void preInit(CallbackInfo ci) { if (ClientGuiEvent.INIT_PRE.invoker().init((Screen) (Object) this, getAccess()).isFalse()) { ci.cancel(); } 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 a95b0989..378db18a 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 @@ -36,7 +36,6 @@ import net.minecraft.sounds.SoundEvent; 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.BiomeCategory; import net.minecraft.world.level.biome.Biome.Precipitation; import net.minecraft.world.level.biome.Biome.TemperatureModifier; import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier; @@ -121,11 +120,6 @@ public class BiomeModificationsImpl { new MutableGenerationProperties(biome, context.getGenerationSettings()), new MutableSpawnProperties(biome, context.getSpawnSettings()) ) { - @Override - public BiomeProperties.Mutable setCategory(BiomeCategory category) { - context.setCategory(category); - return this; - } }; } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index f5e0a9e3..6e94638b 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ }, "icon": "icon.png", "depends": { - "minecraft": "~1.18-", + "minecraft": "~1.19-", "fabricloader": ">=0.13.0", "fabric": ">=0.44.0" }, diff --git a/gradle.properties b/gradle.properties index 6e706ede..db83e49a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,20 @@ org.gradle.jvmargs=-Xmx6G org.gradle.daemon=false -forgeEnabled=true +forgeEnabled=false -minecraft_version=1.18.2 -supported_version=1.18.2 +minecraft_version=22w11a +supported_version=22w11a -cf_type=release +cf_type=alpha archives_base_name=architectury archives_base_name_snapshot=architectury-snapshot -base_version=4.1 +base_version=5.1 maven_group=dev.architectury -fabric_loader_version=0.13.2 -fabric_api_version=0.47.8+1.18.2 -mod_menu_version=3.0.0 +fabric_loader_version=0.13.3 +fabric_api_version=0.49.2+1.19 +mod_menu_version=3.1.0 forge_version=40.0.1 diff --git a/settings.gradle b/settings.gradle index 938c20fb..752c1f7d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,9 +14,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"