Described the shapes and colours of new blocks in 1.8.

Also provided an updated materials.yml file that configures LogBlock to provide more detailed names for 1.8 blocks so that Watson can draw them more accurately.
totemo · Jan 24, 2015 · 54dc06e · 54dc06e
1 parent fa4509a
commit 54dc06e
Show file tree

Hide file tree

Showing 6 changed files with 222 additions and 15 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,16 +1,22 @@
 Change History
 ==============
+0.9.1.110-mc1.8.0
+-----------------
+* Added shape and colour information for the new blocks in 1.8.
+* Updated config/LogBlock/materials.yml to allow Watson to more accurately draw those blocks on servers that use LogBlock.  Simply drop that file in plugins/LogBlock/ on the server.
+
 0.9.0.108-mc1.8.0
+-----------------
 * Updated to LiteLoader 1.8.0. Thanks to @GuntherDW for contributing this code.
 * Added in-game help for /w config. Thanks to @tompreuss for contributing this code.
 * Added visualisation of LogBlock death locations. Thanks to @tompreuss.
 
 0.8.0.104-mc1.7.10
--------------------
+------------------
 * Updated to LiteLoader 1.7.10.
 
 0.7.0.100-mc1.7.2_02
--------------------
+--------------------
 * Fix Issue #35: Make reformatting and colour coding of LogBlock query results configurable.
 
 0.6.1.95-mc1.7.2_02

diff --git a/build/build_watson.xml b/build/build_watson.xml
@@ -17,7 +17,7 @@
 
 	<!-- The version of your mod, can be any string as long as it's valid as part of a file name -->
 	<!-- and should match the version string returned by your mod.                               -->
-	<property name="version"        value="0.9.0" />
+	<property name="version"        value="0.9.1" />
 
 	<!-- The Minecraft version the mod is for, appended to the output file name for reference -->
 	<property name="mcversion"      value="1.8.0" />

diff --git a/build/buildnumber.txt b/build/buildnumber.txt
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon Jan 19 19:11:40 CST 2015
-build.number=109
+#Sun Jan 25 02:07:31 CST 2015
+build.number=111
diff --git a/config/LogBlock/materials.yml b/config/LogBlock/materials.yml
@@ -1,5 +1,12 @@
 # Add block or item names you want to be overridden or also names for custom blocks
 
+'1':
+  '1': granite
+  '2': polished granite
+  '3': diorite
+  '4': polished diorite
+  '5': andesite
+  '6': polished andesite
 '3':
   '1': grassless dirt
   '2': podzol
@@ -58,6 +65,9 @@
   '13': spruce leaves
   '14': birch leaves
   '15': jungle leaves
+'19':
+  '0': sponge
+  '1': wet sponge
 '24':
   '0': sandstone
   '1': chiseled sandstone
@@ -127,6 +137,8 @@
   '14': upper nether brick slab
   '15': upper quartz slab
 '53': oak wood stairs
+'64': oak door
+'85': oak fence
 '95':
   '0': white stained glass
   '1': orange stained glass
@@ -144,6 +156,7 @@
   '13': green stained glass
   '14': red stained glass
   '15': black stained glass
+'96': wooden trapdoor
 '97':
   '0': stone monster egg
   '1': cobblestone monster egg
@@ -158,6 +171,7 @@
   '3': chiseled stone brick
 '99': huge brown mushroom
 '100': huge red mushroom
+'107': oak fence gate
 '109': stone brick stairs
 '110': mycelium
 '125':
@@ -234,6 +248,10 @@
   '9': dark oak log
 '163': acacia wood stairs
 '164': dark oak wood stairs
+'168':
+  '0': prismarine
+  '1': prismarine bricks
+  '2': dark prismarine
 '171':
   '0': white carpet
   '1': orange carpet
@@ -260,6 +278,10 @@
   '4': rose bush
   '5': peony
   '8': double plant
+'181': double red sandstone slab
+'182':
+  '0': red sandstone slab
+  '8': upper red sandstone slab
 '351':
   '0': black dye
   '1': red dye

diff --git a/res/litemod.json b/res/litemod.json
@@ -4,8 +4,8 @@
 
     "name": "watson",
     "mcversion": "1.8.0",
-    "version": "0.9.0.108-mc1.8.0",
-    "revision": "108",
+    "version": "0.9.1.110-mc1.8.0",
+    "revision": "110",
     "author": "totemo",
     "description": "A 3-D log visualisation tool."
 }
diff --git a/res/watson/blocks.yml b/res/watson/blocks.yml
@@ -10,8 +10,8 @@
 # "birchlog" is recognised as a synonym of "birch log".
 #
 # The "data" field can be an integer (from 0 to 15), a list of integers, e.g.
