From 615e15b06cc5e5ca91c751d53f3efc0d9ebadff7 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Mon, 14 Mar 2022 09:24:39 +0100 Subject: [PATCH 01/15] added tinted glass --- src/main/resources/tags/glass_blocks.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/tags/glass_blocks.json b/src/main/resources/tags/glass_blocks.json index 92346ab19..3dea08951 100644 --- a/src/main/resources/tags/glass_blocks.json +++ b/src/main/resources/tags/glass_blocks.json @@ -16,6 +16,10 @@ "minecraft:brown_stained_glass", "minecraft:green_stained_glass", "minecraft:red_stained_glass", - "minecraft:black_stained_glass" + "minecraft:black_stained_glass", + { + "id" : "minecraft:tinted_glass", + "required" : false + } ] } From 15dce087690205f710efe648e791a50bc778c354 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Tue, 22 Mar 2022 07:35:13 +0100 Subject: [PATCH 02/15] fixed error on startup --- .../slimefun4/implementation/listeners/BeeWingsListener.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java index 245710939..d0129fa3d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java @@ -36,6 +36,11 @@ public class BeeWingsListener implements Listener { @EventHandler(ignoreCancelled = true) public void onApproachGround(EntityToggleGlideEvent e) { + + if (wings == null) { + return; + } + if (!e.isGliding() || wings.isDisabled() || !(e.getEntity() instanceof Player)) { return; } From 30386fbcb52dd674ef053915504893d08294e1e8 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Tue, 5 Apr 2022 19:34:06 +0200 Subject: [PATCH 03/15] did requested changes --- .../implementation/listeners/BeeWingsListener.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java index d0129fa3d..f79a74349 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java @@ -37,11 +37,7 @@ public class BeeWingsListener implements Listener { @EventHandler(ignoreCancelled = true) public void onApproachGround(EntityToggleGlideEvent e) { - if (wings == null) { - return; - } - - if (!e.isGliding() || wings.isDisabled() || !(e.getEntity() instanceof Player)) { + if (wings == null || !e.isGliding() || wings.isDisabled() || !(e.getEntity() instanceof Player)) { return; } From 6bf9738ddd783fa61b1c885476063d5023340512 Mon Sep 17 00:00:00 2001 From: qwertyuioplkjhgfd <45241413+qwertyuioplkjhgfd@users.noreply.github.com> Date: Fri, 20 May 2022 15:13:20 -0700 Subject: [PATCH 04/15] Add ensure compatibility in pull request template --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 552758aa2..f2a6f6594 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,6 +17,7 @@ - [ ] I have fully tested the proposed changes and promise that they will not break everything into chaos. - [ ] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them. +- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.14.* - 1.18.*). - [ ] I followed the existing code standards and didn't mess up the formatting. - [ ] I did my best to add documentation to any public classes or methods I added. - [ ] I have added `Nonnull` and `Nullable` annotations to my methods to indicate their behaviour for null values From 3c2305f344cd560f2879866130260e7b394c2594 Mon Sep 17 00:00:00 2001 From: qwertyuioplkjhgfd <45241413+qwertyuioplkjhgfd@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:42:10 -0700 Subject: [PATCH 05/15] 1.19 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f2a6f6594..5895c9969 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,7 +17,7 @@ - [ ] I have fully tested the proposed changes and promise that they will not break everything into chaos. - [ ] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them. -- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.14.* - 1.18.*). +- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.14.* - 1.19.*). - [ ] I followed the existing code standards and didn't mess up the formatting. - [ ] I did my best to add documentation to any public classes or methods I added. - [ ] I have added `Nonnull` and `Nullable` annotations to my methods to indicate their behaviour for null values From 68739d87a156c84e02b88dbd4e8ee0e5ea859b69 Mon Sep 17 00:00:00 2001 From: JasperChaseTOQ <103849596+JasperChaseTOQ@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:33:51 -0400 Subject: [PATCH 06/15] Update dirt_variants.json --- src/main/resources/tags/dirt_variants.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/tags/dirt_variants.json b/src/main/resources/tags/dirt_variants.json index b44b040ab..1feb686ac 100644 --- a/src/main/resources/tags/dirt_variants.json +++ b/src/main/resources/tags/dirt_variants.json @@ -14,6 +14,10 @@ { "id": "minecraft:rooted_dirt", "required": false + }, + { + "id": "minecraft:mud", + "required": false }, "minecraft:farmland", "minecraft:podzol", From ad3030c39cd1556f85e5648ff4647e163b012a88 Mon Sep 17 00:00:00 2001 From: JasperChaseTOQ <103849596+JasperChaseTOQ@users.noreply.github.com> Date: Thu, 23 Jun 2022 18:32:20 -0400 Subject: [PATCH 07/15] Update src/main/resources/tags/dirt_variants.json Co-authored-by: TheBusyBiscuit --- src/main/resources/tags/dirt_variants.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/dirt_variants.json b/src/main/resources/tags/dirt_variants.json index 1feb686ac..9dbb5ab05 100644 --- a/src/main/resources/tags/dirt_variants.json +++ b/src/main/resources/tags/dirt_variants.json @@ -15,7 +15,7 @@ "id": "minecraft:rooted_dirt", "required": false }, - { + { "id": "minecraft:mud", "required": false }, From b1802e05ef98043f7cbeb444eb830d5f8b751540 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 21:47:06 +0200 Subject: [PATCH 08/15] [CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.2.1b --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c63cd61b..7195c173a 100644 --- a/pom.xml +++ b/pom.xml @@ -481,7 +481,7 @@ com.github.LoneDev6 itemsadder-api - 3.1.6 + 3.2.1b provided From f516144ab63afa61ba4dc2a71d5e3f50b38556d4 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Wed, 6 Jul 2022 11:40:08 +0200 Subject: [PATCH 09/15] added wool tag --- .../slimefun4/utils/tags/SlimefunTag.java | 7 ++++++- .../tags/block_placer_ignored_materials.json | 9 +-------- src/main/resources/tags/wool_carpets.json | 12 ++++++++++++ 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/tags/wool_carpets.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 2cccb004d..2b0112130 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 @@ -251,7 +251,12 @@ public enum SlimefunTag implements Tag { /** * All materials that are affected by gravity. */ - GRAVITY_AFFECTED_BLOCKS; + GRAVITY_AFFECTED_BLOCKS, + + /** + * All wool carpets + */ + WOOL_CARPETS; /** * Lookup table for tag names. diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 03e5593a2..25c8accee 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -11,14 +11,7 @@ "#minecraft:small_flowers", "#minecraft:coral_blocks", "#minecraft:corals", - { - "id" : "#minecraft:carpets", - "required" : false - }, - { - "id" : "#minecraft:wool_carpets", - "required" : false - }, + "slimefun:wool_carpets", "#minecraft:banners", "minecraft:sugar_cane", "minecraft:cactus", diff --git a/src/main/resources/tags/wool_carpets.json b/src/main/resources/tags/wool_carpets.json new file mode 100644 index 000000000..eb5d934e9 --- /dev/null +++ b/src/main/resources/tags/wool_carpets.json @@ -0,0 +1,12 @@ +{ + "values" : [ + { + "id" : "#minecraft:carpets", + "required" : false + }, + { + "id" : "#minecraft:wool_carpets", + "required" : false + } + ] +} From 5ab92f411135e57b096ccee275c70f6eb4dbe799 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Wed, 6 Jul 2022 11:43:51 +0200 Subject: [PATCH 10/15] moved the tag to be with other slimefun tags --- src/main/resources/tags/block_placer_ignored_materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 25c8accee..30ddb4a26 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -3,6 +3,7 @@ "#slimefun:sensitive_materials", "#slimefun:tall_flowers", "#slimefun:mushrooms", + "slimefun:wool_carpets", "#minecraft:beds", "#minecraft:buttons", "#minecraft:signs", @@ -11,7 +12,6 @@ "#minecraft:small_flowers", "#minecraft:coral_blocks", "#minecraft:corals", - "slimefun:wool_carpets", "#minecraft:banners", "minecraft:sugar_cane", "minecraft:cactus", From 2f2f031b8eeca0b9f5c2e8fc5d20b319c4d20214 Mon Sep 17 00:00:00 2001 From: Jeffrey Kosse Date: Wed, 6 Jul 2022 11:55:25 +0200 Subject: [PATCH 11/15] forget the # --- src/main/resources/tags/block_placer_ignored_materials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/tags/block_placer_ignored_materials.json b/src/main/resources/tags/block_placer_ignored_materials.json index 30ddb4a26..3f9417b71 100644 --- a/src/main/resources/tags/block_placer_ignored_materials.json +++ b/src/main/resources/tags/block_placer_ignored_materials.json @@ -3,7 +3,7 @@ "#slimefun:sensitive_materials", "#slimefun:tall_flowers", "#slimefun:mushrooms", - "slimefun:wool_carpets", + "#slimefun:wool_carpets", "#minecraft:beds", "#minecraft:buttons", "#minecraft:signs", From d4428c00f1738cd4b3b1b3d0bd2672359f89d94d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 13:29:30 +0200 Subject: [PATCH 12/15] [CI skip] Update dependency me.clip:placeholderapi to v2.11.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7195c173a..5ff63ba6b 100644 --- a/pom.xml +++ b/pom.xml @@ -453,7 +453,7 @@ me.clip placeholderapi - 2.11.1 + 2.11.2 provided From 223dbecfd9d452d05647712f61210123b2cc7cc5 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 9 Jul 2022 20:34:55 +0200 Subject: [PATCH 13/15] [CI skip] Updated changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e3863c87..ccfaca6eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # Table of contents +- [Release Candidate 33 (TBD)](#release-candidate-33-tbd) - [Release Candidate 32 (26 Jun 2022)](#release-candidate-32-26-jun-2022) - [Release Candidate 31 (14 Mar 2022)](#release-candidate-31-14-mar-2022) - [Release Candidate 30 (31 Dec 2021)](#release-candidate-30-31-dec-2021) @@ -33,6 +34,15 @@ - [Release Candidate 1 (26 Sep 2019)](#release-candidate-1-26-sep-2019) +## Release Candidate 33 (TBD) + +#### Additions + +#### Changes + +#### Fixes +* Fixed #3597 + ## Release Candidate 32 (26 Jun 2022) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#32 From 915ab9871a9bafa908ae770edc6407d44d3bee42 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 9 Jul 2022 20:44:11 +0200 Subject: [PATCH 14/15] [CI skip] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccfaca6eb..600004231 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ ## Release Candidate 33 (TBD) #### Additions +* (API) Added Tinted Glass to "GLASS_BLOCKS" tag +* (API) Added "WOOL_CARPETS" tag (for compatibility across MC 1.19/1.18 tags) #### Changes From d34fff02e44da9568ab8d0a09e9516e7355f77ec Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 9 Jul 2022 21:00:44 +0200 Subject: [PATCH 15/15] [CI skip] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 600004231..3a3a95a70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ #### Fixes * Fixed #3597 +* Fixed an issue related to "Bee Wings" ## Release Candidate 32 (26 Jun 2022) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#32