CacheHashMap:

-New class extending from the HashMap class, only takes CacheHashMap.CachedObject as values, which itself is a template class.
-On every call to get(), it goes through its values and removes any that are past a set age in millis.

ClientCache:
-New class with static CacheHashMap and function to get image data, will do more caching later on.
This commit is contained in:
Luis C.M committed 2023-05-30 23:41:37 -05:00
1 parent ab8e966f71
commit 46febe5c0a
6 files changed
+83 -17

No files matched your search

@@ -21,7 +21,6 @@ public class Client {
public static HashMap<Integer, OverlayCustom> customOverlays = new HashMap<>();
public static HashMap<UUID, HashMap<Integer, SkinOverlay>> skinOverlays = new HashMap<>();
public static HashMap<UUID, AnimationData> playerAnimations = new HashMap<>();
private static HashMap<String, ImageData> imageDataCache = new HashMap<>();
public static void sendData(final EnumPacketServer enu, final Object... obs) {
ByteBuf buffer = Unpooled.buffer();
@@ -33,12 +32,4 @@ public class Client {
e.printStackTrace();
}
}
public static ImageData getImageData(String directory) {
if (!imageDataCache.containsKey(directory)) {
ImageData downloadData = new ImageData(directory);
imageDataCache.put(directory, downloadData);
}
return imageDataCache.get(directory);
}
}
@@ -0,0 +1,16 @@
package noppes.npcs.client;
import noppes.npcs.client.renderer.customitem.ImageData;
import noppes.npcs.util.CacheHashMap;
public class ClientCache {
private static final CacheHashMap<String, CacheHashMap.CachedObject<ImageData>> imageDataCache = new CacheHashMap<>(10*1000);
public static ImageData getImageData(String directory) {
if (!imageDataCache.containsKey(directory)) {
ImageData imageData = new ImageData(directory);
imageDataCache.put(directory, new CacheHashMap.CachedObject<>(imageData));
}
return imageDataCache.get(directory).getObject();
}
}
@@ -15,6 +15,7 @@ import net.minecraft.client.resources.IResource;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.api.gui.ICustomGuiComponent;
import noppes.npcs.client.Client;
import noppes.npcs.client.ClientCache;
import noppes.npcs.client.ImageDownloadAlt;
import noppes.npcs.client.gui.custom.GuiCustom;
import noppes.npcs.client.gui.custom.interfaces.IClickListener;
@@ -62,7 +63,7 @@ public class CustomGuiButton extends GuiButton implements IClickListener {
this.textureY = textureY;
this.label = buttonText;
if (texture != null && !texture.isEmpty()) {
this.imageData = Client.getImageData(texture);
this.imageData = ClientCache.getImageData(texture);
}
}
@@ -14,6 +14,7 @@ import net.minecraft.client.resources.IResource;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.api.gui.ICustomGuiComponent;
import noppes.npcs.client.Client;
import noppes.npcs.client.ClientCache;
import noppes.npcs.client.ImageDownloadAlt;
import noppes.npcs.client.gui.custom.GuiCustom;
import noppes.npcs.client.gui.custom.interfaces.IGuiComponent;
@@ -61,7 +62,7 @@ public class CustomGuiTexturedRect extends Gui implements IGuiComponent {
this.textureX = textureX;
this.textureY = textureY;
if (texture != null && !texture.isEmpty()) {
this.imageData = Client.getImageData(texture);
this.imageData = ClientCache.getImageData(texture);
}
}
@@ -14,6 +14,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import noppes.npcs.client.Client;
import noppes.npcs.client.ClientCache;
import noppes.npcs.items.ItemScripted;
import noppes.npcs.scripted.item.ScriptCustomItem;
import org.lwjgl.opengl.GL11;
@@ -49,7 +50,7 @@ public class CustomItemRenderer implements IItemRenderer {
public void renderItem(ItemRenderType type, ItemStack itemStack, Object... data) {
ScriptCustomItem scriptCustomItem = ItemScripted.GetWrapper(itemStack);
BufferedImage bufferedImage = Client.getImageData(scriptCustomItem.texture).getBufferedImage();
BufferedImage bufferedImage = ClientCache.getImageData(scriptCustomItem.texture).getBufferedImage();
if (bufferedImage != null && (scriptCustomItem.width != bufferedImage.getWidth() || scriptCustomItem.height != bufferedImage.getHeight())) {
scriptCustomItem.width = bufferedImage.getWidth();
scriptCustomItem.height = bufferedImage.getHeight();
@@ -136,7 +137,7 @@ public class CustomItemRenderer implements IItemRenderer {
int pass = 0;
GL11.glPushMatrix();
Client.getImageData(scriptCustomItem.texture).bindTexture();
ClientCache.getImageData(scriptCustomItem.texture).bindTexture();
Tessellator tessellator = Tessellator.instance;
@@ -191,7 +192,7 @@ public class CustomItemRenderer implements IItemRenderer {
// Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug...
GL11.glTranslatef(0f, 0f, f9 + f10);
ImageData imageData = Client.getImageData(scriptCustomItem.texture);
ImageData imageData = ClientCache.getImageData(scriptCustomItem.texture);
ItemRenderer.renderItemIn2D(tessellator, f15, f4, f14, f5, imageData.getTotalWidth(), imageData.getTotalHeight(), f9);
if (itemStack.hasEffect(pass))
@@ -291,7 +292,7 @@ public class CustomItemRenderer implements IItemRenderer {
GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, a renderEffect can derp them up.
GL11.glEnable(GL11.GL_ALPHA_TEST);
Client.getImageData(scriptCustomItem.texture).bindTexture();
ClientCache.getImageData(scriptCustomItem.texture).bindTexture();
renderCustomItemSlot(0,0,16,16, itemRed, itemGreen, itemBlue);
GL11.glEnable(GL11.GL_LIGHTING);
@@ -366,7 +367,7 @@ public class CustomItemRenderer implements IItemRenderer {
TextureManager texturemanager = mc.getTextureManager();
int par3 = 0;
Client.getImageData(scriptCustomItem.texture).bindTexture();
ClientCache.getImageData(scriptCustomItem.texture).bindTexture();
Tessellator tessellator = Tessellator.instance;
IIcon icon = entityLivingBase.getItemIcon(itemStack, par3);
@@ -421,7 +422,7 @@ public class CustomItemRenderer implements IItemRenderer {
public static void renderCustomItemIn2D(ItemStack itemStack, Tessellator p_78439_0_, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, float p_78439_7_)
{
ImageData imageData = Client.getImageData(ItemScripted.GetWrapper(itemStack).texture);
ImageData imageData = ClientCache.getImageData(ItemScripted.GetWrapper(itemStack).texture);
int width = imageData.getTotalWidth();
int height = imageData.getTotalHeight();
@@ -0,0 +1,56 @@
package noppes.npcs.util;
import java.util.*;
public class CacheHashMap<K, V extends CacheHashMap.CachedObject<?>> extends HashMap<K, V> {
private final long maxCacheTime;
public CacheHashMap(long maxCacheTime) {
this.maxCacheTime = maxCacheTime;
}
@Override
public V get(Object key) {
synchronized (this) {
List<K> keysToRemove = new ArrayList<>();
for (Map.Entry<K,V> entry : this.entrySet()) {
if (!Objects.equals(key,entry.getKey())) {
long timeDiff = entry.getValue().timeSinceAccessed();
if (timeDiff > this.maxCacheTime) {
keysToRemove.add(entry.getKey());
}
}
}
for (K k : keysToRemove) {
this.remove(k);
}
}
V object = super.get(key);
object.updateTimeAccessed();
return object;
}
public static class CachedObject<T> {
private long lastTimeAccessed;
private final T object;
public CachedObject(T object) {
this.object = object;
this.lastTimeAccessed = System.currentTimeMillis();
}
public long timeSinceAccessed() {
return System.currentTimeMillis() - this.lastTimeAccessed;
}
public void updateTimeAccessed() {
this.lastTimeAccessed = System.currentTimeMillis();
}
public T getObject() {
return this.object;
}
}
}