-# [0, 1, 2, 3], or the string all signifying the list of all integers from 0 to
-# 15 inclusive.  When multiple data values are listed under a given id, block
+# [0, 1, 2, 3], or the string "all" signifying the list of all integers from 0
+# to 15 inclusive.  When multiple data values are listed under a given id, block
 # types are added for all of those data values.  Only the lowest data value
 # is associated with the list of names.  This allows query results from logging
 # plugins that return id:data numbers to be correctly displayed with less effort
@@ -55,6 +55,38 @@ blocks:
       lineWidth: 0.5
       bounds: [0.3, 0.3, 0.3, 0.7, 0.7, 0.7]
       rgba: [127, 127, 127]
+
+    - id: 1
+      names: [granite]
+      data: 1
+      lineWidth: 0.5
+      bounds: [0.3, 0.3, 0.3, 0.7, 0.7, 0.7]
+      rgba: [157, 106, 87]
+    - id: 1
+      names: [polished granite]
+      data: 2
+      rgba: [157, 106, 87]
+    - id: 1
+      names: [diorite]
+      data: 3
+      lineWidth: 0.5
+      bounds: [0.3, 0.3, 0.3, 0.7, 0.7, 0.7]
+      rgba: [201, 201, 205]
+    - id: 1
+      names: [polished diorite]
+      data: 4
+      rgba: [201, 201, 205]
+    - id: 1
+      names: [andesite]
+      data: 5
+      lineWidth: 0.5
+      bounds: [0.3, 0.3, 0.3, 0.7, 0.7, 0.7]
+      rgba: [137, 138, 129]
+    - id: 1
+      names: [polished andesite]
+      data: 6
+      rgba: [137, 138, 129]
+
     - id: 2
       names: [grass]
       rgba: [108, 172, 66]
@@ -66,7 +98,7 @@ blocks:
       rgba: [150, 108, 74]
     - id: 3
       data: 1
-      names: [grassless dirt]
+      names: [grassless dirt, coarse dirt]
       lineWidth: 0.5
       bounds: [0.3, 0.3, 0.3, 0.7, 0.7, 0.7]
       rgba: [150, 108, 74]
@@ -229,6 +261,10 @@ blocks:
     - id: 19
       names: [sponge]
       rgba: [206, 206, 70]
+    - id: 19
+      data: 1
+      names: [wet sponge]
+      rgba: [206, 206, 70]
     - id: 20
       names: [glass]
       rgba: [179, 214, 219]
@@ -657,7 +693,7 @@ blocks:
 
     - id: 64
       data: all
-      names: [wooden door]
+      names: [wooden door, oak door]
       rgba: [143, 107, 53]
       bounds: [0.0, 0.0, 0.8125, 1.0, 1.0, 1.0]
     - id: 65
@@ -750,7 +786,7 @@ blocks:
       names: [jukebox]
       rgba: [102, 56, 33]
     - id: 85
-      names: [fence]
+      names: [fence, oak fence]
       rgba: [188, 152, 98]
       bounds: [0.375, 0.0, 0.375, 0.625, 1.0, 0.625]      
     - id: 86
@@ -858,7 +894,7 @@ blocks:
 
     - id: 96
       data: all
-      names: [trap door,trapdoor]
+      names: [trap door, trapdoor, wooden trapdoor]
       rgba: [145, 109, 56]
       bounds: [0.0, 0.0, 0.0, 1.0, 0.1875, 1.0]      
 
@@ -944,7 +980,7 @@ blocks:
       bounds: [0.0, 0.0, 0.0, 1.0, 1.0, 0.0625]
     - id: 107
       data: all
-      names: [fence gate, gate]
+      names: [fence gate, oak fence gate]
       rgba: [188, 152, 98]
       bounds: [0.375, 0.3125, 0.0, 0.625, 1.0, 1.0]      
     - id: 108
@@ -1470,6 +1506,35 @@ blocks:
       rgba: [69, 44, 21]
       model: stair
 
+    - id: 165
+      data: all
+      names: [slime block]
+      rgba: [123, 200, 101]
+    - id: 166
+      data: all
+      names: [barrier]
+      rgba: [227, 0, 0]
+      bounds: [0.25, 0.25, 0.25, 0.75, 0.75, 0.75]
+    - id: 167
+      data: all
+      names: [iron trapdoor]
+      rgba: [197, 197, 197]
+      bounds: [0.0, 0.0, 0.0, 1.0, 0.1875, 1.0]
+    - id: 168
+      data: 0
+      names: [prismarine]
+      rgba: [84, 157, 155]
+    - id: 168
+      data: 1
+      names: [prismarine bricks]
+      rgba: [101, 153, 139]
+    - id: 168
+      data: 2
+      names: [dark prismarine]
+      rgba: [56, 90, 79]
+    - id: 169
+      names: [sea lantern]
+      rgba: [221, 231, 222]
     - id: 170
       data: [0, 4, 8]
       names: [hay block]
