Fixing Pane, wall, and fence bounding box innaccuries and 1.17+ error…

…s [v1.11.2.1]
funkemunky · Jan 8, 2022 · 01c3eea · 01c3eea
1 parent 58cc0e9
commit 01c3eea
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 31 deletions.
diff --git a/AtlasParent/Atlas/pom.xml b/AtlasParent/Atlas/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>cc.funkemunky.utils</groupId>
-        <version>1.11.2</version>
+        <version>1.11.2.1</version>
         <artifactId>atlas-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -416,7 +416,7 @@
         <dependency>
             <groupId>org.github.spigot</groupId>
             <artifactId>1.11.2</artifactId>
-            <version>1.11.2</version>
+            <version>1.11.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/utils/world/blocks/DynamicFence.java b/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/utils/world/blocks/DynamicFence.java
@@ -3,6 +3,7 @@
 import cc.funkemunky.api.tinyprotocol.api.ProtocolVersion;
 import cc.funkemunky.api.utils.BlockUtils;
 import cc.funkemunky.api.utils.Materials;
+import cc.funkemunky.api.utils.XMaterial;
 import cc.funkemunky.api.utils.world.CollisionBox;
 import cc.funkemunky.api.utils.world.types.CollisionFactory;
 import cc.funkemunky.api.utils.world.types.ComplexCollisionBox;
