Skip to content

Commit 15d8817

Browse files
authored
dont copy created lists for stream (#345)
1 parent 723efb2 commit 15d8817

File tree

31 files changed

+33
-33
lines changed

31 files changed

+33
-33
lines changed

src/main/java/com/cleanroommc/groovyscript/compat/mods/astralsorcery/starlightaltar/StarlightAltar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private boolean remove(AbstractAltarRecipe recipe) {
9494

9595
@MethodDescription(type = MethodDescription.Type.QUERY)
9696
public SimpleObjectStream<AbstractAltarRecipe> streamRecipes() {
97-
return new SimpleObjectStream<>(AltarRecipeRegistry.recipes.entrySet().stream().flatMap(r -> r.getValue().stream()).collect(Collectors.toList()))
97+
return new SimpleObjectStream<>(AltarRecipeRegistry.recipes.entrySet().stream().flatMap(r -> r.getValue().stream()).collect(Collectors.toList()), false)
9898
.setRemover(this::remove);
9999
}
100100

src/main/java/com/cleanroommc/groovyscript/compat/mods/enderio/AlloySmelter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public SimpleObjectStream<IManyToOneRecipe> streamRecipes() {
152152
.filter(r -> r instanceof IManyToOneRecipe)
153153
.map(r -> (IManyToOneRecipe) r)
154154
.collect(Collectors.toList());
155-
return new SimpleObjectStream<>(list)
155+
return new SimpleObjectStream<>(list, false)
156156
.setRemover(this::remove);
157157
}
158158

src/main/java/com/cleanroommc/groovyscript/compat/mods/enderio/Tank.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public SimpleObjectStream<TankMachineRecipe> streamRecipes() {
189189
List<TankMachineRecipe> list = new ArrayList<>();
190190
list.addAll((Collection<? extends TankMachineRecipe>) MachineRecipeRegistry.instance.getRecipesForMachine(MachineRecipeRegistry.TANK_FILLING).values());
191191
list.addAll((Collection<? extends TankMachineRecipe>) MachineRecipeRegistry.instance.getRecipesForMachine(MachineRecipeRegistry.TANK_EMPTYING).values());
192-
return new SimpleObjectStream<>(list).setRemover(this::remove);
192+
return new SimpleObjectStream<>(list, false).setRemover(this::remove);
193193
}
194194

195195
@MethodDescription(priority = 2000, example = @Example(commented = true))

src/main/java/com/cleanroommc/groovyscript/compat/mods/enderio/Vat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void onReload() {
7777

7878
@MethodDescription(type = MethodDescription.Type.QUERY)
7979
public SimpleObjectStream<VatRecipe> streamRecipes() {
80-
return new SimpleObjectStream<>(VatRecipeManager.getInstance().getRecipes().stream().map(r -> (VatRecipe) r).collect(Collectors.toList()))
80+
return new SimpleObjectStream<>(VatRecipeManager.getInstance().getRecipes().stream().map(r -> (VatRecipe) r).collect(Collectors.toList()), false)
8181
.setRemover(this::remove);
8282
}
8383

src/main/java/com/cleanroommc/groovyscript/compat/mods/extrautils2/Crusher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public SimpleObjectStream<IMachineRecipe> streamRecipes() {
6161
for (IMachineRecipe recipe : XUMachineCrusher.INSTANCE.recipes_registry) {
6262
list.add(recipe);
6363
}
64-
return new SimpleObjectStream<>(list).setRemover(this::remove);
64+
return new SimpleObjectStream<>(list, false).setRemover(this::remove);
6565
}
6666

6767
@MethodDescription(priority = 2000, example = @Example(commented = true))

src/main/java/com/cleanroommc/groovyscript/compat/mods/extrautils2/Enchanter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public SimpleObjectStream<IMachineRecipe> streamRecipes() {
6060
for (IMachineRecipe recipe : XUMachineEnchanter.INSTANCE.recipes_registry) {
6161
list.add(recipe);
6262
}
63-
return new SimpleObjectStream<>(list).setRemover(this::remove);
63+
return new SimpleObjectStream<>(list, false).setRemover(this::remove);
6464
}
6565

6666
@MethodDescription(priority = 2000, example = @Example(commented = true))

src/main/java/com/cleanroommc/groovyscript/compat/mods/extrautils2/Furnace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public SimpleObjectStream<IMachineRecipe> streamRecipes() {
6666
for (IMachineRecipe recipe : XUMachineFurnace.INSTANCE.recipes_registry) {
6767
list.add(recipe);
6868
}
69-
return new SimpleObjectStream<>(list).setRemover(this::remove);
69+
return new SimpleObjectStream<>(list, false).setRemover(this::remove);
7070
}
7171

7272
@MethodDescription(priority = 2000, example = @Example(commented = true))

src/main/java/com/cleanroommc/groovyscript/compat/mods/extrautils2/Generator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public SimpleObjectStream<Pair<Machine, IMachineRecipe>> streamRecipes() {
152152
list.add(Pair.of(generator, recipe));
153153
}
154154
}
155-
return new SimpleObjectStream<>(list).setRemover(x -> x.getKey().recipes_registry.removeRecipe(x.getValue()));
155+
return new SimpleObjectStream<>(list, false).setRemover(x -> x.getKey().recipes_registry.removeRecipe(x.getValue()));
156156
}
157157

158158
@MethodDescription(description = "groovyscript.wiki.extrautils2.generator.removeByGenerator")

src/main/java/com/cleanroommc/groovyscript/compat/mods/ic2/Centrifuge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void removeAll() {
102102
}
103103

104104
public SimpleObjectStream<MachineRecipe<IRecipeInput, Collection<ItemStack>>> streamRecipes() {
105-
return new SimpleObjectStream<>(asList()).setRemover(this::remove);
105+
return new SimpleObjectStream<>(asList(), false).setRemover(this::remove);
106106
}
107107

108108
private boolean remove(MachineRecipe<IRecipeInput, Collection<ItemStack>> recipe, boolean backup) {

src/main/java/com/cleanroommc/groovyscript/compat/mods/ic2/MetalFormer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public MachineRecipe<IRecipeInput, Collection<ItemStack>> add(int type, IIngredi
3939
}
4040

4141
public SimpleObjectStream<MachineRecipe<IRecipeInput, Collection<ItemStack>>> streamRecipes() {
42-
return new SimpleObjectStream<>(asList()).setRemover(this::remove);
42+
return new SimpleObjectStream<>(asList(), false).setRemover(this::remove);
4343
}
4444

4545
public SimpleObjectStream<MachineRecipe<IRecipeInput, Collection<ItemStack>>> streamRecipes(int type) {
46-
return new SimpleObjectStream<>(asList(type)).setRemover(r -> this.remove(type, r));
46+
return new SimpleObjectStream<>(asList(type), false).setRemover(r -> this.remove(type, r));
4747
}
4848

4949
public boolean remove(int type, MachineRecipe<IRecipeInput, Collection<ItemStack>> recipe) {

0 commit comments

Comments
 (0)