From a91a84f42da1e2a04b3fef1d0f888d7f17bb6388 Mon Sep 17 00:00:00 2001 From: SirYwell Date: Sat, 13 Sep 2025 08:48:47 +0200 Subject: [PATCH 1/2] Improve RSApi performance --- .../common/addons/refinedstorage/RSApi.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java index a8360bb18..c7bca8227 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java +++ b/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java @@ -80,8 +80,8 @@ public static void registerCapabilities(@NotNull RegisterCapabilitiesEvent event @Nullable public static ItemResource getItem(Network network, ItemFilter filter) { StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof ItemResource itemResource && filter.test(itemResource.toItemStack())) { + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof ItemResource itemResource && filter.test(itemResource.toItemStack())) { return itemResource; } } @@ -98,8 +98,8 @@ public static ItemResource getItem(Network network, ItemFilter filter) { @Nullable public static FluidResource getFluid(Network network, FluidFilter filter) { StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof FluidResource fluidResource && filter.test(VariantUtil.toFluidStack(fluidResource, trackedResource.resourceAmount().amount()))) { + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof FluidResource fluidResource && filter.test(VariantUtil.toFluidStack(fluidResource, resourceAmount.amount()))) { return fluidResource; } } @@ -116,8 +116,8 @@ public static FluidResource getFluid(Network network, FluidFilter filter) { @Nullable public static ChemicalResource getChemical(Network network, ChemicalFilter filter) { StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof ChemicalResource chemicalResource && filter.test(ChemicalUtil.toChemicalStack(chemicalResource.chemical(), trackedResource.resourceAmount().amount()))) { + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof ChemicalResource chemicalResource && filter.test(ChemicalUtil.toChemicalStack(chemicalResource.chemical(), resourceAmount.amount()))) { return chemicalResource; } } @@ -136,9 +136,9 @@ public static Map getParsedItem(Network network, ItemFilter filt StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); AutocraftingNetworkComponent autocrafting = network.getComponent(AutocraftingNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof ItemResource itemResource && filter.test(itemResource.toItemStack())) { - return getObjectFromItemResource(trackedResource.resourceAmount(), autocrafting); + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof ItemResource itemResource && filter.test(itemResource.toItemStack())) { + return getObjectFromItemResource(resourceAmount, autocrafting); } } return null; @@ -156,9 +156,9 @@ public static Map getParsedFluid(Network network, FluidFilter fi StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); AutocraftingNetworkComponent autocrafting = network.getComponent(AutocraftingNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof FluidResource fluidResource && filter.test(VariantUtil.toFluidStack(fluidResource, trackedResource.resourceAmount().amount()))) { - return getObjectFromItemResource(trackedResource.resourceAmount(), autocrafting); + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof FluidResource fluidResource && filter.test(VariantUtil.toFluidStack(fluidResource, resourceAmount.amount()))) { + return getObjectFromItemResource(resourceAmount, autocrafting); } } return null; @@ -176,9 +176,9 @@ public static Map getParsedChemical(Network network, ChemicalFil StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); AutocraftingNetworkComponent autocrafting = network.getComponent(AutocraftingNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof ChemicalResource chemicalResource && filter.test(ChemicalUtil.toChemicalStack(chemicalResource.chemical(), trackedResource.resourceAmount().amount()))) { - return getObjectFromChemicalResource(trackedResource.resourceAmount(), autocrafting); + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof ChemicalResource chemicalResource && filter.test(ChemicalUtil.toChemicalStack(chemicalResource.chemical(), resourceAmount.amount()))) { + return getObjectFromChemicalResource(resourceAmount, autocrafting); } } return null; @@ -197,9 +197,9 @@ public static List> getParsedItems(Network network, ItemFilt StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); AutocraftingNetworkComponent autocrafting = network.getComponent(AutocraftingNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof ItemResource itemResource && filter.test(itemResource.toItemStack())) { - items.add(getObjectFromItemResource(trackedResource.resourceAmount(), autocrafting)); + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof ItemResource itemResource && filter.test(itemResource.toItemStack())) { + items.add(getObjectFromItemResource(resourceAmount, autocrafting)); } } return items; @@ -218,9 +218,9 @@ public static List> getParsedFluids(Network network, FluidFi StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); AutocraftingNetworkComponent autocrafting = network.getComponent(AutocraftingNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof FluidResource fluidResource && filter.test(VariantUtil.toFluidStack(fluidResource, trackedResource.resourceAmount().amount()))) { - items.add(getObjectFromFluidResource(trackedResource.resourceAmount(), autocrafting)); + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof FluidResource fluidResource && filter.test(VariantUtil.toFluidStack(fluidResource, resourceAmount.amount()))) { + items.add(getObjectFromFluidResource(resourceAmount, autocrafting)); } } @@ -240,9 +240,9 @@ public static List> getParsedChemicals(Network network, Chem StorageNetworkComponent storage = network.getComponent(StorageNetworkComponent.class); AutocraftingNetworkComponent autocrafting = network.getComponent(AutocraftingNetworkComponent.class); - for (TrackedResourceAmount trackedResource : storage.getResources(Actor.EMPTY.getClass())) { - if (trackedResource.resourceAmount().resource() instanceof ChemicalResource fluidResource && filter.test(ChemicalUtil.toChemicalStack(fluidResource.chemical(), trackedResource.resourceAmount().amount()))) { - items.add(getObjectFromFluidResource(trackedResource.resourceAmount(), autocrafting)); + for (ResourceAmount resourceAmount : storage.getAll()) { + if (resourceAmount.resource() instanceof ChemicalResource fluidResource && filter.test(ChemicalUtil.toChemicalStack(fluidResource.chemical(), resourceAmount.amount()))) { + items.add(getObjectFromFluidResource(resourceAmount, autocrafting)); } } From e004ee49b77e18c931bd6cfa99b64a4772ecb659 Mon Sep 17 00:00:00 2001 From: SirYwell Date: Sat, 13 Sep 2025 11:17:40 +0200 Subject: [PATCH 2/2] Remove unused imports --- .../advancedperipherals/common/addons/refinedstorage/RSApi.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java index c7bca8227..59307eb42 100644 --- a/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java +++ b/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java @@ -14,10 +14,8 @@ import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.ResourceKey; -import com.refinedmods.refinedstorage.api.storage.Actor; import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; import com.refinedmods.refinedstorage.api.storage.Storage; -import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; import com.refinedmods.refinedstorage.api.storage.composite.CompositeStorage; import com.refinedmods.refinedstorage.common.api.storage.SerializableStorage; import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer;