Merge remote-tracking branch 'origin/master' into five

EngineHub · Dec 11, 2023 · e519d28 · e519d28
2 parents 06c7142 + d024032
commit e519d28
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/craftbook-bukkit/build.gradle.kts b/craftbook-bukkit/build.gradle.kts
@@ -37,7 +37,7 @@ configurations["testImplementation"].extendsFrom(localImplementation)
 dependencies {
     "api"(project(":craftbook-core"))
     "api"(project(":craftbook-libs:bukkit"))
-    "localImplementation"("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") {
+    "localImplementation"("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") {
         exclude("junit", "junit")
         exclude(group = "org.slf4j", module = "slf4j-api")
     }

diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/Snow.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/Snow.java
@@ -493,7 +493,7 @@ public void run() {
     private static List<String> getDefaultReplacables() {
         return Lists.newArrayList(
             BlockTypes.DEAD_BUSH.getId(),
-            BlockTypes.GRASS.getId(),
+            BlockTypes.SHORT_GRASS.getId(),
             BlockTypes.FIRE.getId(),
             BlockTypes.FERN.getId());
     }

diff --git a/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/BonemealTerraformer.java b/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/BonemealTerraformer.java
@@ -148,15 +148,15 @@ public void terraform() {
             if (consumeBonemeal()) {
                 int t = ThreadLocalRandom.current().nextInt(7);
                 if (t == 0) {
-                    b.getRelative(0, 1, 0).setType(Material.GRASS);
+                    b.getRelative(0, 1, 0).setType(Material.SHORT_GRASS);
                 } else if (t == 1) {
                     b.getRelative(0, 1, 0).setType(Material.DANDELION);
                 } else if (t == 2) {
                     b.getRelative(0, 1, 0).setType(Material.POPPY);
                 } else if (t == 3) {
                     b.getRelative(0, 1, 0).setType(Material.FERN);
                 } else {
-                    b.getRelative(0, 1, 0).setType(Material.GRASS);
+                    b.getRelative(0, 1, 0).setType(Material.SHORT_GRASS);
                 }
             }
             return;

diff --git a/...c/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/CombineHarvester.java b/...c/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/CombineHarvester.java
@@ -110,6 +110,8 @@ public boolean harvestable(Block block) {
             case MELON:
             case PUMPKIN:
                 return true;
+            case BAMBOO:
+                return below == Material.BAMBOO;
             default:
                 return Tag.LOGS.isTagged(block.getType());
         }

diff --git a/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/miscellaneous/FlameThrower.java b/...ain/java/org/enginehub/craftbook/mechanics/ic/gates/world/miscellaneous/FlameThrower.java
@@ -87,7 +87,7 @@ public void sendFlames(final boolean make) {
             Block fire = block.getRelative(direction, 2);
             for (int i = 0; i < distance; i++) {
                 if (make) {
-                    if (fire.getType() == Material.AIR || fire.getType() == Material.GRASS) {
+                    if (fire.getType() == Material.AIR || fire.getType() == Material.SHORT_GRASS) {
                         fire.setType(Material.FIRE);
                     }
                 } else if (fire.getType() == Material.FIRE) {
@@ -104,7 +104,7 @@ public void sendFlames(final boolean make) {
 
                     Block fire = block.getRelative(direction, 2 + fi);
                     if (make) {
-                        if (fire.getType() == Material.AIR || fire.getType() == Material.GRASS) {
+                        if (fire.getType() == Material.AIR || fire.getType() == Material.SHORT_GRASS) {
                             fire.setType(Material.FIRE);
                         }
                     } else if (fire.getType() == Material.FIRE) {