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

Access MaterialConverter only from main thread, avoid sync

Browse Source
This commit is contained in:
Brokkonaut
2018-07-21 15:11:50 +02:00
parent 0792fbd32a
commit 6d35da12e3
2 changed files with 856 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,11 +31,11 @@ public class MaterialConverter {
} }
} }
public synchronized static int getOrAddMaterialId(NamespacedKey nameSpaceKey) { public static int getOrAddMaterialId(NamespacedKey nameSpaceKey) {
return getOrAddMaterialId(nameSpaceKey.toString()); return getOrAddMaterialId(nameSpaceKey.toString());
} }
public synchronized static int getOrAddMaterialId(String blockDataString) { public static int getOrAddMaterialId(String blockDataString) {
String materialString = blockDataString; String materialString = blockDataString;
int dataPart = blockDataString.indexOf("["); int dataPart = blockDataString.indexOf("[");
if (dataPart >= 0) { if (dataPart >= 0) {
@@ -58,7 +58,7 @@ public class MaterialConverter {
return key.intValue(); return key.intValue();
} }
public synchronized static int getOrAddBlockStateId(String blockDataString) { public static int getOrAddBlockStateId(String blockDataString) {
int dataPart = blockDataString.indexOf("["); int dataPart = blockDataString.indexOf("[");
if (dataPart < 0) { if (dataPart < 0) {
return -1; return -1;
@@ -81,7 +81,7 @@ public class MaterialConverter {
return key.intValue(); return key.intValue();
} }
public synchronized static BlockData getBlockData(int materialId, int blockStateId) { public static BlockData getBlockData(int materialId, int blockStateId) {
String material = idToMaterial[materialId]; String material = idToMaterial[materialId];
if (blockStateId >= 0) { if (blockStateId >= 0) {
material = material + idToBlockState[blockStateId]; material = material + idToBlockState[blockStateId];

1696
src/main/java/de/diddiz/LogBlock/QueryParams.java
View File

File diff suppressed because it is too large Load Diff