@@ -37,18 +38,20 @@ public CollisionBox fetch(ProtocolVersion version, Block b) {
     }
 
     static boolean isBlacklisted(Material m) {
-        switch(m.ordinal()) {
-            case 138:
-            case 280:
-            case 86:
-            case 103:
-            case 166:
+        XMaterial material = XMaterial.matchXMaterial(m);
+        switch(material) {
+            case BEACON:
+            case STICK:
+            case SNOW_BLOCK:
+            case MELON:
+            case BARRIER:
                 return true;
             default:
-                return Materials.checkFlag(m, Materials.STAIRS)
+                return !Materials.checkFlag(m, Materials.SOLID)
+                        || Materials.checkFlag(m, Materials.STAIRS)
                         || Materials.checkFlag(m, Materials.WALL)
-                        || m.name().contains("DAYLIGHT")
-                        || Materials.checkFlag(m, Materials.FENCE);
+                        || Materials.checkFlag(m, Materials.FENCE)
+                        || m.name().contains("DAYLIGHT");
         }
     }
 
@@ -58,13 +61,14 @@ private static boolean fenceConnects(ProtocolVersion v,Block fenceBlock, BlockFa
 
         if(!targetBlock.isPresent()) return false;
         BlockState sFence = fenceBlock.getState();
-        BlockState sTarget = targetBlock.get().getState();
-        Material target = sTarget.getType();
+        Material target = targetBlock.get().getType();
         Material fence = sFence.getType();
 
         if (!isFence(target)&&isBlacklisted(target))
             return false;
 
+        BlockState sTarget = targetBlock.get().getState();
+
         if(Materials.checkFlag(target, Materials.STAIRS)) {
             if (v.isBelow(ProtocolVersion.V1_12)) return false;
             Stairs stairs = (Stairs) sTarget.getData();

diff --git a/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/utils/world/blocks/DynamicPane.java b/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/utils/world/blocks/DynamicPane.java
@@ -1,6 +1,8 @@
 package cc.funkemunky.api.utils.world.blocks;
 
 import cc.funkemunky.api.tinyprotocol.api.ProtocolVersion;
+import cc.funkemunky.api.utils.Materials;
+import cc.funkemunky.api.utils.XMaterial;
 import cc.funkemunky.api.utils.world.CollisionBox;
 import cc.funkemunky.api.utils.world.types.CollisionFactory;
 import cc.funkemunky.api.utils.world.types.ComplexCollisionBox;
@@ -43,24 +45,25 @@ public CollisionBox fetch(ProtocolVersion version, Block b) {
 
     private static boolean fenceConnects(ProtocolVersion v, Block fenceBlock, BlockFace direction) {
         Block targetBlock = fenceBlock.getRelative(direction,1);
-        BlockState sFence = fenceBlock.getState();
-        BlockState sTarget = targetBlock.getState();
-        Material target = sTarget.getType();
-        Material fence = sFence.getType();
+        Material target = targetBlock.getType();
 
         if (!isPane(target)&&DynamicFence.isBlacklisted(target))
             return false;
 
-        if(target.name().contains("STAIRS")) {
+        BlockState sTarget = targetBlock.getState();
+
+        if(Materials.checkFlag(target, Materials.STAIRS)) {
             if (v.isBelow(ProtocolVersion.V1_12)) return false;
             Stairs stairs = (Stairs) sTarget.getData();
             return stairs.getFacing() == direction;
         } else return isPane(target) || (target.isSolid() && !target.isTransparent());
     }
 
     private static boolean isPane(Material m) {
-        int id = m.getId();
-        return id == 101 || id == 102 || id == 160;
+        final XMaterial mat = XMaterial.matchXMaterial(m);
+
+        return mat == XMaterial.IRON_BARS || mat.name().contains("PANE")
+                || mat.name().contains("THIN");
     }
 
 }
diff --git a/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/utils/world/blocks/DynamicWall.java b/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/utils/world/blocks/DynamicWall.java
@@ -3,6 +3,7 @@
 import cc.funkemunky.api.tinyprotocol.api.ProtocolVersion;
 import cc.funkemunky.api.utils.BlockUtils;
 import cc.funkemunky.api.utils.Materials;
+import cc.funkemunky.api.utils.XMaterial;
 import cc.funkemunky.api.utils.world.CollisionBox;
 import cc.funkemunky.api.utils.world.types.CollisionFactory;
 import cc.funkemunky.api.utils.world.types.SimpleCollisionBox;
@@ -65,12 +66,13 @@ private static boolean wallConnects(ProtocolVersion v, Block fenceBlock, BlockFa
         Optional<Block> targetBlock = BlockUtils.getRelativeAsync(fenceBlock, direction, 1);
 
         if(!targetBlock.isPresent()) return false;
-        BlockState sTarget = targetBlock.get().getState();
-        Material target = sTarget.getType();
+        Material target = targetBlock.get().getType();
 
         if (!isWall(target)&&DynamicFence.isBlacklisted(target))
             return false;
 
+        BlockState sTarget = targetBlock.get().getState();
+
         if(Materials.checkFlag(target, Materials.STAIRS)) {
             if (v.isBelow(ProtocolVersion.V1_12)) return false;
             Stairs stairs = (Stairs) sTarget.getData();
@@ -79,7 +81,7 @@ private static boolean wallConnects(ProtocolVersion v, Block fenceBlock, BlockFa
     }
 
     private static boolean isWall(Material m) {
-        return m.name().contains("WALL");
+        return Materials.checkFlag(m, Materials.WALL);
     }
 
 }
diff --git a/AtlasParent/AtlasBukkit/pom.xml b/AtlasParent/AtlasBukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>atlas-parent</artifactId>
         <groupId>cc.funkemunky.utils</groupId>
-        <version>1.11.2</version>
+        <version>1.11.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/AtlasParent/AtlasBungee/pom.xml b/AtlasParent/AtlasBungee/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>atlas-parent</artifactId>
         <groupId>cc.funkemunky.utils</groupId>
-        <version>1.11.2</version>
+        <version>1.11.2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/AtlasParent/AtlasExample/pom.xml b/AtlasParent/AtlasExample/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>atlas-parent</artifactId>
         <groupId>cc.funkemunky.utils</groupId>
-        <version>1.11.2</version>
+        <version>1.11.2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>cc.funkemunky.example</groupId>
     <artifactId>AtlasExample</artifactId>
-    <version>1.11.2</version>
+    <version>1.11.2.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>cc.funkemunky.utils</groupId>
             <artifactId>Atlas</artifactId>
-            <version>1.11.2</version>
+            <version>1.11.2.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/AtlasParent/AtlasVelocity/pom.xml b/AtlasParent/AtlasVelocity/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>atlas-parent</artifactId>
         <groupId>cc.funkemunky.utils</groupId>
-        <version>1.11.2</version>
+        <version>1.11.2.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/AtlasParent/Atlas_Compat_1_18/pom.xml b/AtlasParent/Atlas_Compat_1_18/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>atlas-parent</artifactId>
         <groupId>cc.funkemunky.utils</groupId>
-        <version>1.11.2</version>
+        <version>1.11.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/AtlasParent/pom.xml b/AtlasParent/pom.xml
@@ -5,7 +5,7 @@
     <groupId>cc.funkemunky.utils</groupId>
     <artifactId>atlas-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.11.2</version>
+    <version>1.11.2.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>