Skip to content
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

Improved RecipeMap Backing Storage #3007

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Improved RecipeMap Backing Storage #3007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d2c5f92
datastructure port
TechLord22 Aug 25, 2024
d78b2fc
Merge remote-tracking branch 'origin/master' into tc/recipe-trie
Caedis Aug 31, 2024
1aa8efe
Add detailed fluidstack tostring to recipe tostring
Caedis Aug 31, 2024
2d1fa44
fix imports
Caedis Aug 31, 2024
314f3b0
refactor recipe logging + add configs
Caedis Aug 31, 2024
83a9c50
insertion tests and subrecipe bug fix
TechLord22 Aug 31, 2024
74a4bdf
spotless
Caedis Sep 1, 2024
61c96e4
update logging
Caedis Sep 1, 2024
84d269b
Merge remote-tracking branch 'origin/master' into tc/recipe-trie
Caedis Sep 1, 2024
d5b8a12
separate oredict and nbt ingredients out
TechLord22 Sep 1, 2024
533a397
Merge branch 'master' into tc/recipe-trie
Dream-Master Sep 2, 2024
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
358 changes: 358 additions & 0 deletions src/functionalTest/java/gregtech/test/api/recipe/store/RecipeTrieTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,358 @@
package gregtech.test.api.recipe.store;

import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import com.google.common.collect.ImmutableSet;

import gregtech.api.recipe.store.RecipeTrie;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_RecipeBuilder;

public class RecipeTrieTest {

@Test
public void testAdd() {
RecipeTrie trie = new RecipeTrie();

boolean result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertTrue(result);
Assertions.assertEquals(1, trie.size());

// adding the same recipe twice should fail

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertFalse(result);
Assertions.assertEquals(1, trie.size());

// add another valid recipe

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertTrue(result);
Assertions.assertEquals(2, trie.size());

// adding a conflicting recipe should fail

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertFalse(result);
Assertions.assertEquals(2, trie.size());

// add another valid recipe

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertTrue(result);
Assertions.assertEquals(3, trie.size());

// adding the same recipe with a different input ordering should fail

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.gold_ingot), new ItemStack(Items.iron_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertFalse(result);
Assertions.assertEquals(3, trie.size());

// adding a new unique recipe should succeed

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.flint))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertTrue(result);
Assertions.assertEquals(4, trie.size());

// empty recipe inputs should fail

result = trie.add(
GT_RecipeBuilder.builder()
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertFalse(result);
Assertions.assertEquals(4, trie.size());

// empty outputs do not matter to the trie and should succeed

result = trie.add(
GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.melon_seeds))
.duration(1)
.eut(1)
.build()
.get());
Assertions.assertTrue(result);
Assertions.assertEquals(5, trie.size());
}

@Test
public void testFind() {
RecipeTrie trie = new RecipeTrie();
GT_Recipe recipe = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe);
GT_Recipe recipe2 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.LAVA, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe2);
GT_Recipe recipe3 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.diamond))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe3);
GT_Recipe recipe4 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.gold_ingot), new ItemStack(Items.diamond))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe4);
GT_Recipe recipe5 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.flint))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe5);
GT_Recipe recipe6 = GT_RecipeBuilder.builder()
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1), new FluidStack(FluidRegistry.LAVA, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe6);

GT_Recipe result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertEquals(recipe, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot) },
new FluidStack[] { new FluidStack(FluidRegistry.LAVA, 1) },
i -> true);
Assertions.assertEquals(recipe2, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.diamond) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertEquals(recipe3, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertEquals(recipe4, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.flint), },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertEquals(recipe5, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.flint), new ItemStack(Items.gold_ingot) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertEquals(recipe5, result);

result = trie.findMatching(
new ItemStack[] {},
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1), new FluidStack(FluidRegistry.LAVA, 1) },
i -> true);
Assertions.assertEquals(recipe6, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.gold_ingot) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1), new FluidStack(FluidRegistry.LAVA, 1) },
i -> true);
Assertions.assertEquals(recipe6, result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.iron_ingot), },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertNull(result);

