Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Add new/updated blocks for 1.9-pre4 (white-stone, air portal)

Browse source
This commit is contained in:
Mike Primm 2011-10-13 22:57:33 -05:00
parent 2c3ec9e001
commit d6b93868a7
8 changed files with 158 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/org/dynmap/hdmap/TexturePack.java
View file

@ -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();
}

74
src/main/resources/models.txt
View file

@ -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
----------------
----------------
----------------
----------------
----********----
----********----
----********----
----********----
----********----
----********----
----********----
----********----
----------------
----------------
----------------
----------------

12
src/main/resources/texture.txt
View file

@ -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