From bcfd0aed88cae857ff09e8e7e531324b04e016d0 Mon Sep 17 00:00:00 2001 From: reidbhuntley Date: Mon, 20 Dec 2021 20:44:21 -0500 Subject: [PATCH 1/2] Exempt critical issues from being marked as stale --- .github/workflows/close_issues.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/close_issues.yml b/.github/workflows/close_issues.yml index 5af15afcc..ccabc70e8 100644 --- a/.github/workflows/close_issues.yml +++ b/.github/workflows/close_issues.yml @@ -15,7 +15,7 @@ jobs: days-before-issue-stale: 21 days-before-issue-close: 21 stale-issue-label: "stale" - exempt-issue-labels: "timeless, suggestion" + exempt-issue-labels: "timeless, suggestion, critical" stale-issue-message: "This issue has been marked as stale because it has been inactive for 3 weeks. It will be closed if it remains inactive for another 3 weeks." close-issue-message: "This issue has been closed since it has been inactive for 3 weeks since it was marked as stale." days-before-pr-stale: -1 From 848eb904f587a21e8aea9d9673e34fc58dbbbb5a Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Mon, 20 Dec 2021 21:51:21 -0800 Subject: [PATCH 2/2] Fluid#isSame is asymmetric - Fixes #2490 --- .../com/simibubi/create/events/ClientEvents.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java index ed817e63b..25824347d 100644 --- a/src/main/java/com/simibubi/create/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/events/ClientEvents.java @@ -257,13 +257,13 @@ public class ClientEvents { Fluid fluid = fluidstate.getType(); - if (fluid.isSame(AllFluids.CHOCOLATE.get())) { + if (AllFluids.CHOCOLATE.get().isSame(fluid)) { event.setDensity(5f); event.setCanceled(true); return; } - if (fluid.isSame(AllFluids.HONEY.get())) { + if (AllFluids.HONEY.get().isSame(fluid)) { event.setDensity(1.5f); event.setCanceled(true); return; @@ -283,18 +283,18 @@ public class ClientEvents { Level level = Minecraft.getInstance().level; BlockPos blockPos = info.getBlockPosition(); FluidState fluidstate = level.getFluidState(blockPos); - if (info.getPosition().y > blockPos.getY() + fluidstate.getHeight(level, blockPos)) + if (info.getPosition().y > blockPos.getY() + fluidstate.getHeight(level, blockPos)) return; - + Fluid fluid = fluidstate.getType(); - if (fluid.isSame(AllFluids.CHOCOLATE.get())) { + if (AllFluids.CHOCOLATE.get().isSame(fluid)) { event.setRed(98 / 256f); event.setGreen(32 / 256f); event.setBlue(32 / 256f); } - if (fluid.isSame(AllFluids.HONEY.get())) { + if (AllFluids.HONEY.get().isSame(fluid)) { event.setRed(234 / 256f); event.setGreen(174 / 256f); event.setBlue(47 / 256f);