EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Ignore metadata and fix material name matching

Browse Source
This commit is contained in:
PseudoKnight 2018-05-26 14:27:42 -07:00
parent 57684b2645
commit 9c36596cca
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/net/TheDgtl/Stargate/Gate.java
View File

@ -46,7 +46,6 @@ public class Gate {
private String filename; private String filename;
private Character[][] layout; private Character[][] layout;
private HashMap<Character, Material> types; private HashMap<Character, Material> types;
private HashMap<Character, Integer> metadata;
private RelativeBlockVector[] entrances = new RelativeBlockVector[0]; private RelativeBlockVector[] entrances = new RelativeBlockVector[0];
private RelativeBlockVector[] border = new RelativeBlockVector[0]; private RelativeBlockVector[] border = new RelativeBlockVector[0];
private RelativeBlockVector[] controls = new RelativeBlockVector[0]; private RelativeBlockVector[] controls = new RelativeBlockVector[0];
@ -61,10 +60,9 @@ public class Gate {
private int destroyCost = -1; private int destroyCost = -1;
private boolean toOwner = false; private boolean toOwner = false;
public Gate(String filename, Character[][] layout, HashMap<Character, Material> types, HashMap<Character, Integer> metadata) { public Gate(String filename, Character[][] layout, HashMap<Character, Material> types) {
this.filename = filename; this.filename = filename;
this.layout = layout; this.layout = layout;
this.metadata = metadata;
this.types = types; this.types = types;
populateCoordinates(); populateCoordinates();
@ -141,12 +139,6 @@ public class Gate {
bw.append(type); bw.append(type);
bw.append('='); bw.append('=');
bw.append(value.toString()); bw.append(value.toString());
Integer mData = metadata.get(type);
// Append metadata
if (mData != null) {
bw.append(':');
bw.append(mData.toString());
}
bw.newLine(); bw.newLine();
} }
@ -188,10 +180,6 @@ public class Gate {
return types; return types;
} }
public HashMap<Character, Integer> getMetaData() {
return metadata;
}
public RelativeBlockVector[] getEntrances() { public RelativeBlockVector[] getEntrances() {
return entrances; return entrances;
} }
@ -293,11 +281,6 @@ public class Gate {
Stargate.debug("Gate::Matches", "Block Type Mismatch: " + topleft.modRelative(x, y, 0, modX, 1, modZ).getType() + " != " + id); Stargate.debug("Gate::Matches", "Block Type Mismatch: " + topleft.modRelative(x, y, 0, modX, 1, modZ).getType() + " != " + id);
return false; return false;
} }
Integer mData = metadata.get(layout[y][x]);
if (mData != null && topleft.modRelative(x, y, 0, modX, 1, modZ).getData() != mData) {
Stargate.debug("Gate::Matches", "Block Data Mismatch: " + topleft.modRelative(x, y, 0, modX, 1, modZ).getData() + " != " + mData);
return false;
}
} }
} }
} }
@ -322,7 +305,6 @@ public class Gate {
boolean designing = false; boolean designing = false;
ArrayList<ArrayList<Character>> design = new ArrayList<>(); ArrayList<ArrayList<Character>> design = new ArrayList<>();
HashMap<Character, Material> types = new HashMap<>(); HashMap<Character, Material> types = new HashMap<>();
HashMap<Character, Integer> metadata = new HashMap<>();
HashMap<String, String> config = new HashMap<>(); HashMap<String, String> config = new HashMap<>();
HashSet<Material> frameTypes = new HashSet<>(); HashSet<Material> frameTypes = new HashSet<>();
int cols = 0; int cols = 0;
@ -364,15 +346,7 @@ public class Gate {
if (key.length() == 1) { if (key.length() == 1) {
Character symbol = key.charAt(0); Character symbol = key.charAt(0);
// Check for metadata Material id = Material.getMaterial(value);
if (value.contains(":")) {
split = value.split(":");
value = split[0].trim();
String mData = split[1].trim();
metadata.put(symbol, Integer.parseInt(mData));
}
Material id = Material.valueOf(value);
types.put(symbol, id); types.put(symbol, id);
frameTypes.add(id); frameTypes.add(id);
} else { } else {
@ -405,7 +379,7 @@ public class Gate {
layout[y] = result; layout[y] = result;
} }
Gate gate = new Gate(file.getName(), layout, types, metadata); Gate gate = new Gate(file.getName(), layout, types);
gate.portalBlockOpen = readConfig(config, gate, file, "portal-open", gate.portalBlockOpen); gate.portalBlockOpen = readConfig(config, gate, file, "portal-open", gate.portalBlockOpen);
gate.portalBlockClosed = readConfig(config, gate, file, "portal-closed", gate.portalBlockClosed); gate.portalBlockClosed = readConfig(config, gate, file, "portal-closed", gate.portalBlockClosed);
@ -485,9 +459,8 @@ public class Gate {
types.put(ANYTHING, Material.AIR); types.put(ANYTHING, Material.AIR);
types.put('X', Material.OBSIDIAN); types.put('X', Material.OBSIDIAN);
types.put('-', Material.OBSIDIAN); types.put('-', Material.OBSIDIAN);
HashMap<Character, Integer> metadata = new HashMap<>();
Gate gate = new Gate("nethergate.gate", layout, types, metadata); Gate gate = new Gate("nethergate.gate", layout, types);
gate.save(gateFolder); gate.save(gateFolder);
registerGate(gate); registerGate(gate);
} }