Added the 1.13.1 new blocks.

2024-12-23 01:37:37 +00:00 · 2018-09-23 20:22:33 +10:00 · 2018-09-23 20:22:33 +10:00 · fd6034fbdd
commit fd6034fbdd
parent 02c6f11bb9
5 changed files with 170 additions and 15 deletions
--- a/build.gradle
+++ b/build.gradle
@ -28,8 +28,8 @@ buildscript {

    dependencies {
        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.3.0'
-        classpath 'org.ajoberstar:gradle-git:1.5.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
+        classpath 'org.ajoberstar:gradle-git:1.7.2'
    }
 }

--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
@ -96,7 +96,7 @@ public final class BlockTypes {
    public static final BlockType BLUE_WOOL = register("minecraft:blue_wool");
    public static final BlockType BONE_BLOCK = register("minecraft:bone_block", state -> state.with(state.getBlockType().getProperty("axis"), "y"));
    public static final BlockType BOOKSHELF = register("minecraft:bookshelf");
-    public static final BlockType BRAIN_CORAL = register("minecraft:brain_coral");
+    public static final BlockType BRAIN_CORAL = register("minecraft:brain_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType BRAIN_CORAL_BLOCK = register("minecraft:brain_coral_block");
    public static final BlockType BRAIN_CORAL_FAN = register("minecraft:brain_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType BRAIN_CORAL_WALL_FAN = register("minecraft:brain_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
@ -119,7 +119,7 @@ public final class BlockTypes {
    public static final BlockType BROWN_WALL_BANNER = register("minecraft:brown_wall_banner", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH));
    public static final BlockType BROWN_WOOL = register("minecraft:brown_wool");
    public static final BlockType BUBBLE_COLUMN = register("minecraft:bubble_column", state -> state.with(state.getBlockType().getProperty("drag"), true));
-    public static final BlockType BUBBLE_CORAL = register("minecraft:bubble_coral");
+    public static final BlockType BUBBLE_CORAL = register("minecraft:bubble_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType BUBBLE_CORAL_BLOCK = register("minecraft:bubble_coral_block");
    public static final BlockType BUBBLE_CORAL_FAN = register("minecraft:bubble_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType BUBBLE_CORAL_WALL_FAN = register("minecraft:bubble_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
@ -150,7 +150,7 @@ public final class BlockTypes {
    public static final BlockType COCOA = register("minecraft:cocoa", state -> state.with(state.getBlockType().getProperty("age"), 0).with(state.getBlockType().getProperty("facing"), Direction.NORTH));
    public static final BlockType COMMAND_BLOCK = register("minecraft:command_block", state -> state.with(state.getBlockType().getProperty("conditional"), false).with(state.getBlockType().getProperty("facing"), Direction.NORTH));
    public static final BlockType COMPARATOR = register("minecraft:comparator", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("mode"), "compare").with(state.getBlockType().getProperty("powered"), false));
-    public static final BlockType CONDUIT = register("minecraft:conduit");
+    public static final BlockType CONDUIT = register("minecraft:conduit", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType CRACKED_STONE_BRICKS = register("minecraft:cracked_stone_bricks");
    public static final BlockType CRAFTING_TABLE = register("minecraft:crafting_table");
    public static final BlockType CREEPER_HEAD = register("minecraft:creeper_head", state -> state.with(state.getBlockType().getProperty("rotation"), 0));
@ -188,19 +188,24 @@ public final class BlockTypes {
    public static final BlockType DARK_PRISMARINE_SLAB = register("minecraft:dark_prismarine_slab", state -> state.with(state.getBlockType().getProperty("type"), "bottom").with(state.getBlockType().getProperty("waterlogged"), false));
    public static final BlockType DARK_PRISMARINE_STAIRS = register("minecraft:dark_prismarine_stairs", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("half"), "bottom").with(state.getBlockType().getProperty("shape"), "straight").with(state.getBlockType().getProperty("waterlogged"), false));
    public static final BlockType DAYLIGHT_DETECTOR = register("minecraft:daylight_detector", state -> state.with(state.getBlockType().getProperty("inverted"), false).with(state.getBlockType().getProperty("power"), 0));
+    public static final BlockType DEAD_BRAIN_CORAL = register("minecraft:dead_brain_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_BRAIN_CORAL_BLOCK = register("minecraft:dead_brain_coral_block");
    public static final BlockType DEAD_BRAIN_CORAL_FAN = register("minecraft:dead_brain_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_BRAIN_CORAL_WALL_FAN = register("minecraft:dead_brain_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
+    public static final BlockType DEAD_BUBBLE_CORAL = register("minecraft:dead_bubble_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_BUBBLE_CORAL_BLOCK = register("minecraft:dead_bubble_coral_block");
    public static final BlockType DEAD_BUBBLE_CORAL_FAN = register("minecraft:dead_bubble_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_BUBBLE_CORAL_WALL_FAN = register("minecraft:dead_bubble_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_BUSH = register("minecraft:dead_bush");
+    public static final BlockType DEAD_FIRE_CORAL = register("minecraft:dead_fire_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_FIRE_CORAL_BLOCK = register("minecraft:dead_fire_coral_block");
    public static final BlockType DEAD_FIRE_CORAL_FAN = register("minecraft:dead_fire_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_FIRE_CORAL_WALL_FAN = register("minecraft:dead_fire_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
+    public static final BlockType DEAD_HORN_CORAL = register("minecraft:dead_horn_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_HORN_CORAL_BLOCK = register("minecraft:dead_horn_coral_block");
    public static final BlockType DEAD_HORN_CORAL_FAN = register("minecraft:dead_horn_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_HORN_CORAL_WALL_FAN = register("minecraft:dead_horn_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
+    public static final BlockType DEAD_TUBE_CORAL = register("minecraft:dead_tube_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_TUBE_CORAL_BLOCK = register("minecraft:dead_tube_coral_block");
    public static final BlockType DEAD_TUBE_CORAL_FAN = register("minecraft:dead_tube_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType DEAD_TUBE_CORAL_WALL_FAN = register("minecraft:dead_tube_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
@ -228,7 +233,7 @@ public final class BlockTypes {
    public static final BlockType FARMLAND = register("minecraft:farmland", state -> state.with(state.getBlockType().getProperty("moisture"), 0));
    public static final BlockType FERN = register("minecraft:fern");
    public static final BlockType FIRE = register("minecraft:fire", state -> state.with(state.getBlockType().getProperty("age"), 0).with(state.getBlockType().getProperty("east"), false).with(state.getBlockType().getProperty("north"), false).with(state.getBlockType().getProperty("south"), false).with(state.getBlockType().getProperty("up"), false).with(state.getBlockType().getProperty("west"), false));
-    public static final BlockType FIRE_CORAL = register("minecraft:fire_coral");
+    public static final BlockType FIRE_CORAL = register("minecraft:fire_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType FIRE_CORAL_BLOCK = register("minecraft:fire_coral_block");
    public static final BlockType FIRE_CORAL_FAN = register("minecraft:fire_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType FIRE_CORAL_WALL_FAN = register("minecraft:fire_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
@ -272,7 +277,7 @@ public final class BlockTypes {
    public static final BlockType HAY_BLOCK = register("minecraft:hay_block", state -> state.with(state.getBlockType().getProperty("axis"), "y"));
    public static final BlockType HEAVY_WEIGHTED_PRESSURE_PLATE = register("minecraft:heavy_weighted_pressure_plate", state -> state.with(state.getBlockType().getProperty("power"), 0));
    public static final BlockType HOPPER = register("minecraft:hopper", state -> state.with(state.getBlockType().getProperty("enabled"), true).with(state.getBlockType().getProperty("facing"), Direction.DOWN));
-    public static final BlockType HORN_CORAL = register("minecraft:horn_coral");
+    public static final BlockType HORN_CORAL = register("minecraft:horn_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType HORN_CORAL_BLOCK = register("minecraft:horn_coral_block");
    public static final BlockType HORN_CORAL_FAN = register("minecraft:horn_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType HORN_CORAL_WALL_FAN = register("minecraft:horn_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
@ -577,12 +582,12 @@ public final class BlockTypes {
    public static final BlockType TALL_GRASS = register("minecraft:tall_grass", state -> state.with(state.getBlockType().getProperty("half"), "lower"));
    public static final BlockType TALL_SEAGRASS = register("minecraft:tall_seagrass", state -> state.with(state.getBlockType().getProperty("half"), "lower"));
    public static final BlockType TERRACOTTA = register("minecraft:terracotta");
-    public static final BlockType TNT = register("minecraft:tnt");
+    public static final BlockType TNT = register("minecraft:tnt", state -> state.with(state.getBlockType().getProperty("unstable"), false));
    public static final BlockType TORCH = register("minecraft:torch");
    public static final BlockType TRAPPED_CHEST = register("minecraft:trapped_chest", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("type"), "SINGLE").with(state.getBlockType().getProperty("waterlogged"), false));
    public static final BlockType TRIPWIRE = register("minecraft:tripwire", state -> state.with(state.getBlockType().getProperty("attached"), false).with(state.getBlockType().getProperty("disarmed"), false).with(state.getBlockType().getProperty("east"), false).with(state.getBlockType().getProperty("north"), false).with(state.getBlockType().getProperty("powered"), false).with(state.getBlockType().getProperty("south"), false).with(state.getBlockType().getProperty("west"), false));
    public static final BlockType TRIPWIRE_HOOK = register("minecraft:tripwire_hook", state -> state.with(state.getBlockType().getProperty("attached"), false).with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("powered"), false));
-    public static final BlockType TUBE_CORAL = register("minecraft:tube_coral");
+    public static final BlockType TUBE_CORAL = register("minecraft:tube_coral", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType TUBE_CORAL_BLOCK = register("minecraft:tube_coral_block");
    public static final BlockType TUBE_CORAL_FAN = register("minecraft:tube_coral_fan", state -> state.with(state.getBlockType().getProperty("waterlogged"), true));
    public static final BlockType TUBE_CORAL_WALL_FAN = register("minecraft:tube_coral_wall_fan", state -> state.with(state.getBlockType().getProperty("facing"), Direction.NORTH).with(state.getBlockType().getProperty("waterlogged"), true));
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java
@ -224,15 +224,20 @@ public final class ItemTypes {
    public static final ItemType DARK_PRISMARINE_SLAB = register("minecraft:dark_prismarine_slab");
    public static final ItemType DARK_PRISMARINE_STAIRS = register("minecraft:dark_prismarine_stairs");
    public static final ItemType DAYLIGHT_DETECTOR = register("minecraft:daylight_detector");
+    public static final ItemType DEAD_BRAIN_CORAL = register("minecraft:dead_brain_coral");
    public static final ItemType DEAD_BRAIN_CORAL_BLOCK = register("minecraft:dead_brain_coral_block");
    public static final ItemType DEAD_BRAIN_CORAL_FAN = register("minecraft:dead_brain_coral_fan");
+    public static final ItemType DEAD_BUBBLE_CORAL = register("minecraft:dead_bubble_coral");
    public static final ItemType DEAD_BUBBLE_CORAL_BLOCK = register("minecraft:dead_bubble_coral_block");
    public static final ItemType DEAD_BUBBLE_CORAL_FAN = register("minecraft:dead_bubble_coral_fan");
    public static final ItemType DEAD_BUSH = register("minecraft:dead_bush");
+    public static final ItemType DEAD_FIRE_CORAL = register("minecraft:dead_fire_coral");
    public static final ItemType DEAD_FIRE_CORAL_BLOCK = register("minecraft:dead_fire_coral_block");
    public static final ItemType DEAD_FIRE_CORAL_FAN = register("minecraft:dead_fire_coral_fan");
+    public static final ItemType DEAD_HORN_CORAL = register("minecraft:dead_horn_coral");
    public static final ItemType DEAD_HORN_CORAL_BLOCK = register("minecraft:dead_horn_coral_block");
    public static final ItemType DEAD_HORN_CORAL_FAN = register("minecraft:dead_horn_coral_fan");
+    public static final ItemType DEAD_TUBE_CORAL = register("minecraft:dead_tube_coral");
    public static final ItemType DEAD_TUBE_CORAL_BLOCK = register("minecraft:dead_tube_coral_block");
    public static final ItemType DEAD_TUBE_CORAL_FAN = register("minecraft:dead_tube_coral_fan");
    public static final ItemType DEBUG_STICK = register("minecraft:debug_stick");
--- a/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.json
+++ b/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.json
@ -3949,6 +3949,31 @@
      "hasContainer": true
    }
  },
+  {
+    "id": "minecraft:dead_brain_coral",
+    "localizedName": "Dead Brain Coral",
+    "material": {
+      "powerSource": false,
+      "lightValue": 0,
+      "hardness": 0.0,
+      "resistance": 0.0,
+      "ticksRandomly": false,
+      "fullCube": false,
+      "slipperiness": 0.6,
+      "liquid": false,
+      "solid": true,
+      "movementBlocker": true,
+      "burnable": false,
+      "opaque": true,
+      "replacedDuringPlacement": false,
+      "toolRequired": true,
+      "fragileWhenPushed": false,
+      "unpushable": false,
+      "mapColor": "#707070",
+      "isTranslucent": false,
+      "hasContainer": false
+    }
+  },
  {
    "id": "minecraft:dead_brain_coral_block",
    "localizedName": "Dead Brain Coral Block",
@ -4024,6 +4049,31 @@
      "hasContainer": false
    }
  },
+  {
+    "id": "minecraft:dead_bubble_coral",
+    "localizedName": "Dead Bubble Coral",
+    "material": {
+      "powerSource": false,
+      "lightValue": 0,
+      "hardness": 0.0,
+      "resistance": 0.0,
+      "ticksRandomly": false,
+      "fullCube": false,
+      "slipperiness": 0.6,
+      "liquid": false,
+      "solid": true,
+      "movementBlocker": true,
+      "burnable": false,
+      "opaque": true,
+      "replacedDuringPlacement": false,
+      "toolRequired": true,
+      "fragileWhenPushed": false,
+      "unpushable": false,
+      "mapColor": "#707070",
+      "isTranslucent": false,
+      "hasContainer": false
+    }
+  },
  {
    "id": "minecraft:dead_bubble_coral_block",
    "localizedName": "Dead Bubble Coral Block",
@ -4124,6 +4174,31 @@
      "hasContainer": false
    }
  },
+  {
+    "id": "minecraft:dead_fire_coral",
+    "localizedName": "Dead Fire Coral",
+    "material": {
+      "powerSource": false,
+      "lightValue": 0,
+      "hardness": 0.0,
+      "resistance": 0.0,
+      "ticksRandomly": false,
+      "fullCube": false,
+      "slipperiness": 0.6,
+      "liquid": false,
+      "solid": true,
+      "movementBlocker": true,
+      "burnable": false,
+      "opaque": true,
+      "replacedDuringPlacement": false,
+      "toolRequired": true,
+      "fragileWhenPushed": false,
+      "unpushable": false,
+      "mapColor": "#707070",
+      "isTranslucent": false,
+      "hasContainer": false
+    }
+  },
  {
    "id": "minecraft:dead_fire_coral_block",
    "localizedName": "Dead Fire Coral Block",
@ -4199,6 +4274,31 @@
      "hasContainer": false
    }
  },
+  {
+    "id": "minecraft:dead_horn_coral",
+    "localizedName": "Dead Horn Coral",
+    "material": {
+      "powerSource": false,
+      "lightValue": 0,
+      "hardness": 0.0,
+      "resistance": 0.0,
+      "ticksRandomly": false,
+      "fullCube": false,
+      "slipperiness": 0.6,
+      "liquid": false,
+      "solid": true,
+      "movementBlocker": true,
+      "burnable": false,
+      "opaque": true,
+      "replacedDuringPlacement": false,
+      "toolRequired": true,
+      "fragileWhenPushed": false,
+      "unpushable": false,
+      "mapColor": "#707070",
+      "isTranslucent": false,
+      "hasContainer": false
+    }
+  },
  {
    "id": "minecraft:dead_horn_coral_block",
    "localizedName": "Dead Horn Coral Block",
@ -4274,6 +4374,31 @@
      "hasContainer": false
    }
  },
+  {
+    "id": "minecraft:dead_tube_coral",
+    "localizedName": "Dead Tube Coral",
+    "material": {
+      "powerSource": false,
+      "lightValue": 0,
+      "hardness": 0.0,
+      "resistance": 0.0,
+      "ticksRandomly": false,
+      "fullCube": false,
+      "slipperiness": 0.6,
+      "liquid": false,
+      "solid": true,
+      "movementBlocker": true,
+      "burnable": false,
+      "opaque": true,
+      "replacedDuringPlacement": false,
+      "toolRequired": true,
+      "fragileWhenPushed": false,
+      "unpushable": false,
+      "mapColor": "#707070",
+      "isTranslucent": false,
+      "hasContainer": false
+    }
+  },
  {
    "id": "minecraft:dead_tube_coral_block",
    "localizedName": "Dead Tube Coral Block",
@ -6995,7 +7120,7 @@
      "fragileWhenPushed": true,
      "unpushable": false,
      "mapColor": "#ff0000",
-      "isTranslucent": true,
+      "isTranslucent": false,
      "hasContainer": false
    }
  },
@ -14045,7 +14170,7 @@
      "fragileWhenPushed": true,
      "unpushable": false,
      "mapColor": "#4040ff",
-      "isTranslucent": true,
+      "isTranslucent": false,
      "hasContainer": false
    }
  },
--- a/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.json
+++ b/worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.json
@ -803,6 +803,10 @@
    "id": "minecraft:daylight_detector",
    "localizedName": "Air"
  },
+  {
+    "id": "minecraft:dead_brain_coral",
+    "localizedName": "Air"
+  },
  {
    "id": "minecraft:dead_brain_coral_block",
    "localizedName": "Air"
@ -811,6 +815,10 @@
    "id": "minecraft:dead_brain_coral_fan",
    "localizedName": "Air"
  },
+  {
+    "id": "minecraft:dead_bubble_coral",
+    "localizedName": "Air"
+  },
  {
    "id": "minecraft:dead_bubble_coral_block",
    "localizedName": "Air"
@ -823,6 +831,10 @@
    "id": "minecraft:dead_bush",
    "localizedName": "Air"
  },
+  {
+    "id": "minecraft:dead_fire_coral",
+    "localizedName": "Air"
+  },
  {
    "id": "minecraft:dead_fire_coral_block",
    "localizedName": "Air"
@ -831,6 +843,10 @@
    "id": "minecraft:dead_fire_coral_fan",
    "localizedName": "Air"
  },
+  {
+    "id": "minecraft:dead_horn_coral",
+    "localizedName": "Air"
+  },
  {
    "id": "minecraft:dead_horn_coral_block",
    "localizedName": "Air"
@ -839,6 +855,10 @@
    "id": "minecraft:dead_horn_coral_fan",
    "localizedName": "Air"
  },
+  {
+    "id": "minecraft:dead_tube_coral",
+    "localizedName": "Air"
+  },
  {
    "id": "minecraft:dead_tube_coral_block",
    "localizedName": "Air"
@ -1749,7 +1769,7 @@
  },
  {
    "id": "minecraft:lingering_potion",
-    "localizedName": "Lingering Potion"
+    "localizedName": "Lingering Water Bottle"
  },
  {
    "id": "minecraft:llama_spawn_egg",
@ -2237,7 +2257,7 @@
  },
  {
    "id": "minecraft:potion",
-    "localizedName": "Potion"
+    "localizedName": "Water Bottle"
  },
  {
    "id": "minecraft:powered_rail",
@ -2677,7 +2697,7 @@
  },
  {
    "id": "minecraft:splash_potion",
-    "localizedName": "Splash Potion"
+    "localizedName": "Splash Water Bottle"
  },
  {
    "id": "minecraft:sponge",
@ -2885,7 +2905,7 @@
  },
  {
    "id": "minecraft:tipped_arrow",
-    "localizedName": "Tipped Arrow"
+    "localizedName": "Arrow of Poison"
  },
  {
    "id": "minecraft:tnt",