aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/objects
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-12-31 11:45:54 +0100
committerTechnus <daniel112092@gmail.com>2017-12-31 11:45:54 +0100
commit49122ffb2da78539ca1d29ffa429f6482f5dcaec (patch)
treee23888d95b7adc13aef60571402015af93f97435 /src/main/java/gregtech/api/objects
parentfa7cdaaf86c061fe59f940ebb6005926b515ab96 (diff)
downloadGT5-Unofficial-49122ffb2da78539ca1d29ffa429f6482f5dcaec.tar.gz
GT5-Unofficial-49122ffb2da78539ca1d29ffa429f6482f5dcaec.tar.bz2
GT5-Unofficial-49122ffb2da78539ca1d29ffa429f6482f5dcaec.zip
Fix UO blacklist
Diffstat (limited to 'src/main/java/gregtech/api/objects')
-rw-r--r--src/main/java/gregtech/api/objects/GT_UO_DimensionList.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
index 1e4f54eb12..e34ea1d4dd 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
+++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
@@ -12,13 +12,14 @@ public class GT_UO_DimensionList {
private String fCategory;
private BiMap<String, GT_UO_Dimension> fDimensionList;
- public int[] BlackList;
+ public int[] blackList =new int[0];
public GT_UO_DimensionList() {
fDimensionList = HashBiMap.create();
}
public GT_UO_Dimension GetDimension(int aDimension) {
+ if(CheckBlackList(aDimension)) return null;
if (fDimensionList.containsKey(Integer.toString(aDimension)))
return fDimensionList.get(Integer.toString(aDimension));
for (BiMap.Entry <String, GT_UO_Dimension> dl : fDimensionList.entrySet())
@@ -26,12 +27,12 @@ public class GT_UO_DimensionList {
return dl.getValue();
return fDimensionList.get("Default");
}
-
+
public boolean CheckBlackList(int aDimensionId){
try {
- if (java.util.Arrays.binarySearch(BlackList, aDimensionId) >= 0) return true;
- else return false;
+ return java.util.Arrays.binarySearch(blackList, aDimensionId) >= 0;
} catch (Exception e) {
+ e.printStackTrace();
return false;
}
}
@@ -68,14 +69,13 @@ public class GT_UO_DimensionList {
fConfig.setCategoryComment(fCategory+".Overworld", "Set Overworld Generating");
fConfig.setCategoryComment(fCategory+".Moon", "Set Moon Generating");
- int[] BlackList = {-1,1};
- BlackList = aConfig.get(fCategory, "DimBlackList", BlackList, "Dimension IDs Black List").getIntList();
- java.util.Arrays.sort(BlackList);
+ blackList = new int[]{-1,1};
+ blackList = aConfig.get(fCategory, "DimBlackList", blackList, "Dimension IDs Black List").getIntList();
+ java.util.Arrays.sort(blackList);
for (int i = 0 ; i < fConfig.getCategory(fCategory).getChildren().size(); i++) {
GT_UO_Dimension Dimension = new GT_UO_Dimension((ConfigCategory)fConfig.getCategory(fCategory).getChildren().toArray()[i]);
fDimensionList.put(Dimension.Dimension, Dimension);
}
}
-
}