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

Add state index range support to models (data=x-y)

Browse source
This commit is contained in:
Mike Primm 2018-09-09 18:05:17 -05:00
parent e81612646f
commit 5d3bf73d9c
1 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

55
DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockModels.java
View file

@ -375,8 +375,17 @@ public class HDBlockModels {
blknames.add(getBlockName(modname,av[1])); blknames.add(getBlockName(modname,av[1]));
} }
else if(av[0].equals("data")) { else if(av[0].equals("data")) {
if(av[1].equals("*")) if(av[1].equals("*")) {
databits.clear(); databits.clear();
}
else if (av[1].indexOf('-') > 0) {
String[] sp = av[1].split("-");
int m0 = getIntValue(varvals, sp[0]);
int m1 = getIntValue(varvals, sp[1]);
for (int m = m0; m <= m1; m++) {
databits.set(m);
}
}
else else
databits.set(getIntValue(varvals,av[1])); databits.set(getIntValue(varvals,av[1]));
} }
@ -532,8 +541,17 @@ public class HDBlockModels {
blknames.add(getBlockName(modname,av[1])); blknames.add(getBlockName(modname,av[1]));
} }
else if(av[0].equals("data")) { else if(av[0].equals("data")) {
if(av[1].equals("*")) if(av[1].equals("*")) {
databits.clear(); databits.clear();
}
else if (av[1].indexOf('-') > 0) {
String[] sp = av[1].split("-");
int m0 = getIntValue(varvals, sp[0]);
int m1 = getIntValue(varvals, sp[1]);
for (int m = m0; m <= m1; m++) {
databits.set(m);
}
}
else else
databits.set(getIntValue(varvals,av[1])); databits.set(getIntValue(varvals,av[1]));
} }
@ -717,8 +735,17 @@ public class HDBlockModels {
blknames.add(getBlockName(modname,av[1])); blknames.add(getBlockName(modname,av[1]));
} }
else if(av[0].equals("data")) { else if(av[0].equals("data")) {
if(av[1].equals("*")) if(av[1].equals("*")) {
databits.clear(); databits.clear();
}
else if (av[1].indexOf('-') > 0) {
String[] sp = av[1].split("-");
int m0 = getIntValue(varvals, sp[0]);
int m1 = getIntValue(varvals, sp[1]);
for (int m = m0; m <= m1; m++) {
databits.set(m);
}
}
else else
databits.set(getIntValue(varvals,av[1])); databits.set(getIntValue(varvals,av[1]));
} }
@ -789,8 +816,17 @@ public class HDBlockModels {
blknames.add(getBlockName(modname,av[1])); blknames.add(getBlockName(modname,av[1]));
} }
else if(av[0].equals("data")) { else if(av[0].equals("data")) {
if(av[1].equals("*")) if(av[1].equals("*")) {
databits.clear(); databits.clear();
}
else if (av[1].indexOf('-') > 0) {
String[] sp = av[1].split("-");
int m0 = getIntValue(varvals, sp[0]);
int m1 = getIntValue(varvals, sp[1]);
for (int m = m0; m <= m1; m++) {
databits.set(m);
}
}
else else
databits.set(getIntValue(varvals,av[1])); databits.set(getIntValue(varvals,av[1]));
} }
@ -853,8 +889,17 @@ public class HDBlockModels {
blknames.add(getBlockName(modname, av[1])); blknames.add(getBlockName(modname, av[1]));
} }
else if(av[0].equals("data")) { else if(av[0].equals("data")) {
if(av[1].equals("*")) if(av[1].equals("*")) {
databits.clear(); databits.clear();
}
else if (av[1].indexOf('-') > 0) {
String[] sp = av[1].split("-");
int m0 = getIntValue(varvals, sp[0]);
int m1 = getIntValue(varvals, sp[1]);
for (int m = m0; m <= m1; m++) {
databits.set(m);
}
}
else else
databits.set(getIntValue(varvals,av[1])); databits.set(getIntValue(varvals,av[1]));
} }