AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactored tablet cache id getters

Browse Source
This commit is contained in:
TheCodex6824 2022-09-28 15:45:32 -04:00
parent e7f5f824af
commit 9b8786aaef
No known key found for this signature in database
GPG Key ID: E9EBC39837469118
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/scala/li/cil/oc/common/item/Tablet.scala
View File

@ -5,7 +5,6 @@ import java.util
import java.util.UUID
import java.util.concurrent.Callable
import java.util.concurrent.TimeUnit
import com.google.common.cache.{CacheBuilder, RemovalListener, RemovalNotification}
import com.google.common.collect.ImmutableMap
import li.cil.oc.Constants
@ -48,6 +47,7 @@ import net.minecraft.nbt.NBTTagCompound
import net.minecraft.server.integrated.IntegratedServer
import net.minecraft.util._
import net.minecraft.world.World
import net.minecraftforge.common.util.Constants.NBT
import net.minecraftforge.event.world.WorldEvent
import net.minecraftforge.fml.common.FMLCommonHandler
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@ -474,7 +474,14 @@ object Tablet {
// with storing context information for analyzing a block in the singleton.
var currentlyAnalyzing: Option[(BlockPosition, EnumFacing, Float, Float, Float)] = None
def getId(stack: ItemStack): String = {
def getId(stack: ItemStack): Option[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey(Settings.namespace + "tablet", NBT.TAG_STRING)) {
Some(stack.getTagCompound.getString(Settings.namespace + "tablet"))
}
else None
}
def getOrCreateId(stack: ItemStack): String = {
if (!stack.hasTagCompound) {
stack.setTagCompound(new NBTTagCompound())
@ -534,7 +541,7 @@ object Tablet {
private var currentHolder: EntityPlayer = _
def get(stack: ItemStack, holder: EntityPlayer): TabletWrapper = {
val id = getId(stack)
val id = getOrCreateId(stack)
cache.synchronized {
currentStack = stack
currentHolder = holder
@ -616,8 +623,8 @@ object Tablet {
override protected def timeout = 5
def getWeak(stack: ItemStack): Option[TabletWrapper] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey(Settings.namespace + "tablet")) {
val key = getId(stack)
val key = getId(stack)
if (key.nonEmpty) {
val map = cache.asMap
if (map.containsKey(key))
Some(map.entrySet.find(entry => entry.getKey == key).get.getValue)
@ -627,8 +634,8 @@ object Tablet {
}
def get(stack: ItemStack): Option[TabletWrapper] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey(Settings.namespace + "tablet")) {
val id = stack.getTagCompound.getString(Settings.namespace + "tablet")
val id = getId(stack);
if (id.nonEmpty) {
cache.synchronized(Option(cache.getIfPresent(id)))
}
else None

2
src/main/scala/li/cil/oc/integration/opencomputers/DriverTablet.scala
View File

@ -20,7 +20,7 @@ object DriverTablet extends Item {
override def createEnvironment(stack: ItemStack, host: EnvironmentHost) =
if (host.world != null && host.world.isRemote) null
else {
Tablet.Server.cache.invalidate(Tablet.getId(stack))
Tablet.Server.cache.invalidate(Tablet.getOrCreateId(stack))
val data = new TabletData(stack)
data.items.collect {
case fs if !fs.isEmpty && DriverFileSystem.worksWith(fs) => fs