mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-11-28 13:15:30 +01:00
Add new/updated blocks for 1.9-pre4 (white-stone, air portal)
This commit is contained in:
Mike Primm
parent
2c3ec9e001
commit
d6b93868a7
@ -272,6 +272,30 @@ Brick Stairs
|
||||
108 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
|
||||
Stone Stairs
|
||||
109 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
|
||||
Mycelium
|
||||
110 110 98 104 255 88 78 83 255 55 49 52 255 44 39 42 255
|
||||
Lilly pad
|
||||
111 117 176 73 255 93 140 58 255 58 88 36 255 46 70 29 255
|
||||
Nether brick
|
||||
112 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
Nether brick fence
|
||||
113 166 89 89 96 141 80 62 96 135 15 15 96 96 6 6 96
|
||||
Nether brick stairs
|
||||
114 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
Nether Wart
|
||||
115 142 19 21 96 113 15 17 96 71 10 10 96 57 7 8 96
|
||||
Enchantment table
|
||||
116 88 23 22 255 29 10 16 255 17 7 10 255 15 5 8 255
|
||||
Brewing stand
|
||||
117 114 114 114 96 91 91 91 96 67 67 67 96 46 46 46 96
|
||||
Cauldron
|
||||
118 74 74 74 255 59 59 59 255 37 37 37 255 30 30 30 255
|
||||
Air portal
|
||||
119 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
|
||||
Air portal frame
|
||||
120 113 133 104 255 90 106 83 255 56 66 52 255 45 54 42 255
|
||||
White stone
|
||||
121 224 226 169 255 179 180 135 255 112 113 85 255 90 90 66 255
|
||||
Biome Rainforest - Dark Green
|
||||
[RAINFOREST] 49 67 21 255 39 53 17 255 24 34 10 255 19 27 8 255
|
||||
Biome Swampland - Brown
|
||||
|
||||
@ -272,6 +272,30 @@ Brick Stairs
|
||||
108 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
|
||||
Stone Stairs
|
||||
109 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
|
||||
Mycelium
|
||||
110 110 98 104 255 88 78 83 255 55 49 52 255 44 39 42 255
|
||||
Lilly pad
|
||||
111 117 176 73 255 93 140 58 255 58 88 36 255 46 70 29 255
|
||||
Nether brick
|
||||
112 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
Nether brick fence
|
||||
113 166 89 89 96 141 80 62 96 135 15 15 96 96 6 6 96
|
||||
Nether brick stairs
|
||||
114 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
Nether Wart
|
||||
115 142 19 21 96 113 15 17 96 71 10 10 96 57 7 8 96
|
||||
Enchantment table
|
||||
116 88 23 22 255 29 10 16 255 17 7 10 255 15 5 8 255
|
||||
Brewing stand
|
||||
117 114 114 114 96 91 91 91 96 67 67 67 96 46 46 46 96
|
||||
Cauldron
|
||||
118 74 74 74 255 59 59 59 255 37 37 37 255 30 30 30 255
|
||||
Air portal
|
||||
119 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
|
||||
Air portal frame
|
||||
120 113 133 104 255 90 106 83 255 56 66 52 255 45 54 42 255
|
||||
White stone
|
||||
121 224 226 169 255 179 180 135 255 112 113 85 255 90 90 66 255
|
||||
Biome Rainforest - Dark Green
|
||||
[RAINFOREST] 49 67 21 255 39 53 17 255 24 34 10 255 19 27 8 255
|
||||
Biome Swampland - Brown
|
||||
|
||||
@ -272,6 +272,30 @@ Brick Stairs
|
||||
108 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
|
||||
Stone Stairs
|
||||
109 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
|
||||
Mycelium
|
||||
110 110 98 104 255 88 78 83 255 55 49 52 255 44 39 42 255
|
||||
Lilly pad
|
||||
111 117 176 73 255 93 140 58 255 58 88 36 255 46 70 29 255
|
||||
Nether brick
|
||||
112 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
Nether brick fence
|
||||
113 166 89 89 96 141 80 62 96 135 15 15 96 96 6 6 96
|
||||
Nether brick stairs
|
||||
114 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
Nether Wart
|
||||
115 142 19 21 96 113 15 17 96 71 10 10 96 57 7 8 96
|
||||
Enchantment table
|
||||
116 88 23 22 255 29 10 16 255 17 7 10 255 15 5 8 255
|
||||
Brewing stand
|
||||
117 114 114 114 96 91 91 91 96 67 67 67 96 46 46 46 96
|
||||
Cauldron
|
||||
118 74 74 74 255 59 59 59 255 37 37 37 255 30 30 30 255
|
||||
Air portal
|
||||
119 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
|
||||
Air portal frame
|
||||
120 113 133 104 255 90 106 83 255 56 66 52 255 45 54 42 255
|
||||
White stone
|
||||
121 224 226 169 255 179 180 135 255 112 113 85 255 90 90 66 255
|
||||
Biome Rainforest - Dark Green
|
||||
[RAINFOREST] 49 67 21 255 39 53 17 255 24 34 10 255 19 27 8 255
|
||||
Biome Swampland - Brown
|
||||
|
||||
@ -136,6 +136,18 @@
|
||||
107 127 98 49 96 95 72 33 96 48 34 9 96 32 21 21 96
|
||||
108 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
|
||||
109 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
|
||||
110 110 98 104 255 88 78 83 255 55 49 52 255 44 39 42 255
|
||||
111 117 176 73 255 93 140 58 255 58 88 36 255 46 70 29 255
|
||||
112 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
113 166 89 89 96 141 80 62 96 135 15 15 96 96 6 6 96
|
||||
114 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
|
||||
115 142 19 21 96 113 15 17 96 71 10 10 96 57 7 8 96
|
||||
116 88 23 22 255 29 10 16 255 17 7 10 255 15 5 8 255
|
||||
117 114 114 114 96 91 91 91 96 67 67 67 96 46 46 46 96
|
||||
118 74 74 74 255 59 59 59 255 37 37 37 255 30 30 30 255
|
||||
119 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
|
||||
120 113 133 104 255 90 106 83 255 56 66 52 255 45 54 42 255
|
||||
121 224 226 169 255 179 180 135 255 112 113 85 255 90 90 66 255
|
||||
Biome Rainforest - Dark Green
|
||||
[RAINFOREST] 49 67 21 255 39 53 17 255 24 34 10 255 19 27 8 255
|
||||
Biome Swampland - Brown
|
||||
|
||||
@ -78,8 +78,10 @@ public class TexturePack {
|
||||
private static final int BLOCKINDEX_GRASSMASK = 38;
|
||||
private static final int BLOCKINDEX_PISTONSIDE = 108;
|
||||
private static final int BLOCKINDEX_GLASSPANETOP = 148;
|
||||
private static final int BLOCKINDEX_AIRFRAME = 158;
|
||||
private static final int BLOCKINDEX_REDSTONE_NSEW_TONE = 164;
|
||||
private static final int BLOCKINDEX_REDSTONE_EW_TONE = 165;
|
||||
private static final int BLOCKINDEX_EYEOFENDER = 174;
|
||||
private static final int BLOCKINDEX_REDSTONE_NSEW = 180;
|
||||
private static final int BLOCKINDEX_REDSTONE_EW = 181;
|
||||
private static final int BLOCKINDEX_STATIONARYWATER = 257;
|
||||
@ -89,7 +91,8 @@ public class TexturePack {
|
||||
private static final int BLOCKINDEX_PISTONEXTSIDE = 261;
|
||||
private static final int BLOCKINDEX_PISTONSIDE_EXT = 262;
|
||||
private static final int BLOCKINDEX_PANETOP_X = 263;
|
||||
private static final int MAX_BLOCKINDEX = 263;
|
||||
private static final int BLOCKINDEX_AIRFRAME_EYE = 264;
|
||||
private static final int MAX_BLOCKINDEX = 264;
|
||||
private static final int BLOCKTABLELEN = MAX_BLOCKINDEX+1;
|
||||
|
||||
private static class LoadedImage {
|
||||
@ -474,6 +477,14 @@ public class TexturePack {
|
||||
terrain_argb[BLOCKINDEX_PANETOP_X][native_scale*i + j] = terrain_argb[BLOCKINDEX_PANETOP_X][native_scale*j + i];
|
||||
}
|
||||
}
|
||||
/* Build air frame with eye overlay */
|
||||
terrain_argb[BLOCKINDEX_AIRFRAME_EYE] = new int[native_scale*native_scale];
|
||||
System.arraycopy(terrain_argb[BLOCKINDEX_AIRFRAME], 0, terrain_argb[BLOCKINDEX_AIRFRAME_EYE], 0, native_scale*native_scale);
|
||||
for(i = native_scale/4; i < native_scale*3/4; i++) {
|
||||
for(j = native_scale/4; j < native_scale*3/4; j++) {
|
||||
terrain_argb[BLOCKINDEX_AIRFRAME_EYE][native_scale*i + j] = terrain_argb[BLOCKINDEX_EYEOFENDER][native_scale*i + j];
|
||||
}
|
||||
}
|
||||
|
||||
img.flush();
|
||||
}
|
||||
|
||||
@ -2557,22 +2557,58 @@ layer:6
|
||||
********
|
||||
********
|
||||
********
|
||||
# Air portal fram (damaged face)
|
||||
block:id=120,data=1,scale=16
|
||||
layer:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
|
||||
*--------------*
|
||||
-*------------*-
|
||||
--*----------*--
|
||||
---*--------*---
|
||||
----*------*----
|
||||
-----*----*-----
|
||||
------*--*------
|
||||
-------**-------
|
||||
-------**-------
|
||||
------*--*------
|
||||
-----*----*-----
|
||||
----*------*----
|
||||
---*--------*---
|
||||
--*----------*--
|
||||
-*------------*-
|
||||
*--------------*
|
||||
# Air portal frame (no eye)
|
||||
block:id=120,data=0,data=1,data=2,data=3,scale=16
|
||||
layer:0,1,2,3,4,5,6,7,8,9,10,11,12
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
# Air portal fram (eye)
|
||||
block:id=120,data=4,data=5,data=6,data=7,scale=16
|
||||
layer:0,1,2,3,4,5,6,7,8,9,10,11,12
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
****************
|
||||
layer:13,14
|
||||
----------------
|
||||
----------------
|
||||
----------------
|
||||
----------------
|
||||
----********----
|
||||
----********----
|
||||
----********----
|
||||
----********----
|
||||
----********----
|
||||
----********----
|
||||
----********----
|
||||
----********----
|
||||
----------------
|
||||
----------------
|
||||
----------------
|
||||
----------------
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# <index>=0-255 (index of patch in terrain.png), -1=clear, 1xxx=biome tint from grasscolor.png,257=stationary water,258=moving water,
|
||||
# 259=stationary lava,260=moving lava,261=extended piston side,262=piston side while extended,263=glass pane top,2xxx=biome tint from foliagecolor.png,4xxx=rotate texture 90,
|
||||
# 5xxx=rotate texture 180, 6xxx=rotate texture 270, 7xxx=flip texture horizontally, 8xxx=shift down 1/2 block, 9=shift down 1/2,flip horiz,
|
||||
# 10xxx=inclined-torch,11xxx=grass-side,12xxx=clear if same block,3xxx=biome tint from watercolor.png
|
||||
# 10xxx=inclined-torch,11xxx=grass-side,12xxx=clear if same block,3xxx=biome tint from watercolor.png, 264=air portal with eye
|
||||
######
|
||||
# Stone
|
||||
block:id=1,allfaces=1
|
||||
@ -551,7 +551,9 @@ block:id=117,data=*,topbottom=156,allsides=157,transparency=TRANSPARENT
|
||||
block:id=118,data=*,top=139,bottom=155,allsides=154,transparency=TRANSPARENT
|
||||
# Air portal (need black-with-stars texture - using obsidian for now)
|
||||
block:id=119,data=*,topbottom=37
|
||||
# Air portal frame (no damage)
|
||||
block:id=120,data=0,allfaces=159
|
||||
# Air portal fram (damaged face)
|
||||
block:id=120,data=1,allsides=158
|
||||
# Air portal frame (no eye)
|
||||
block:id=120,data=0,data=1,data=2,data=3,top=158,allsides=159,bottom=175
|
||||
# Air portal fram (eye installed)
|
||||
block:id=120,data=4,data=5,data=6,data=7,top=264,allsides=159,bottom=175
|
||||
# White stone
|
||||
block:id=121,data=*,allfaces=175
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Loading…
Reference in New Issue
Block a user