From c1cb2a9782cb95653ff0b629b0d84c296c7f0a74 Mon Sep 17 00:00:00 2001 From: Jared Date: Sun, 7 Feb 2016 20:57:10 +0200 Subject: [PATCH] stripped items of ' --- .../minetweaker/api/data/DataIntArray.java | 346 +++++++++--------- .../mc1710/brackets/ItemBracketHandler.java | 2 +- .../mc18/brackets/ItemBracketHandler.java | 2 +- 3 files changed, 175 insertions(+), 175 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java index 7fedeef..a215591 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/data/DataIntArray.java @@ -11,212 +11,212 @@ import java.util.Map; * @author Stan Hebben */ public class DataIntArray implements IData { - private final int[] data; - private final boolean immutable; + private final int[] data; + private final boolean immutable; - public DataIntArray(int[] data, boolean immutable) { - this.data = data; - this.immutable = immutable; - } + public DataIntArray(int[] data, boolean immutable) { + this.data = data; + this.immutable = immutable; + } - @Override - public IData add(IData other) { - int[] otherData = other.asIntArray(); - int[] result = Arrays.copyOf(data, data.length + otherData.length); - System.arraycopy(otherData, 0, result, data.length, otherData.length); - return new DataIntArray(result, immutable); - } + @Override + public IData add(IData other) { + int[] otherData = other.asIntArray(); + int[] result = Arrays.copyOf(data, data.length + otherData.length); + System.arraycopy(otherData, 0, result, data.length, otherData.length); + return new DataIntArray(result, immutable); + } - @Override - public IData sub(IData other) { - throw new UnsupportedOperationException("Cannot subtract from an int array"); - } + @Override + public IData sub(IData other) { + throw new UnsupportedOperationException("Cannot subtract from an int array"); + } - @Override - public IData mul(IData other) { - throw new UnsupportedOperationException("Cannot multiply with an arary"); - } + @Override + public IData mul(IData other) { + throw new UnsupportedOperationException("Cannot multiply with an arary"); + } - @Override - public IData div(IData other) { - throw new UnsupportedOperationException("Cannot divide an array"); - } + @Override + public IData div(IData other) { + throw new UnsupportedOperationException("Cannot divide an array"); + } - @Override - public IData mod(IData other) { - throw new UnsupportedOperationException("Cannot perform modulo on an array"); - } + @Override + public IData mod(IData other) { + throw new UnsupportedOperationException("Cannot perform modulo on an array"); + } - @Override - public IData and(IData other) { - throw new UnsupportedOperationException("Arrays don't support bitwise operations"); - } + @Override + public IData and(IData other) { + throw new UnsupportedOperationException("Arrays don't support bitwise operations"); + } - @Override - public IData or(IData other) { - throw new UnsupportedOperationException("Arrays don't support bitwise operations"); - } + @Override + public IData or(IData other) { + throw new UnsupportedOperationException("Arrays don't support bitwise operations"); + } - @Override - public IData xor(IData other) { - throw new UnsupportedOperationException("Arrays don't support bitwise operations"); - } + @Override + public IData xor(IData other) { + throw new UnsupportedOperationException("Arrays don't support bitwise operations"); + } - @Override - public IData neg() { - throw new UnsupportedOperationException("Cannot negate arrays"); - } + @Override + public IData neg() { + throw new UnsupportedOperationException("Cannot negate arrays"); + } - @Override - public IData not() { - throw new UnsupportedOperationException("Arrays don't support bitwise operations"); - } + @Override + public IData not() { + throw new UnsupportedOperationException("Arrays don't support bitwise operations"); + } - @Override - public boolean asBool() { - throw new IllegalDataException("Cannot cast an array to bool"); - } + @Override + public boolean asBool() { + throw new IllegalDataException("Cannot cast an array to bool"); + } - @Override - public byte asByte() { - throw new IllegalDataException("Cannot cast an array to byte"); - } + @Override + public byte asByte() { + throw new IllegalDataException("Cannot cast an array to byte"); + } - @Override - public short asShort() { - throw new IllegalDataException("Cannot cast an array to short"); - } + @Override + public short asShort() { + throw new IllegalDataException("Cannot cast an array to short"); + } - @Override - public int asInt() { - throw new IllegalDataException("Cannot cast an array to int"); - } + @Override + public int asInt() { + throw new IllegalDataException("Cannot cast an array to int"); + } - @Override - public long asLong() { - throw new IllegalDataException("Cannot cast an array to long"); - } + @Override + public long asLong() { + throw new IllegalDataException("Cannot cast an array to long"); + } - @Override - public float asFloat() { - throw new IllegalDataException("Cannot cast an array to float"); - } + @Override + public float asFloat() { + throw new IllegalDataException("Cannot cast an array to float"); + } - @Override - public double asDouble() { - throw new IllegalDataException("Cannot cast an array to double"); - } + @Override + public double asDouble() { + throw new IllegalDataException("Cannot cast an array to double"); + } - @Override - public String asString() { - StringBuilder result = new StringBuilder(); - result.append('['); - boolean first = true; - for (int value : data) { - if (first) { - first = false; - } else { - result.append(", "); - } - result.append(value); - } - result.append(']'); - return result.toString(); - } + @Override + public String asString() { + StringBuilder result = new StringBuilder(); + result.append('['); + boolean first = true; + for (int value : data) { + if (first) { + first = false; + } else { + result.append(", "); + } + result.append(value); + } + result.append(']'); + return result.toString(); + } - @Override - public List asList() { - List result = new ArrayList(); - for (int value : data) { - result.add(new DataInt(value)); - } - return result; - } + @Override + public List asList() { + List result = new ArrayList(); + for (int value : data) { + result.add(new DataInt(value)); + } + return result; + } - @Override - public Map asMap() { - return null; - } + @Override + public Map asMap() { + return null; + } - @Override - public byte[] asByteArray() { - byte[] result = new byte[data.length]; - for (int i = 0; i < result.length; i++) { - result[i] = (byte) data[i]; - } - return result; - } + @Override + public byte[] asByteArray() { + byte[] result = new byte[data.length]; + for (int i = 0; i < result.length; i++) { + result[i] = (byte) data[i]; + } + return result; + } - @Override - public int[] asIntArray() { - return data; - } + @Override + public int[] asIntArray() { + return data; + } - @Override - public IData getAt(int i) { - return new DataInt(data[i]); - } + @Override + public IData getAt(int i) { + return new DataInt(data[i]); + } - @Override - public void setAt(int i, IData value) { - if (immutable) { - throw new UnsupportedOperationException("Cannot modify this byte array"); - } else { - data[i] = value.asInt(); - } - } + @Override + public void setAt(int i, IData value) { + if (immutable) { + throw new UnsupportedOperationException("Cannot modify this byte array"); + } else { + data[i] = value.asInt(); + } + } - @Override - public IData memberGet(String name) { - throw new UnsupportedOperationException("int[] doesn't have members"); - } + @Override + public IData memberGet(String name) { + throw new UnsupportedOperationException("int[] doesn't have members"); + } - @Override - public void memberSet(String name, IData data) { - throw new UnsupportedOperationException("cannot set int[] members"); - } + @Override + public void memberSet(String name, IData data) { + throw new UnsupportedOperationException("cannot set int[] members"); + } - @Override - public int length() { - return data.length; - } + @Override + public int length() { + return data.length; + } - @Override - public boolean contains(IData data) { - return equals(data); - } + @Override + public boolean contains(IData data) { + return equals(data); + } - @Override - public int compareTo(IData data) { - throw new UnsupportedOperationException("Cannot compare arrays"); - } + @Override + public int compareTo(IData data) { + throw new UnsupportedOperationException("Cannot compare arrays"); + } - @Override - public boolean equals(IData data) { - return Arrays.equals(this.data, data.asIntArray()); - } + @Override + public boolean equals(IData data) { + return Arrays.equals(this.data, data.asIntArray()); + } - @Override - public IData immutable() { - if (immutable) { - return this; - } else { - return new DataIntArray(Arrays.copyOf(this.data, this.data.length), true); - } - } + @Override + public IData immutable() { + if (immutable) { + return this; + } else { + return new DataIntArray(Arrays.copyOf(this.data, this.data.length), true); + } + } - @Override - public IData update(IData data) { - return data; - } + @Override + public IData update(IData data) { + return data; + } - @Override - public T convert(IDataConverter converter) { - return converter.fromIntArray(this.data); - } + @Override + public T convert(IDataConverter converter) { + return converter.fromIntArray(this.data); + } - @Override - public String toString() { - return asString() + " as int[]"; - } + @Override + public String toString() { + return asString() + " as int[]"; + } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java index 1095751..773f50d 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java @@ -46,7 +46,7 @@ public class ItemBracketHandler implements IBracketHandler { itemNames.clear(); for (String itemName : (Set) Item.itemRegistry.getKeys()) { - itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemName)); + itemNames.put(itemName.replace(" ", "").replace("'", ""), (Item) Item.itemRegistry.getObject(itemName)); } } diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java index fae2712..4463e15 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/brackets/ItemBracketHandler.java @@ -49,7 +49,7 @@ public class ItemBracketHandler implements IBracketHandler { for (ResourceLocation itemRes : (Set) Item.itemRegistry.getKeys()) { String itemName = itemRes.getResourceDomain() + ":" + itemRes.getResourcePath(); ResourceLocation res = new ResourceLocation(itemRes.getResourceDomain(), itemRes.getResourcePath().replace(" ", "")); - itemNames.put(itemName.replace(" ", ""), (Item) Item.itemRegistry.getObject(itemRes)); + itemNames.put(itemName.replace(" ", "").replace("'", ""), (Item) Item.itemRegistry.getObject(itemRes)); System.out.println(itemName + " : " + (Item) Item.itemRegistry.getObject(itemRes)); } }