Made some tricks to improve performance in digital storages

BONNePlayground · Oct 26, 2023 · 5f28126 · 5f28126
1 parent 80cd05d
commit 5f28126
Show file tree

Hide file tree

Showing 38 changed files with 804 additions and 138 deletions.
diff --git a/build.gradle b/build.gradle
@@ -114,6 +114,7 @@ mixin {
     config "mixins.${mod_id}.rs.json"
     config "mixins.${mod_id}.sophisticatedcore.json"
     config "mixins.${mod_id}.storagenetwork.json"
+    config "mixins.${mod_id}.vaulthunters.json"
 }
 
 // Include resources generated by data generators.

diff --git a/gradle.properties b/gradle.properties
@@ -21,15 +21,15 @@ mapping_version=1.18.2
 
 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
 # Must match the String constant located in the main mod class annotated with @Mod.
-mod_id=vaulthunters_jewel_sorting
+mod_id=vault_hunters_jewel_sorting
 # The human-readable display name for the mod.
-mod_name=VaultHunters Jewel Sorting
+mod_name=Vault Hunters Jewel Sorting
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
-mod_license=ECPL-2.0
+mod_license=GNU-3.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
-mod_group_id=lv.id.bonne.vaultjewelsorting
+mod_group_id=lv.id.bonne.vaulthunters.jewelsorting
 # The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
 mod_authors=BONNe1704
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
@@ -51,6 +51,6 @@ sophisticated_backpacks_version=4637292
 # The version of Sophisticated Backpacks Mod
 storage_network_version=3868680
 # The mod version. See https://semver.org/
-mod_version=2.2.0
+mod_version=2.3.0
 # The change Log
 changelog=Initial Release
diff --git a/settings.gradle b/settings.gradle
@@ -5,11 +5,12 @@ pluginManagement {
             name = 'MinecraftForge'
             url = 'https://maven.minecraftforge.net/'
         }
+        maven { url "https://cursemaven.com" }
     }
 }
 
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }
 
-rootProject.name = 'vaulthunters_jewel_sorting'
+rootProject.name = 'vault_hunters_jewel_sorting'
diff --git a/.../vaultjewelsorting/VaultJewelSorting.java → ...nters/jewelsorting/VaultJewelSorting.java b/.../vaultjewelsorting/VaultJewelSorting.java → ...nters/jewelsorting/VaultJewelSorting.java
@@ -1,10 +1,12 @@
-package lv.id.bonne.vaultjewelsorting;
+package lv.id.bonne.vaulthunters.jewelsorting;
+
 
 import com.mojang.logging.LogUtils;
+import org.slf4j.Logger;
 
 import iskallia.vault.gear.attribute.VaultGearAttribute;
-import lv.id.bonne.vaultjewelsorting.config.Configuration;
-import lv.id.bonne.vaultjewelsorting.utils.AttributeHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.AttributeHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.config.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
@@ -13,13 +15,11 @@
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 
-import org.slf4j.Logger;
-
 
 /**
  * The main class for Vault Jewels Sorting mod.
  */