result = trie
.findMatching(new ItemStack[] { new ItemStack(Items.iron_ingot), }, new FluidStack[] {}, i -> true);
Assertions.assertNull(result);

result = trie.findMatching(
new ItemStack[] { new ItemStack(Items.gold_ingot) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) },
i -> true);
Assertions.assertNull(result);

result = trie.findMatching(new ItemStack[] { new ItemStack(Items.gold_ingot) }, new FluidStack[] {}, i -> true);
Assertions.assertNull(result);

result = trie
.findMatching(new ItemStack[] {}, new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1) }, i -> true);
Assertions.assertNull(result);
}

@Test
public void testFindAll() {
RecipeTrie trie = new RecipeTrie();
GT_Recipe recipe = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe);
GT_Recipe recipe2 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot))
.fluidInputs(new FluidStack(FluidRegistry.LAVA, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe2);
GT_Recipe recipe3 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.iron_ingot), new ItemStack(Items.diamond))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe3);
GT_Recipe recipe4 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.gold_ingot), new ItemStack(Items.diamond))
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe4);
GT_Recipe recipe5 = GT_RecipeBuilder.builder()
.itemInputs(new ItemStack(Items.flint))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe5);
GT_Recipe recipe6 = GT_RecipeBuilder.builder()
.fluidInputs(new FluidStack(FluidRegistry.WATER, 1), new FluidStack(FluidRegistry.LAVA, 1))
.itemOutputs(new ItemStack(Items.diamond))
.duration(1)
.eut(1)
.build()
.get();
trie.add(recipe6);
var all = ImmutableSet.of(recipe, recipe2, recipe3, recipe4, recipe5, recipe6);
var subset4 = ImmutableSet.of(recipe, recipe2, recipe5, recipe6);

var results = trie.findAll(
new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot),
new ItemStack(Items.diamond), new ItemStack(Items.flint) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1), new FluidStack(FluidRegistry.LAVA, 1) });
Assertions.assertEquals(6, results.size());
Assertions.assertTrue(results.containsAll(all));
Assertions.assertTrue(all.containsAll(results));

results = trie.findAll(
new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot),
new ItemStack(Items.flint) },
new FluidStack[] { new FluidStack(FluidRegistry.WATER, 1), new FluidStack(FluidRegistry.LAVA, 1) });
Assertions.assertEquals(4, results.size());
Assertions.assertTrue(results.containsAll(subset4));
Assertions.assertTrue(subset4.containsAll(results));

results = trie.findAll(
new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.gold_ingot),
new ItemStack(Items.diamond), new ItemStack(Items.flint) },
new FluidStack[] {});
Assertions.assertEquals(1, results.size());
Assertions.assertEquals(recipe5, results.toArray()[0]);
Assertions.assertTrue(all.containsAll(results));
}

@Test
public void testRemove() {

}
}
13 changes: 13 additions & 0 deletions src/main/java/gregtech/api/recipe/RecipeMapBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import gregtech.api.GregTech_API;
import gregtech.api.interfaces.IRecipeMap;
import gregtech.api.objects.GT_ItemStack;
import gregtech.api.recipe.store.RecipeTrie;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_RecipeBuilder;
Expand Down Expand Up @@ -73,6 +74,8 @@ public class RecipeMapBackend {
*/
protected final RecipeMapBackendProperties properties;

private final RecipeTrie trie = new RecipeTrie();

public RecipeMapBackend(RecipeMapBackendPropertiesBuilder propertiesBuilder) {
this.properties = propertiesBuilder.build();
GregTech_API.itemStackMultiMaps.add(itemIndex);
Expand Down Expand Up @@ -122,6 +125,10 @@ public Map<RecipeCategory, Collection<GT_Recipe>> getRecipeCategoryMap() {
return Collections.unmodifiableMap(recipesByCategory);
}

public RecipeTrie trie() {
return trie;
}

// region add recipe

/**
Expand Down Expand Up @@ -196,6 +203,12 @@ protected Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) {
downstream.doAdd(builder);
}
}
for (GT_Recipe recipe : ret) {
if (!trie.add(recipe)) {
// TODO uncomment when collisions are reduced
// handleCollision(recipe);
}
}
return ret;
}

Expand Down
Loading
Loading