mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev

Browse source
This commit is contained in:
reidbhuntley 2021-12-21 12:23:12 -05:00
commit a61739eb1e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/close_issues.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
days-before-issue-stale: 21 days-before-issue-stale: 21
days-before-issue-close: 21 days-before-issue-close: 21
stale-issue-label: "stale" 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." 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." 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 days-before-pr-stale: -1

8
src/main/java/com/simibubi/create/events/ClientEvents.java
View file

@ -257,13 +257,13 @@ public class ClientEvents {
Fluid fluid = fluidstate.getType(); Fluid fluid = fluidstate.getType();
if (fluid.isSame(AllFluids.CHOCOLATE.get())) { if (AllFluids.CHOCOLATE.get().isSame(fluid)) {
event.setDensity(5f); event.setDensity(5f);
event.setCanceled(true); event.setCanceled(true);
return; return;
} }
if (fluid.isSame(AllFluids.HONEY.get())) { if (AllFluids.HONEY.get().isSame(fluid)) {
event.setDensity(1.5f); event.setDensity(1.5f);
event.setCanceled(true); event.setCanceled(true);
return; return;
@ -288,13 +288,13 @@ public class ClientEvents {
Fluid fluid = fluidstate.getType(); Fluid fluid = fluidstate.getType();
if (fluid.isSame(AllFluids.CHOCOLATE.get())) { if (AllFluids.CHOCOLATE.get().isSame(fluid)) {
event.setRed(98 / 256f); event.setRed(98 / 256f);
event.setGreen(32 / 256f); event.setGreen(32 / 256f);
event.setBlue(32 / 256f); event.setBlue(32 / 256f);
} }
if (fluid.isSame(AllFluids.HONEY.get())) { if (AllFluids.HONEY.get().isSame(fluid)) {
event.setRed(234 / 256f); event.setRed(234 / 256f);
event.setGreen(174 / 256f); event.setGreen(174 / 256f);
event.setBlue(47 / 256f); event.setBlue(47 / 256f);