-@Mod("vaulthunters_jewel_sorting")
+@Mod("vault_hunters_jewel_sorting")
 @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
 public class VaultJewelSorting
 {

diff --git a/...g/ae2/AE2IntegrationModConfiguration.java → ...g/ae2/AE2IntegrationModConfiguration.java b/...g/ae2/AE2IntegrationModConfiguration.java → ...g/ae2/AE2IntegrationModConfiguration.java
@@ -4,10 +4,10 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.ae2;
+package lv.id.bonne.vaulthunters.jewelsorting.ae2;
 
 
-import lv.id.bonne.vaultjewelsorting.config.MixinConfigPlugin;
+import lv.id.bonne.vaulthunters.jewelsorting.config.MixinConfigPlugin;
 import net.minecraftforge.fml.loading.LoadingModList;
 
 

diff --git a/...aultjewelsorting/ae2/mixin/MixinRepo.java → ...ers/jewelsorting/ae2/mixin/MixinRepo.java b/...aultjewelsorting/ae2/mixin/MixinRepo.java → ...ers/jewelsorting/ae2/mixin/MixinRepo.java
@@ -4,7 +4,7 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.ae2.mixin;
+package lv.id.bonne.vaulthunters.jewelsorting.ae2.mixin;
 
 
 import org.spongepowered.asm.mixin.Mixin;
@@ -24,10 +24,11 @@
 import iskallia.vault.init.ModItems;
 import iskallia.vault.item.crystal.CrystalData;
 import iskallia.vault.item.data.InscriptionData;
-import lv.id.bonne.vaultjewelsorting.VaultJewelSorting;
-import lv.id.bonne.vaultjewelsorting.utils.CustomVaultGearData;
-import lv.id.bonne.vaultjewelsorting.utils.SortingHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.VaultJewelSorting;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.CustomVaultGearData;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.SortingHelper;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 
 
@@ -77,29 +78,68 @@ public final void comparator(SortOrder sortOrder,
 
             if (leftWhat.getId() == ModItems.JEWEL.getRegistryName())
             {
-                VaultGearData leftData = CustomVaultGearData.read(leftWhat.toTag().getCompound("tag"));
-                VaultGearData rightData = CustomVaultGearData.read(rightWhat.toTag().getCompound("tag"));
+                CompoundTag leftTag = leftWhat.toTag().getCompound("tag");
+                CompoundTag rightTag = rightWhat.toTag().getCompound("tag");
 
-                return switch (sortOrder) {
-                    case NAME -> SortingHelper.compareJewels(leftName,
-                        leftData,
-                        rightName,
-                        rightData,
-                        VaultJewelSorting.CONFIGURATION.getJewelSortingByName(),
-                        ascending);
-                    case AMOUNT -> SortingHelper.compareJewels(leftName,
-                        leftData,
-                        rightName,
-                        rightData,
-                        VaultJewelSorting.CONFIGURATION.getJewelSortingByAmount(),
-                        ascending);
-                    case MOD -> SortingHelper.compareJewels(leftName,
-                        leftData,
-                        rightName,
-                        rightData,
-                        VaultJewelSorting.CONFIGURATION.getJewelSortingByMod(),
-                        ascending);
-                };
+                if (!leftTag.contains("clientCache") ||
+                    !leftTag.getCompound("clientCache").contains(SortingHelper.EXTRA_ATTRIBUTE_INDEX) ||
+                    !leftTag.getCompound("clientCache").contains(SortingHelper.EXTRA_ATTRIBUTE_VALUE) ||
+                    !leftTag.getCompound("clientCache").contains(SortingHelper.EXTRA_GEAR_LEVEL) ||
+                    !leftTag.getCompound("clientCache").contains(SortingHelper.EXTRA_JEWEL_SIZE) ||
+                    !rightTag.contains("clientCache") ||
+                    !rightTag.getCompound("clientCache").contains(SortingHelper.EXTRA_ATTRIBUTE_INDEX) ||
+                    !rightTag.getCompound("clientCache").contains(SortingHelper.EXTRA_ATTRIBUTE_VALUE) ||
+                    !rightTag.getCompound("clientCache").contains(SortingHelper.EXTRA_GEAR_LEVEL) ||
+                    !rightTag.getCompound("clientCache").contains(SortingHelper.EXTRA_JEWEL_SIZE))
+                {
+                    // Client cache is not generated. Process everything manually.
+                    VaultGearData leftData = CustomVaultGearData.read(leftTag);
+                    VaultGearData rightData = CustomVaultGearData.read(rightTag);
+
+                    return switch (sortOrder) {
+                        case NAME -> SortingHelper.compareJewels(leftName,
+                            leftData,
+                            rightName,
+                            rightData,
+                            VaultJewelSorting.CONFIGURATION.getJewelSortingByName(),
+                            ascending);
+                        case AMOUNT -> SortingHelper.compareJewels(leftName,
+                            leftData,
+                            rightName,
+                            rightData,
+                            VaultJewelSorting.CONFIGURATION.getJewelSortingByAmount(),
+                            ascending);
+                        case MOD -> SortingHelper.compareJewels(leftName,
+                            leftData,
+                            rightName,
+                            rightData,
+                            VaultJewelSorting.CONFIGURATION.getJewelSortingByMod(),
+                            ascending);
+                    };
+                }
+                else
+                {
+                    return switch (sortOrder) {
+                        case NAME -> SortingHelper.compareJewels(leftName,
+                            leftTag.getCompound("clientCache"),
+                            rightName,
+                            rightTag.getCompound("clientCache"),
+                            VaultJewelSorting.CONFIGURATION.getJewelSortingByName(),
+                            ascending);
+                        case AMOUNT -> SortingHelper.compareJewels(leftName,
+                            leftTag.getCompound("clientCache"),
+                            rightName,
+                            rightTag.getCompound("clientCache"),
+                            VaultJewelSorting.CONFIGURATION.getJewelSortingByAmount(),
+                            ascending);
+                        case MOD -> SortingHelper.compareJewels(leftName,
+                            leftTag.getCompound("clientCache"),
+                            rightName,
+                            rightTag.getCompound("clientCache"),
+                            VaultJewelSorting.CONFIGURATION.getJewelSortingByMod(),
+                            ascending);
+                    };
+                }
             }
             else if (leftWhat.getId() == ModItems.INSCRIPTION.getRegistryName())
             {

diff --git a/...ultjewelsorting/config/Configuration.java → ...rs/jewelsorting/config/Configuration.java b/...ultjewelsorting/config/Configuration.java → ...rs/jewelsorting/config/Configuration.java
@@ -4,15 +4,15 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.config;
+package lv.id.bonne.vaulthunters.jewelsorting.config;
 
 
 import com.google.common.base.Enums;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import lv.id.bonne.vaultjewelsorting.utils.SortingHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.SortingHelper;
 import net.minecraftforge.common.ForgeConfigSpec;
 
 

diff --git a/...ewelsorting/config/MixinConfigPlugin.java → ...ewelsorting/config/MixinConfigPlugin.java b/...ewelsorting/config/MixinConfigPlugin.java → ...ewelsorting/config/MixinConfigPlugin.java
@@ -4,7 +4,7 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.config;
+package lv.id.bonne.vaulthunters.jewelsorting.config;
 
 
 import org.objectweb.asm.tree.ClassNode;

diff --git a/...g/qio/QIOIntegrationModConfiguration.java → ...g/qio/QIOIntegrationModConfiguration.java b/...g/qio/QIOIntegrationModConfiguration.java → ...g/qio/QIOIntegrationModConfiguration.java
@@ -4,10 +4,10 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.qio;
+package lv.id.bonne.vaulthunters.jewelsorting.qio;
 
 
-import lv.id.bonne.vaultjewelsorting.config.MixinConfigPlugin;
+import lv.id.bonne.vaulthunters.jewelsorting.config.MixinConfigPlugin;
 import net.minecraftforge.fml.loading.LoadingModList;
 
 

diff --git a/...inQIOItemViewerContainerListSortType.java → ...inQIOItemViewerContainerListSortType.java b/...inQIOItemViewerContainerListSortType.java → ...inQIOItemViewerContainerListSortType.java
@@ -4,7 +4,7 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.qio.mixin;
+package lv.id.bonne.vaulthunters.jewelsorting.qio.mixin;
 
 
 import org.objectweb.asm.Opcodes;
@@ -17,6 +17,7 @@
 import java.util.Comparator;
 
 import iskallia.vault.gear.data.AttributeGearData;
+import iskallia.vault.gear.data.GearDataCache;
 import iskallia.vault.gear.data.VaultGearData;
 import iskallia.vault.gear.item.VaultGearItem;
 import iskallia.vault.item.InscriptionItem;
@@ -26,9 +27,8 @@
 import iskallia.vault.item.gear.TrinketItem;
 import iskallia.vault.item.tool.JewelItem;
 import iskallia.vault.item.tool.ToolItem;
-import lv.id.bonne.vaultjewelsorting.VaultJewelSorting;
-import lv.id.bonne.vaultjewelsorting.utils.CustomVaultGearData;
-import lv.id.bonne.vaultjewelsorting.utils.SortingHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.VaultJewelSorting;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.SortingHelper;
 import mekanism.common.inventory.ISlotClickHandler;
 import mekanism.common.inventory.container.QIOItemViewerContainer;
 import net.minecraft.client.gui.screens.Screen;
@@ -80,8 +80,8 @@ private Comparator<ISlotClickHandler.IScrollableSlot> redirectAscending(QIOItemV
             {
                 String leftName = firstItem.getDisplayName().getString();
                 String rightName = secondItem.getDisplayName().getString();
-                VaultGearData leftData = VaultGearData.read(firstItem);
-                VaultGearData rightData = VaultGearData.read(secondItem);
+                GearDataCache leftData = GearDataCache.of(firstItem);
+                GearDataCache rightData = GearDataCache.of(secondItem);
 
                 return switch (instance) {
                     case NAME -> SortingHelper.compareJewels(leftName,

diff --git a/...ark/QuarkIntegrationModConfiguration.java → ...ark/QuarkIntegrationModConfiguration.java b/...ark/QuarkIntegrationModConfiguration.java → ...ark/QuarkIntegrationModConfiguration.java
@@ -4,10 +4,10 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.quark;
+package lv.id.bonne.vaulthunters.jewelsorting.quark;
 
 
-import lv.id.bonne.vaultjewelsorting.config.MixinConfigPlugin;
+import lv.id.bonne.vaulthunters.jewelsorting.config.MixinConfigPlugin;
 import net.minecraftforge.fml.loading.LoadingModList;
 
 

diff --git a/...ting/quark/mixin/MixinSortingHandler.java → ...ting/quark/mixin/MixinSortingHandler.java b/...ting/quark/mixin/MixinSortingHandler.java → ...ting/quark/mixin/MixinSortingHandler.java
@@ -4,7 +4,7 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.quark.mixin;
+package lv.id.bonne.vaulthunters.jewelsorting.quark.mixin;
 
 
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,8 +23,8 @@
 import iskallia.vault.item.gear.TrinketItem;
 import iskallia.vault.item.tool.JewelItem;
 import iskallia.vault.item.tool.ToolItem;
-import lv.id.bonne.vaultjewelsorting.VaultJewelSorting;
-import lv.id.bonne.vaultjewelsorting.utils.SortingHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.VaultJewelSorting;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.SortingHelper;
 import net.minecraft.world.item.ItemStack;
 import vazkii.quark.base.handler.SortingHandler;
 

diff --git a/...edStorageIntegrationModConfiguration.java → ...edStorageIntegrationModConfiguration.java b/...edStorageIntegrationModConfiguration.java → ...edStorageIntegrationModConfiguration.java
@@ -4,10 +4,10 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.refinedstorage;
+package lv.id.bonne.vaulthunters.jewelsorting.refinedstorage;
 
 
-import lv.id.bonne.vaultjewelsorting.config.MixinConfigPlugin;
+import lv.id.bonne.vaulthunters.jewelsorting.config.MixinConfigPlugin;
 import net.minecraftforge.fml.loading.LoadingModList;
 
 

diff --git a/...finedstorage/mixin/MixinIdGridSorter.java → ...finedstorage/mixin/MixinIdGridSorter.java b/...finedstorage/mixin/MixinIdGridSorter.java → ...finedstorage/mixin/MixinIdGridSorter.java
@@ -4,7 +4,7 @@
 //
 
 
-package lv.id.bonne.vaultjewelsorting.refinedstorage.mixin;
+package lv.id.bonne.vaulthunters.jewelsorting.refinedstorage.mixin;
 
 
 import com.refinedmods.refinedstorage.screen.grid.sorting.IdGridSorter;
@@ -16,6 +16,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import iskallia.vault.gear.data.AttributeGearData;
+import iskallia.vault.gear.data.GearDataCache;
 import iskallia.vault.gear.data.VaultGearData;
 import iskallia.vault.gear.item.VaultGearItem;
 import iskallia.vault.item.InscriptionItem;
@@ -25,8 +26,8 @@
 import iskallia.vault.item.gear.TrinketItem;
 import iskallia.vault.item.tool.JewelItem;
 import iskallia.vault.item.tool.ToolItem;
-import lv.id.bonne.vaultjewelsorting.VaultJewelSorting;
-import lv.id.bonne.vaultjewelsorting.utils.SortingHelper;
+import lv.id.bonne.vaulthunters.jewelsorting.VaultJewelSorting;
+import lv.id.bonne.vaulthunters.jewelsorting.utils.SortingHelper;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.world.item.ItemStack;
 
@@ -68,9 +69,9 @@ public void compare(IGridStack left,
                 if (!VaultJewelSorting.CONFIGURATION.getJewelSortingByMod().isEmpty())
                 {
                     callbackInfoReturnable.setReturnValue(SortingHelper.compareJewels(left.getName(),
-                        VaultGearData.read(leftStack),
+                        GearDataCache.of(leftStack),
                         right.getName(),
-                        VaultGearData.read(rightStack),
+                        GearDataCache.of(rightStack),
                         VaultJewelSorting.CONFIGURATION.getJewelSortingByMod(),
                         sortingDirection == SortingDirection.ASCENDING));
                     callbackInfoReturnable.cancel();
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     //
-    package lv.id.bonne.vaultjewelsorting.config;
+    package lv.id.bonne.vaulthunters.jewelsorting.config;
     import org.objectweb.asm.tree.ClassNode;
@@ Expand Down @@