@@ -1606,7 +1671,121 @@ blocks:
       rgba: [23, 121, 9]
       bounds: [0.1, 0.0, 0.1, 0.9, 1.0, 0.9]
       model: plant
-
+
+    - id: 176
+      names: [standing banner, banner]
+      rgba: [132, 132, 132]
+      bounds: [0.09375, 0.125, 0.4375, 0.90625, 1.84375, 0.625]
+    - id: 177
+      names: [wall banner]
+      rgba: [132, 132, 132]
+      bounds: [0.09375, -0.875, 0.0, 0.90625, 0.875, 0.1875]
+
+    - id: 179
+      data: 0
+      names: [red sandstone]
+      rgba: [170, 87, 31]
+    - id: 179
+      data: 1
+      names: [chiseled red sandstone]
+      rgba: [170, 87, 31]
+    - id: 179
+      data: 2
+      names: [smooth red sandstone]
+      rgba: [170, 87, 31]
+    - id: 180
+      data: all
+      names: [red sandstone stairs]
+      rgba: [170, 87, 31]
+      model: stair
+    - id: 181
+      data: all
+      names: [double red sandstone slab, double stone slab2]
+      rgba: [170, 87, 31]
+    - id: 182
+      data: 0
+      names: [red sandstone slab, stone slab2]
+      rgba: [170, 87, 31]
+      bounds: [0.0, 0.0, 0.0, 1.0, 0.5, 1.0]
+    - id: 182
+      data: 8
+      names: [upper red sandstone slab]
+      rgba: [170, 87, 31]
+      bounds: [0.0, 0.5, 0.0, 1.0, 1.0, 1.0]
+
+    - id: 183
+      data: all
+      names: [spruce fence gate]
+      rgba: [69, 53, 31]
+      bounds: [0.375, 0.3125, 0.0, 0.625, 1.0, 1.0]
+    - id: 184
+      data: all
+      names: [birch fence gate]
+      rgba: [157, 145, 97]
+      bounds: [0.375, 0.3125, 0.0, 0.625, 1.0, 1.0]
+    - id: 185
+      data: all
+      names: [jungle fence gate]
+      rgba: [137, 98, 70]
+      bounds: [0.375, 0.3125, 0.0, 0.625, 1.0, 1.0]
+    - id: 186
+      data: all
+      names: [dark oak fence gate]
+      rgba: [69, 44, 21]
+      bounds: [0.375, 0.3125, 0.0, 0.625, 1.0, 1.0]
+    - id: 187
+      data: all
+      names: [acacia fence gate]
+      rgba: [182, 97, 54]
+      bounds: [0.375, 0.3125, 0.0, 0.625, 1.0, 1.0]
+
+    - id: 188
+      names: [spruce fence]
+      rgba: [69, 53, 31]
+      bounds: [0.375, 0.0, 0.375, 0.625, 1.0, 0.625]
+    - id: 189
+      names: [birch fence]
+      rgba: [157, 145, 97]
+      bounds: [0.375, 0.0, 0.375, 0.625, 1.0, 0.625]
+    - id: 190
+      names: [jungle fence]
+      rgba: [137, 98, 70]
+      bounds: [0.375, 0.0, 0.375, 0.625, 1.0, 0.625]
+    - id: 191
+      names: [dark oak fence]
+      rgba: [69, 44, 21]
+      bounds: [0.375, 0.0, 0.375, 0.625, 1.0, 0.625]
+    - id: 192
+      names: [acacia fence]
+      rgba: [182, 97, 54]
+      bounds: [0.375, 0.0, 0.375, 0.625, 1.0, 0.625]
+
+    - id: 193
+      data: all
+      names: [spruce door]
+      rgba: [69, 53, 31]
+      bounds: [0.0, 0.0, 0.8125, 1.0, 1.0, 1.0]
+    - id: 194
+      data: all
+      names: [birch door]
+      rgba: [157, 145, 97]
+      bounds: [0.0, 0.0, 0.8125, 1.0, 1.0, 1.0]
+    - id: 195
+      data: all
+      names: [jungle door]
+      rgba: [137, 98, 70]
+      bounds: [0.0, 0.0, 0.8125, 1.0, 1.0, 1.0]
+    - id: 196
+      data: all
+      names: [dark oak door]
+      rgba: [69, 44, 21]
+      bounds: [0.0, 0.0, 0.8125, 1.0, 1.0, 1.0]
+    - id: 197
+      data: all
+      names: [acacia door]
+      rgba: [182, 97, 54]
+      bounds: [0.0, 0.0, 0.8125, 1.0, 1.0, 1.0]
+
     # A minor concession to Prism's logging of paintings, frames and minecarts.
     # Since these IDs are currently unused, abuse them to represent those.
     - id: 252