From c9f5d003282eb3cd15dd83168faeb3e99e6f6686 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Wed, 14 Sep 2022 23:32:41 +0200 Subject: [PATCH] Update to 1.19.2 --- .../requiem/client/screen/RiftScreen.java | 2 +- .../common/screen/RiftScreenHandler.java | 2 +- .../requiem/compat/OriginsCompat.java | 28 +++---------------- .../common/data/LocationPredicateMixin.java | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/src/main/java/ladysnake/requiem/client/screen/RiftScreen.java b/src/main/java/ladysnake/requiem/client/screen/RiftScreen.java index ac2e96cf0..b3e340b97 100644 --- a/src/main/java/ladysnake/requiem/client/screen/RiftScreen.java +++ b/src/main/java/ladysnake/requiem/client/screen/RiftScreen.java @@ -261,6 +261,6 @@ protected void init() { public void updateMatrices(MatrixStack modelViewStack, Matrix4f projectionMatrix) { this.projectionViewMatrix = projectionMatrix.copy(); - this.projectionViewMatrix.multiply(modelViewStack.peek().getPosition()); + this.projectionViewMatrix.multiply(modelViewStack.peek().getModel()); } } diff --git a/src/main/java/ladysnake/requiem/common/screen/RiftScreenHandler.java b/src/main/java/ladysnake/requiem/common/screen/RiftScreenHandler.java index 4cb616418..bbe37ff62 100644 --- a/src/main/java/ladysnake/requiem/common/screen/RiftScreenHandler.java +++ b/src/main/java/ladysnake/requiem/common/screen/RiftScreenHandler.java @@ -106,7 +106,7 @@ private int getAttritionLength(BlockPos target) { } @Override - public ItemStack transferSlot(PlayerEntity player, int index) { + public ItemStack quickTransfer(PlayerEntity player, int index) { return ItemStack.EMPTY; } } diff --git a/src/main/java/ladysnake/requiem/compat/OriginsCompat.java b/src/main/java/ladysnake/requiem/compat/OriginsCompat.java index 10089247d..8887e2ffb 100644 --- a/src/main/java/ladysnake/requiem/compat/OriginsCompat.java +++ b/src/main/java/ladysnake/requiem/compat/OriginsCompat.java @@ -59,17 +59,13 @@ import ladysnake.requiem.common.gamerule.StartingRemnantType; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.resource.ResourceManager; import net.minecraft.resource.ResourceType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import org.quiltmc.qsl.resource.loader.api.ResourceLoader; -import org.quiltmc.qsl.resource.loader.api.reloader.SimpleSynchronousResourceReloader; -import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Set; public final class OriginsCompat { public static final ComponentKey ORIGIN_KEY = ModComponents.ORIGIN; @@ -111,6 +107,7 @@ public final class OriginsCompat { public static final Identifier SOUL_TYPE_LAYER_ID = Requiem.id("soul_type"); public static final Identifier ORIGIN_MANAGER_RESOURCE_ID = new Identifier("origins", "origins"); + public static final Identifier ORIGIN_LAYERS_RESOURCE_ID = new Identifier("origins", "origin_layers"); public static final Identifier VAGRANT_ORIGIN_ID = Requiem.id("vagrant"); private static void applyVagrantOrigin(PlayerEntity player) { @@ -140,26 +137,9 @@ public static void init() { } } }); - OriginDataLoadedCallback.EVENT.register(client -> { - // see Requiem#571 and calio#3, serverside ordering is wrong - if (client) OriginRegistry.get(VAGRANT_ORIGIN_ID).setSpecial(); - }); - ResourceLoader.get(ResourceType.SERVER_DATA).registerReloader(new SimpleSynchronousResourceReloader() { - @Override - public void reload(ResourceManager manager) { - OriginRegistry.get(VAGRANT_ORIGIN_ID).setSpecial(); - } - - @Override - public Identifier getQuiltId() { - return Requiem.id("origins_origin_tweaker"); - } - - @Override - public Collection getQuiltDependencies() { - return Set.of(ORIGIN_MANAGER_RESOURCE_ID); - } - }); + // Fix for Requiem#571, ensure layers are loaded after origins, ensuring in turn that origins are loaded during the callback + ResourceLoader.get(ResourceType.SERVER_DATA).addReloaderOrdering(ORIGIN_MANAGER_RESOURCE_ID, ORIGIN_LAYERS_RESOURCE_ID); + OriginDataLoadedCallback.EVENT.register(client -> OriginRegistry.get(VAGRANT_ORIGIN_ID).setSpecial()); RequiemCompatibilityManager.registerShellDataCallbacks(OriginsCompat.ORIGIN_HOLDER_KEY); RequiemCompatibilityManager.registerShellDataCallbacks(OriginsCompat.APOLI_HOLDER_KEY); } diff --git a/src/main/java/ladysnake/requiem/mixin/common/data/LocationPredicateMixin.java b/src/main/java/ladysnake/requiem/mixin/common/data/LocationPredicateMixin.java index f1f9e0bae..305c38dc1 100644 --- a/src/main/java/ladysnake/requiem/mixin/common/data/LocationPredicateMixin.java +++ b/src/main/java/ladysnake/requiem/mixin/common/data/LocationPredicateMixin.java @@ -68,7 +68,7 @@ private void test(ServerWorld world, double x, double y, double z, CallbackInfoR if (cir.getReturnValueZ() && this.requiem$biomeTag != null) { BlockPos blockPos = new BlockPos(x, y, z); - if (!world.getBiome(blockPos).hasTag(this.requiem$biomeTag)) { + if (!world.getBiome(blockPos).isIn(this.requiem$biomeTag)) { cir.setReturnValue(false); } }