FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-07-28 15:09:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

be less fancy with fixes

Browse source
This commit is contained in:
asie 2019-05-29 23:53:32 +02:00
parent 5b6551ce12
commit 792c1c35b3
2 changed files with 4 additions and 14 deletions
fabric-textures-v0
build.gradle
src/main/java/net/fabricmc/fabric/impl/client/texture
SpriteRegistryCallbackHolder.java

2
fabric-textures-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-textures-v0"
version = getSubprojectVersion(project, "0.1.3")
version = getSubprojectVersion(project, "0.1.4")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

16
fabric-textures-v0/src/main/java/net/fabricmc/fabric/impl/client/texture/SpriteRegistryCallbackHolder.java
View file

@ -23,13 +23,14 @@ import net.minecraft.util.Identifier;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
public final class SpriteRegistryCallbackHolder {
public static final Event<ClientSpriteRegistryCallback> EVENT_GLOBAL = createEvent();
private static final Map<Identifier, Event<ClientSpriteRegistryCallback>> eventMap = new HashMap<>();
private static final Map<Identifier, Event<ClientSpriteRegistryCallback>> eventMap = new ConcurrentHashMap<>();
private static final ReadWriteLock eventMapLock = new ReentrantReadWriteLock();
private static final Lock eventMapReadLock = eventMapLock.readLock();
private static final Lock eventMapWriteLock = eventMapLock.writeLock();
@ -39,18 +40,7 @@ public final class SpriteRegistryCallbackHolder {
}
public static Event<ClientSpriteRegistryCallback> eventLocal(Identifier key) {
eventMapReadLock.lock();
Event<ClientSpriteRegistryCallback> event = eventMap.get(key);
eventMapReadLock.unlock();
if (event == null) {
eventMapWriteLock.lock();
event = createEvent();
eventMap.put(key, event);
eventMapWriteLock.unlock();
}
return event;
return eventMap.computeIfAbsent(key, (a) -> createEvent());
}
private static Event<ClientSpriteRegistryCallback> createEvent() {