Remove 'waterloggable' material value

It's not needed, because to tell if a block is waterloggable, you can simply check if its block data is an instance of Waterlogged
GlowstoneMC · Oct 5, 2019 · ae70f4c · ae70f4c
1 parent 9ab5092
commit ae70f4c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 39 deletions.
diff --git a/src/main/java/net/glowstone/block/BuiltinMaterialValueManager.java b/src/main/java/net/glowstone/block/BuiltinMaterialValueManager.java
@@ -137,10 +137,5 @@ public PistonMoveBehavior getPistonPullBehavior() {
             String behaviorName = (String) get("pistonPullBehavior");
             return PistonMoveBehavior.valueOf(behaviorName);
         }
-
-        @Override
-        public boolean getWaterloggable() {
-            return (Boolean) get("waterloggable");
-        }
     }
 }
diff --git a/src/main/java/net/glowstone/block/MaterialValueManager.java b/src/main/java/net/glowstone/block/MaterialValueManager.java
@@ -90,12 +90,5 @@ interface ValueCollection {
          * @return the piston pull behavior
          */
         PistonMoveBehavior getPistonPullBehavior();
-
-        /**
-         * Returns if the block can get waterlogged. Suitable only for blocks.
-         *
-         * @return if the block can get waterlogged
-         */
-        boolean getWaterloggable();
     }
 }
diff --git a/src/main/resources/builtin/materialValues.yml b/src/main/resources/builtin/materialValues.yml
@@ -7,7 +7,6 @@ default:
   baseMapColor: 44
   pistonPushBehavior: MOVE
   pistonPullBehavior: MOVE
-  waterloggable: NO
 values:
   # Incomplete:
   # hardness, blastResistance, lightOpacity, flameResistance, fireResistance, baseMapColor
@@ -177,13 +176,11 @@ values:
     flameResistance: 5
     fireResistance: 20
     hardness: 2
-    waterloggable: true
   CHEST:
     tool: AXE
     lightOpacity: 0
     pistonPushBehavior: DONT_MOVE
     pistonPullBehavior: DONT_MOVE
-    waterloggable: true
   REDSTONE_WIRE:
     lightOpacity: 0
     pistonPushBehavior: BREAK
@@ -210,7 +207,6 @@ values:
     lightOpacity: 0
     pistonPushBehavior: DONT_MOVE
     pistonPullBehavior: DONT_MOVE
-    waterloggable: true
   LEGACY_WOODEN_DOOR:
     tool: AXE
     lightOpacity: 0
@@ -225,7 +221,6 @@ values:
     blastResistance: 2
     pistonPushBehavior: BREAK
     pistonPullBehavior: DONT_MOVE
-    waterloggable: true
   RAIL:
     tool: PICKAXE
     lightOpacity: 0
@@ -234,15 +229,13 @@ values:
     hardness: 2
     lightOpacity: 0
     blastResistance: 30
-    waterloggable: true
   WALL_SIGN:
     tool: AXE
     hardness: 1
     lightOpacity: 0
     blastResistance: 5
     pistonPushBehavior: DONT_MOVE
     pistonPullBehavior: DONT_MOVE
-    waterloggable: true
   LEVER:
     hardness: 0.5
     lightOpacity: 0
@@ -356,7 +349,6 @@ values:
     lightOpacity: 0
   GLASS_PANE:
     lightOpacity: 0
-    waterloggable: true
   MELON:
     tool: AXE
     pistonPushBehavior: BREAK
@@ -384,11 +376,9 @@ values:
   BRICK_STAIRS:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   STONE_BRICK_STAIRS:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   MYCELIUM:
     tool: SHOVEL
   LILY_PAD:
@@ -404,7 +394,6 @@ values:
     tool: PICKAXE
     hardness: 2
     lightOpacity: 0
-    waterloggable: true
   NETHER_WART:
     lightOpacity: 0
     pistonPushBehavior: BREAK
@@ -451,15 +440,13 @@ values:
   SANDSTONE_STAIRS:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   EMERALD_ORE:
     tool: IRON_PICKAXE
   ENDER_CHEST:
     tool: PICKAXE
     lightOpacity: 0
     pistonPushBehavior: DONT_MOVE
     pistonPullBehavior: DONT_MOVE
-    waterloggable: true
   TRIPWIRE_HOOK:
     lightOpacity: 0
     pistonPushBehavior: BREAK
@@ -474,17 +461,14 @@ values:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   BIRCH_WOOD_STAIRS:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   JUNGLE_WOOD_STAIRS:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   COMMAND_BLOCK:
     pistonPushBehavior: DONT_MOVE
     pistonPullBehavior: DONT_MOVE
@@ -495,7 +479,6 @@ values:
   COBBLESTONE_WALL:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   FLOWER_POT:
     lightOpacity: 0
     pistonPushBehavior: BREAK
@@ -555,7 +538,6 @@ values:
   QUARTZ_STAIRS:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   ACTIVATOR_RAIL:
     lightOpacity: 0
   DROPPER:
@@ -577,12 +559,10 @@ values:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   DARK_OAK_STAIRS:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   SLIME_BLOCK:
     pistonPushBehavior: MOVE_STICKY
     pistonPullBehavior: MOVE_STICKY
@@ -592,7 +572,6 @@ values:
   IRON_TRAPDOOR:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   PRISMARINE:
     tool: PICKAXE
   HAY_BLOCK:
@@ -625,7 +604,6 @@ values:
   RED_SANDSTONE_STAIRS:
     tool: PICKAXE
     lightOpacity: 0
-    waterloggable: true
   SPRUCE_FENCE_GATE:
     lightOpacity: 0
     flameResistance: 5
@@ -650,27 +628,22 @@ values:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   BIRCH_FENCE:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   JUNGLE_FENCE:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   DARK_OAK_FENCE:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   ACACIA_FENCE:
     lightOpacity: 0
     flameResistance: 5
     fireResistance: 20
-    waterloggable: true
   SPRUCE_DOOR:
     tool: AXE
     lightOpacity: 0