Skip to content

Improve RSApi performance #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SirEndii merged 2 commits into from
Sep 14, 2025
Merged

Improve RSApi performance #786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a91a84f
Improve RSApi performance
SirYwell Sep 13, 2025
e004ee4
Remove unused imports
SirYwell Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -80,8 +78,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;
}
}
Expand All @@ -98,8 +96,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;
}
}
Expand All @@ -116,8 +114,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;
}
}
Expand All @@ -136,9 +134,9 @@ public static Map<String, Object> 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;
Expand All @@ -156,9 +154,9 @@ public static Map<String, Object> 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;
Expand All @@ -176,9 +174,9 @@ public static Map<String, Object> 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;
Expand All @@ -197,9 +195,9 @@ public static List<Map<String, Object>> 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;
Expand All @@ -218,9 +216,9 @@ public static List<Map<String, Object>> 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));
}
}

Expand All @@ -240,9 +238,9 @@ public static List<Map<String, Object>> 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));
}
}

Expand Down