From e3df3ab012a353c21a996e5d40e4f6c3c7af8a2d Mon Sep 17 00:00:00 2001 From: "Panda.com" Date: Sun, 18 Oct 2020 15:47:47 +0200 Subject: [PATCH] added tall_flowers.json and requested changes --- .../slimefun4/utils/tags/SlimefunTag.java | 5 +++++ .../resources/tags/block_placer_ignored_materials.json | 6 ++---- src/main/resources/tags/sensitive_materials.json | 4 ++-- src/main/resources/tags/tall_flowers.json | 10 ++++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/tags/tall_flowers.json diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java index aba7a1189..289314298 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java @@ -126,6 +126,11 @@ public enum SlimefunTag implements Tag { */ PRESSURE_PLATES, + /** + * All tall flowers because minecraft doesn't have a tag for this + */ + TALL_FLOWERS, + /** * Materials which are sensitive to break. * Things like Saplings or Pressure plates which break as well when you break diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 8601e2471..dba4fd923 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -1,17 +1,17 @@ { "values" : [ "#slimefun:sensitive_materials", + "#slimefun:tall_flowers", + "#slimefun:mushrooms", "#minecraft:beds", "#minecraft:buttons", "#minecraft:signs", - "#slimefun:mushrooms", "#minecraft:doors", "minecraft:bamboo", "#minecraft:rails", "#minecraft:small_flowers", "#minecraft:coral_blocks", "#minecraft:coral_plants", - "#minecraft:small_flowers", "#minecraft:banners", "minecraft:sugar_cane", "minecraft:ladder", @@ -19,8 +19,6 @@ "minecraft:lever", "minecraft:repeater", "minecraft:tripwire_hook", - "minecraft:tall_grass", - "minecraft:large_fern", "minecraft:lily_pad", "minecraft:dead_bush", "minecraft:fern", diff --git a/src/main/resources/tags/sensitive_materials.json b/src/main/resources/tags/sensitive_materials.json index 455173a3b..daae5c94f 100644 --- a/src/main/resources/tags/sensitive_materials.json +++ b/src/main/resources/tags/sensitive_materials.json @@ -2,7 +2,7 @@ "values" : [ "#minecraft:saplings", "#slimefun:torches", - "minecraft:cake", - "#slimefun:pressure_plates" + "#slimefun:pressure_plates", + "minecraft:cake" ] } diff --git a/src/main/resources/tags/tall_flowers.json b/src/main/resources/tags/tall_flowers.json new file mode 100644 index 000000000..c725cbaac --- /dev/null +++ b/src/main/resources/tags/tall_flowers.json @@ -0,0 +1,10 @@ +{ + "values" : [ + "#minecraft:lilac", + "#minecraft:rose_bush", + "#minecraft:peony", + "minecraft:tall_grass", + "minecraft:large_fern", + "sunflower" + ] +}