diff --git a/src/main/java/com/ruinscraft/powder/util/ConfigUtil.java b/src/main/java/com/ruinscraft/powder/util/ConfigUtil.java index 89f3344..113981b 100644 --- a/src/main/java/com/ruinscraft/powder/util/ConfigUtil.java +++ b/src/main/java/com/ruinscraft/powder/util/ConfigUtil.java @@ -288,19 +288,19 @@ multiplier, getStart(powderConfig, powder, eachSection), String eachEachSection = eachSection + ".layers." + sss; Layer layer = new Layer(); layer.setPosition(powderConfig.getDouble(eachEachSection + ".position", 0)); - for (String t : (List) powderConfig + for (String ssss : (List) powderConfig .getList(eachEachSection + ".layerMatrix", new ArrayList())) { - if (t.contains(":")) { - if (t.contains("img:")) { + if (ssss.contains(":")) { + if (ssss.contains("img:")) { String urlName; int width; int height; - t = t.replace("img:", ""); - urlName = t.substring(0, t.indexOf(";")); - t = t.substring(t.indexOf(";") + 1, t.length()); - width = Integer.valueOf(t.substring(0, t.indexOf(";"))); - t = t.substring(t.indexOf(";") + 1, t.length()); - height = Integer.valueOf(t); + ssss = ssss.replace("img:", ""); + urlName = ssss.substring(0, ssss.indexOf(";")); + ssss = ssss.substring(ssss.indexOf(";") + 1, ssss.length()); + width = Integer.valueOf(ssss.substring(0, ssss.indexOf(";"))); + ssss = ssss.substring(ssss.indexOf(";") + 1, ssss.length()); + height = Integer.valueOf(ssss); try { ImageUtil.getRows(layer.getRows(), urlName, width, height); } catch (IOException io) { @@ -317,11 +317,11 @@ multiplier, getStart(powderConfig, powder, eachSection), if (layer.getPosition() == 0) { up++; // if the string contains location/player - if (t.contains("?")) { + if (ssss.contains("?")) { containsPlayer = true; // set the left & up of the Layer // so that createPowders() knows where to start - left = (t.indexOf("?")) + 1; + left = (ssss.indexOf("?")) + 1; // set default if it's the matrix spawned immediately if (particleMatrix.getStartTime() == 0) { powder.setDefaultLeft(left - 1); @@ -334,7 +334,7 @@ multiplier, getStart(powderConfig, powder, eachSection), // add a row to the Layer if it has gone through everything // rows contain PowderParticles List row = new ArrayList(); - for (char character : t.toCharArray()) { + for (char character : ssss.toCharArray()) { PowderParticle powderParticle; powderParticle = powder.getPowderParticle(character); if (powderParticle == null) { diff --git a/src/main/resources/powders.yml b/src/main/resources/powders.yml index 1d8ec37..285d69a 100644 --- a/src/main/resources/powders.yml +++ b/src/main/resources/powders.yml @@ -447,7 +447,6 @@ powders: layers: layer1: position: 0 - layerMatrix: layerMatrix: - 'img:flag-ca.png;39;39' - '...................?' @@ -467,7 +466,6 @@ powders: layers: layer1: position: 0 - layerMatrix: layerMatrix: - 'img:flag-eu.png;39;39' - '...................?' @@ -487,7 +485,6 @@ powders: layers: layer1: position: 0 - layerMatrix: layerMatrix: - 'img:flag-cn.png;39;39' - '...................?'