Merge branch 'master' into java16

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,6 +17,7 @@
 <!-- Don't worry, these are not requirements. They only serve as guidance. -->
 - [ ] 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.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

CHANGELOG.md

@@ -37,11 +37,15 @@
 ## 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
 * Slimefun now requires Java 16
 
 #### 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

pom.xml

@@ -453,7 +453,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.2</version>
             <scope>provided</scope>
 
             <exclusions>
@@ -481,7 +481,7 @@
         <dependency>
             <groupId>com.github.LoneDev6</groupId>
             <artifactId>itemsadder-api</artifactId>
-            <version>3.1.6</version>
+            <version>3.2.1b</version>
             <scope>provided</scope>
 
             <exclusions>

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BeeWingsListener.java

@@ -36,7 +36,8 @@ public class BeeWingsListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onApproachGround(EntityToggleGlideEvent e) {
-        if (!e.isGliding() || wings.isDisabled() || !(e.getEntity() instanceof Player)) {
+
+        if (wings == null || !e.isGliding() || wings.isDisabled() || !(e.getEntity() instanceof Player)) {
             return;
         }
 

src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java

@@ -251,7 +251,12 @@ public enum SlimefunTag implements Tag<Material> {
     /**
      * All materials that are affected by gravity.
      */
-    GRAVITY_AFFECTED_BLOCKS;
+    GRAVITY_AFFECTED_BLOCKS,
+
+    /**
+     * All wool carpets
+     */
+    WOOL_CARPETS;
 
     /**
      * Lookup table for tag names.

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,14 +12,6 @@
 		"#minecraft:small_flowers",
 		"#minecraft:coral_blocks",
 		"#minecraft:corals",
-		{
-			"id" : "#minecraft:carpets",
-			"required" : false
-		},
-		{
-			"id" : "#minecraft:wool_carpets",
-			"required" : false
-		},
 		"#minecraft:banners",
 		"minecraft:sugar_cane",
 		"minecraft:cactus",

src/main/resources/tags/dirt_variants.json

@@ -15,6 +15,10 @@
 			"id": "minecraft:rooted_dirt",
 			"required": false
 		},
+		{
+			"id": "minecraft:mud",
+			"required": false
+		},
 		"minecraft:farmland",
 		"minecraft:podzol",
 		"minecraft:mycelium"

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
+		}
 	]
 }

src/main/resources/tags/wool_carpets.json

@@ -0,0 +1,12 @@
+{
+	"values" : [
+		{
+			"id" : "#minecraft:carpets",
+			"required" : false
+		},
+		{
+			"id" : "#minecraft:wool_carpets",
+			"required" : false
+		}
+	]
+}