From 0978e58bb693d2ecd23386714246600afa23c590 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 22 Aug 2022 14:59:01 +0300 Subject: [PATCH 1/3] Prevent running on 1.19.1+ (#325) --- fabric/src/main/resources/fabric.mod.json | 2 +- forge/mods.toml | 2 +- forge/src/main/resources/META-INF/mods.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 13a1e039..df19012c 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.19-", + "minecraft": "=1.19", "fabricloader": ">=0.13.0", "fabric": ">=0.54.0" }, diff --git a/forge/mods.toml b/forge/mods.toml index 16817649..6aa7ecb5 100644 --- a/forge/mods.toml +++ b/forge/mods.toml @@ -17,7 +17,7 @@ license = "LGPL-3" [[dependencies.architectury]] modId = "minecraft" mandatory = true -versionRange = "[@MINECRAFT_VERSION@,)" +versionRange = "[@MINECRAFT_VERSION@]" ordering = "NONE" side = "BOTH" diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 40c6f70b..6b2f459b 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ license = "LGPL-3" [[dependencies.architectury]] modId = "minecraft" mandatory = true -versionRange = "[1.19,)" +versionRange = "[1.19]" ordering = "NONE" side = "BOTH" From 0138323e7d7d7fcd317a2bea629a111adc6e1877 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 11 Sep 2022 19:00:45 +0200 Subject: [PATCH 2/3] Use fluid variant rendering for sprites / colours on Fabric (#337) --- .../fluid/fabric/FluidStackHooksImpl.java | 38 +++++-------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java index f11a6804..7eae2fe3 100644 --- a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java +++ b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java @@ -23,6 +23,7 @@ import dev.architectury.fluid.FluidStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; +import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariantAttributes; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -111,23 +112,15 @@ public class FluidStackHooksImpl { @Environment(EnvType.CLIENT) @Nullable public static TextureAtlasSprite getStillTexture(FluidStack stack) { - if (stack.getFluid() == Fluids.EMPTY) return null; - var handler = FluidRenderHandlerRegistry.INSTANCE.get(stack.getFluid()); - if (handler == null) return null; - var sprites = handler.getFluidSprites(null, null, stack.getFluid().defaultFluidState()); - if (sprites == null) return null; - return sprites[0]; + var sprites = FluidVariantRendering.getSprites(FluidStackHooksFabric.toFabric(stack)); + return sprites == null ? null : sprites[0]; } @Environment(EnvType.CLIENT) @Nullable public static TextureAtlasSprite getStillTexture(Fluid fluid) { - if (fluid == Fluids.EMPTY) return null; - var handler = FluidRenderHandlerRegistry.INSTANCE.get(fluid); - if (handler == null) return null; - var sprites = handler.getFluidSprites(null, null, fluid.defaultFluidState()); - if (sprites == null) return null; - return sprites[0]; + var sprites = FluidVariantRendering.getSprites(FluidVariant.of(fluid)); + return sprites == null ? null : sprites[0]; } @Environment(EnvType.CLIENT) @@ -144,23 +137,15 @@ public class FluidStackHooksImpl { @Environment(EnvType.CLIENT) @Nullable public static TextureAtlasSprite getFlowingTexture(FluidStack stack) { - if (stack.getFluid() == Fluids.EMPTY) return null; - var handler = FluidRenderHandlerRegistry.INSTANCE.get(stack.getFluid()); - if (handler == null) return null; - var sprites = handler.getFluidSprites(null, null, stack.getFluid().defaultFluidState()); - if (sprites == null) return null; - return sprites[1]; + var sprites = FluidVariantRendering.getSprites(FluidStackHooksFabric.toFabric(stack)); + return sprites == null ? null : sprites[1]; } @Environment(EnvType.CLIENT) @Nullable public static TextureAtlasSprite getFlowingTexture(Fluid fluid) { - if (fluid == Fluids.EMPTY) return null; - var handler = FluidRenderHandlerRegistry.INSTANCE.get(fluid); - if (handler == null) return null; - var sprites = handler.getFluidSprites(null, null, fluid.defaultFluidState()); - if (sprites == null) return null; - return sprites[1]; + var sprites = FluidVariantRendering.getSprites(FluidVariant.of(fluid)); + return sprites == null ? null : sprites[1]; } @Environment(EnvType.CLIENT) @@ -173,10 +158,7 @@ public class FluidStackHooksImpl { @Environment(EnvType.CLIENT) public static int getColor(FluidStack stack) { - if (stack.getFluid() == Fluids.EMPTY) return -1; - var handler = FluidRenderHandlerRegistry.INSTANCE.get(stack.getFluid()); - if (handler == null) return -1; - return handler.getFluidColor(null, null, stack.getFluid().defaultFluidState()); + return FluidVariantRendering.getColor(FluidStackHooksFabric.toFabric(stack)); } @Environment(EnvType.CLIENT) From dbf7ee25c88154f4b79f3acedd7bacd7abc8d648 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 11 Sep 2022 17:54:45 +0200 Subject: [PATCH 3/3] Use correct event bus for key mapping registry on Forge --- .../client/keymappings/forge/KeyMappingRegistryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/src/main/java/dev/architectury/registry/client/keymappings/forge/KeyMappingRegistryImpl.java b/forge/src/main/java/dev/architectury/registry/client/keymappings/forge/KeyMappingRegistryImpl.java index e82cfbdc..1f51d8c7 100644 --- a/forge/src/main/java/dev/architectury/registry/client/keymappings/forge/KeyMappingRegistryImpl.java +++ b/forge/src/main/java/dev/architectury/registry/client/keymappings/forge/KeyMappingRegistryImpl.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber(modid = ArchitecturyForge.MOD_ID, value = Dist.CLIENT) +@Mod.EventBusSubscriber(modid = ArchitecturyForge.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class KeyMappingRegistryImpl { private static final Logger LOGGER = LogManager.getLogger(KeyMappingRegistryImpl.class); private static final List MAPPINGS = new ArrayList<>();