From 9003cbe9c444879b9ffea9fdc9813eb6db5d45ae Mon Sep 17 00:00:00 2001 From: modmuss50 <modmuss50@gmail.com> Date: Mon, 27 Feb 2023 16:56:40 +0000 Subject: [PATCH] 1.19.4-pre2 Just mapping updates --- .../net/fabricmc/fabric/impl/biome/NetherBiomeData.java | 6 +++--- .../fabricmc/fabric/mixin/biome/NetherBiomePresetMixin.java | 2 +- .../fabric/mixin/transfer/HopperBlockEntityMixin.java | 2 +- gradle.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java index 9e5ff6e06..61781d25f 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/NetherBiomeData.java @@ -27,13 +27,13 @@ import java.util.function.Function; import com.google.common.base.Preconditions; import com.mojang.datafixers.util.Pair; -import net.minecraft.class_8197; import net.minecraft.registry.RegistryKey; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList; import net.minecraft.world.biome.source.util.MultiNoiseUtil; /** - * Internal data for modding Vanilla's {@link class_8197.Preset#NETHER}. + * Internal data for modding Vanilla's {@link MultiNoiseBiomeSourceParameterList.Preset#NETHER}. */ public final class NetherBiomeData { // Cached sets of the biomes that would generate from Vanilla's default biome source without consideration @@ -53,7 +53,7 @@ public final class NetherBiomeData { } public static boolean canGenerateInNether(RegistryKey<Biome> biome) { - return class_8197.Preset.NETHER.method_49514().anyMatch(input -> input.equals(biome)); + return MultiNoiseBiomeSourceParameterList.Preset.NETHER.biomeStream().anyMatch(input -> input.equals(biome)); } private static void clearBiomeSourceCache() { diff --git a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/NetherBiomePresetMixin.java b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/NetherBiomePresetMixin.java index 8f385bb9b..8d48d8578 100644 --- a/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/NetherBiomePresetMixin.java +++ b/fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/NetherBiomePresetMixin.java @@ -29,7 +29,7 @@ import net.minecraft.world.biome.source.util.MultiNoiseUtil; import net.fabricmc.fabric.impl.biome.NetherBiomeData; -@Mixin(targets = "net/minecraft/class_8197$Preset$1") +@Mixin(targets = "net/minecraft/world/biome/source/MultiNoiseBiomeSourceParameterList$Preset$1") public class NetherBiomePresetMixin { @Inject(method = "apply", at = @At("RETURN"), cancellable = true) public <T> void apply(Function<RegistryKey<Biome>, T> function, CallbackInfoReturnable<MultiNoiseUtil.Entries<T>> cir) { diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java index 28842242b..cff062a39 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java @@ -86,7 +86,7 @@ public class HopperBlockEntityMixin { if (inputInventory != null) return; // Otherwise inject our transfer logic. - BlockPos sourcePos = BlockPos.method_49637(hopper.getHopperX(), hopper.getHopperY() + 1.0D, hopper.getHopperZ()); + BlockPos sourcePos = BlockPos.ofFloored(hopper.getHopperX(), hopper.getHopperY() + 1.0D, hopper.getHopperZ()); Storage<ItemVariant> source = ItemStorage.SIDED.find(world, sourcePos, Direction.DOWN); if (source != null) { diff --git a/gradle.properties b/gradle.properties index c07f03a20..0252d69ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true version=0.75.1 -minecraft_version=1.19.4-pre1 +minecraft_version=1.19.4-pre2 yarn_version=+build.1 loader_version=0.14.14 installer_version=0.11.1