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

Update IC2 wire model

Browse source
This commit is contained in:
Mike Primm 2011-10-29 01:29:12 -05:00
parent b588a7775e
commit 0cedeac3eb
2 changed files with 80 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

156
renderdata/ic2-models.txt-disabled
View file

@ -3,18 +3,18 @@ linkmap:id=228,linkalg=5,linkid=223,linkid=225,linkid=226,linkid=227,linkid=228,
# Wire - (data is faked: 1=north,2=east,4=south,8=west) # Wire - (data is faked: 1=north,2=east,4=south,8=west)
# Wire - no neighbors # Wire - no neighbors
block:id=228,data=0,scale=16 block:id=228,data=0,scale=16
layer:6,7,8,9 layer:5,6,7,8,9,10
---------------- ----------------
---------------- ----------------
---------------- ----------------
---------------- ----------------
---------------- ----------------
---------------- -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
---------------- -----******-----
---------------- ----------------
---------------- ----------------
---------------- ----------------
@ -22,18 +22,18 @@ layer:6,7,8,9
---------------- ----------------
# Wire - just north neighbor # Wire - just north neighbor
block:id=228,data=1,scale=16 block:id=228,data=1,scale=16
layer:6,7,8,9 layer:5,6,7,8,9,10
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
---------------- -----******-----
---------------- ----------------
---------------- ----------------
---------------- ----------------
@ -50,18 +50,18 @@ block:id=228,data=8,scale=16
rotate:id=228,data=1,rot=270 rotate:id=228,data=1,rot=270
# Wire - north and east neighbor # Wire - north and east neighbor
block:id=228,data=3,scale=16 block:id=228,data=3,scale=16
layer:6,7,8,9 layer:5,6,7,8,9,10
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------********** -----***********
------********** -----***********
------********** -----***********
------********** -----***********
---------------- -----***********
---------------- ----------------
---------------- ----------------
---------------- ----------------
@ -78,45 +78,45 @@ block:id=228,data=9,scale=16
rotate:id=228,data=3,rot=270 rotate:id=228,data=3,rot=270
# Wire - north and south neighbor # Wire - north and south neighbor
block:id=228,data=5,scale=16 block:id=228,data=5,scale=16
layer:6,7,8,9 layer:5,6,7,8,9,10
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
# Wire - east and west neighbor # Wire - east and west neighbor
block:id=228,data=10,scale=16 block:id=228,data=10,scale=16
rotate:id=228,data=5,rot=90 rotate:id=228,data=5,rot=90
# Wire - north, east and south neighbor # Wire - north, east and south neighbor
block:id=228,data=7,scale=16 block:id=228,data=7,scale=16
layer:6,7,8,9 layer:5,6,7,8,9,10
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----***********
------********** -----***********
------********** -----***********
------********** -----***********
------********** -----***********
------****------ -----***********
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
# Wire - east, south and west neighbor # Wire - east, south and west neighbor
block:id=228,data=14,scale=16 block:id=228,data=14,scale=16
rotate:id=228,data=7,rot=90 rotate:id=228,data=7,rot=90
@ -128,23 +128,23 @@ block:id=228,data=11,scale=16
rotate:id=228,data=7,rot=270 rotate:id=228,data=7,rot=270
# Wire - north, south, east, west neightbors # Wire - north, south, east, west neightbors
block:id=228,data=15,scale=16 block:id=228,data=15,scale=16
layer:6,7,8,9 layer:5,6,7,8,9,10
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------
**************** ****************
**************** ****************
**************** ****************
**************** ****************
------****------ ****************
------****------ ****************
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
------****------ -----******-----
-----******-----
# Iron Fence - set render algorithm # Iron Fence - set render algorithm
linkmap:id=232,linkalg=1 linkmap:id=232,linkalg=1
# Iron Fence - (data is faked: 1=north,2=east,4=south,8=west) # Iron Fence - (data is faked: 1=north,2=east,4=south,8=west)

5
src/main/java/org/dynmap/hdmap/HDBlockModels.java
View file

@ -417,7 +417,7 @@ public class HDBlockModels {
ArrayList<Integer> blkids = new ArrayList<Integer>(); ArrayList<Integer> blkids = new ArrayList<Integer>();
line = line.substring(8); line = line.substring(8);
String[] args = line.split(","); String[] args = line.split(",");
List<Integer> map = null; List<Integer> map = new ArrayList<Integer>();
int linktype = 0; int linktype = 0;
for(String a : args) { for(String a : args) {
String[] av = a.split("="); String[] av = a.split("=");
@ -429,11 +429,10 @@ public class HDBlockModels {
linktype = Integer.parseInt(av[1]); linktype = Integer.parseInt(av[1]);
} }
else if(av[0].equals("linkid")) { else if(av[0].equals("linkid")) {
if(map == null) map = new ArrayList<Integer>();
map.add(Integer.parseInt(av[1])); map.add(Integer.parseInt(av[1]));
} }
} }
if(map != null) { if(linktype > 0) {
int[] mapids = new int[map.size()]; int[] mapids = new int[map.size()];
for(int i = 0; i < mapids.length; i++) for(int i = 0; i < mapids.length; i++)
mapids[i] = map.get(i); mapids[i] = map.get(i);