mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

So like... Fixed the cache maybe?

Browse Source
This commit is contained in:
Brian Fopiano 2021-12-25 13:51:46 -08:00
parent f8160e254b
commit 24408e53a3
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/volmit/iris/util/data/B.java
View File

@ -38,6 +38,7 @@ import org.bukkit.block.data.type.PointedDripstone;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -45,6 +46,7 @@ import static org.bukkit.Material.*;
public class B { public class B {
private static final Material AIR_MATERIAL = Material.AIR; private static final Material AIR_MATERIAL = Material.AIR;
private static final ReentrantLock createLock = new ReentrantLock();
private static final BlockData AIR = AIR_MATERIAL.createBlockData(); private static final BlockData AIR = AIR_MATERIAL.createBlockData();
private static final IntSet foliageCache = buildFoliageCache(); private static final IntSet foliageCache = buildFoliageCache();
private static final IntSet deepslateCache = buildDeepslateCache(); private static final IntSet deepslateCache = buildDeepslateCache();
@ -439,6 +441,33 @@ public class B {
return AIR; return AIR;
} }
private static BlockData createBlockData(String s) {
BlockData be = null;
try {
be = Bukkit.createBlockData(s);
} catch (Throwable e) {
}
if (be == null) {
try {
createLock.lock();
be = Bukkit.createBlockData(s);
createLock.unlock();
if (be != null) {
Iris.info("We have fixed: " + s);
}
return be;
} catch (Throwable ee) {
}
Iris.error("Oh no... " + s);
}
return be;
}
private static BlockData parseBlockData(String ix) { private static BlockData parseBlockData(String ix) {
try { try {
BlockData bx = null; BlockData bx = null;
@ -466,15 +495,15 @@ public class B {
if (bx == null) { if (bx == null) {
try { try {
bx = Bukkit.createBlockData(ix.toLowerCase()); bx = createBlockData(ix.toLowerCase());
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace();
} }
} }
if (bx == null) { if (bx == null) {
try { try {
bx = Bukkit.createBlockData("minecraft:" + ix.toLowerCase()); bx = createBlockData("minecraft:" + ix.toLowerCase());
} catch (Throwable e) { } catch (Throwable e) {
} }
@ -534,7 +563,7 @@ public class B {
for (String key : stateMap.keySet()) { //Iterate through every state and check if its valid for (String key : stateMap.keySet()) { //Iterate through every state and check if its valid
try { try {
String newState = block + "[" + key + "=" + stateMap.get(key) + "]"; String newState = block + "[" + key + "=" + stateMap.get(key) + "]";
Bukkit.createBlockData(newState); createBlockData(newState);
newStates.put(key, stateMap.get(key)); newStates.put(key, stateMap.get(key));
} catch (IllegalArgumentException ignored) { } catch (IllegalArgumentException ignored) {
@ -548,7 +577,7 @@ public class B {
Iris.debug("Converting " + ix + " to " + newBlock); Iris.debug("Converting " + ix + " to " + newBlock);
try { try {
return Bukkit.createBlockData(newBlock); return createBlockData(newBlock);
} catch (Throwable e1) { } catch (Throwable e1) {
Iris.reportError(e1); Iris.reportError(e1);
} }