feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Not every material has a BlockData

Browse Source
This commit is contained in:
Brokkonaut
2018-07-21 14:30:44 +02:00
parent 51505cf34a
commit 0792fbd32a
2 changed files with 306 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/de/diddiz/LogBlock/MaterialConverter.java
View File

@ -21,6 +21,16 @@ public class MaterialConverter {
private static HashMap<String, Integer> blockStateToID = new HashMap<>(); private static HashMap<String, Integer> blockStateToID = new HashMap<>();
private static int nextBlockStateId; private static int nextBlockStateId;
private static HashMap<String, Material> materialKeyToMaterial = new HashMap<>();
static {
for (Material m : Material.values()) {
if (!m.name().startsWith("LEGACY_") && m.getKey() != null) {
materialKeyToMaterial.put(m.getKey().toString(), m);
}
}
}
public synchronized static int getOrAddMaterialId(NamespacedKey nameSpaceKey) { public synchronized static int getOrAddMaterialId(NamespacedKey nameSpaceKey) {
return getOrAddMaterialId(nameSpaceKey.toString()); return getOrAddMaterialId(nameSpaceKey.toString());
} }
@ -80,7 +90,11 @@ public class MaterialConverter {
} }
public static Material getMaterial(int materialId) { public static Material getMaterial(int materialId) {
return getBlockData(materialId, -1).getMaterial(); String material = idToMaterial[materialId];
if (materialId >= 0) {
material = material + idToBlockState[materialId];
}
return materialKeyToMaterial.get(material);
} }
public static void initializeMaterials(Connection connection) throws SQLException { public static void initializeMaterials(Connection connection) throws SQLException {

3
src/main/java/de/diddiz/LogBlock/WorldEditor.java
View File

@ -158,6 +158,9 @@ public class WorldEditor implements Runnable {
PerformResult perform() throws WorldEditorException { PerformResult perform() throws WorldEditorException {
BlockData replacedBlock = MaterialConverter.getBlockData(this.replacedMaterial, replacedData); BlockData replacedBlock = MaterialConverter.getBlockData(this.replacedMaterial, replacedData);
BlockData setBlock = MaterialConverter.getBlockData(this.typeMaterial, typeData); BlockData setBlock = MaterialConverter.getBlockData(this.typeMaterial, typeData);
if (replacedBlock == null || setBlock == null) {
throw new WorldEditorException("Could not parse the material", loc.clone());
}
// action: set to replaced // action: set to replaced
if (dontRollback.contains(replacedBlock.getMaterial())) { if (dontRollback.contains(replacedBlock.getMaterial())) {