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

fix deprecation warnings in tests #2744

Merged
merged 1 commit into from
Mar 1, 2025
Merged

fix deprecation warnings in tests #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import gregtech.api.metatileentity.SimpleMachineMetaTileEntity;
import gregtech.api.recipes.Recipe;
import gregtech.api.recipes.RecipeMap;
import gregtech.api.recipes.RecipeMapBuilder;
import gregtech.api.recipes.builders.SimpleRecipeBuilder;
import gregtech.api.util.GTUtility;
import gregtech.api.util.world.DummyWorld;
Expand Down Expand Up @@ -116,13 +117,13 @@ private static AbstractRecipeLogic createTestLogic(int testRecipeEUt, int testRe
World world = DummyWorld.INSTANCE;

// Create an empty recipe map to work with
RecipeMap<SimpleRecipeBuilder> map = new RecipeMap<>("test_reactor_" + TEST_ID,
2,
2,
3,
2,
new SimpleRecipeBuilder().EUt(30),
false);
RecipeMap<SimpleRecipeBuilder> map = new RecipeMapBuilder<>("test_reactor_" + TEST_ID,
new SimpleRecipeBuilder().EUt(30))
.itemInputs(2)
.itemOutputs(2)
.fluidInputs(3)
.fluidOutputs(2)
.build();

MetaTileEntity at = MetaTileEntities.registerMetaTileEntity(TEST_ID,
new SimpleMachineMetaTileEntity(
Expand Down
20 changes: 0 additions & 20 deletions src/test/java/gregtech/api/capability/impl/MultiblockRecipeLogicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
import gregtech.api.recipes.Recipe;
import gregtech.api.recipes.RecipeMap;
import gregtech.api.recipes.RecipeMaps;
import gregtech.api.recipes.builders.BlastRecipeBuilder;
import gregtech.api.util.world.DummyWorld;
import gregtech.common.metatileentities.MetaTileEntities;
import gregtech.common.metatileentities.multi.electric.MetaTileEntityElectricBlastFurnace;
Expand Down Expand Up @@ -50,15 +48,6 @@ public static void bootstrap() {
public void trySearchNewRecipe() {
World world = DummyWorld.INSTANCE;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("test_recipemap",
3,
3,
1,
1,
new BlastRecipeBuilder().EUt(32),
false);

RecipeMaps.BLAST_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.COBBLESTONE))
.outputs(new ItemStack(Blocks.STONE))
Expand Down Expand Up @@ -285,15 +274,6 @@ protected IMultipleTankHandler getOutputTank() {
public void trySearchNewRecipeDistinct() {
World world = DummyWorld.INSTANCE;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("test_recipemap_2",
3,
3,
1,
1,
new BlastRecipeBuilder().EUt(32),
false);

RecipeMaps.BLAST_RECIPES.recipeBuilder()
.inputs(new ItemStack(Blocks.COBBLESTONE))
.outputs(new ItemStack(Blocks.STONE))
Expand Down
18 changes: 10 additions & 8 deletions src/test/java/gregtech/api/recipes/RecipeMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ public static void bootstrap() {

@BeforeEach
public void setupRecipes() {
map = new RecipeMap<>("test_reactor_" + mapId++,
2,
2,
3,
2,
new SimpleRecipeBuilder().EUt(30),
false);
map = new RecipeMapBuilder<>("test_reactor_" + mapId++, new SimpleRecipeBuilder().EUt(30))
.itemInputs(2)
.itemOutputs(2)
.fluidInputs(3)
.fluidOutputs(2)
.build();

map.recipeBuilder()
.notConsumable(new ItemStack(Blocks.COBBLESTONE))
Expand Down Expand Up @@ -257,7 +256,10 @@ public void MapHashCollision() {
@Test
public void wildcardInput() {
// test that all variants of a wildcard input can be used to find a recipe
RecipeMap<?> recipeMap = new RecipeMap<>("test", 1, 4, 0, 0, new SimpleRecipeBuilder(), false);
RecipeMap<?> recipeMap = new RecipeMapBuilder<>("test", new SimpleRecipeBuilder())
.itemInputs(1)
.itemOutputs(4)
.build();
recipeMap.recipeBuilder()
.inputs(new ItemStack(Blocks.STAINED_HARDENED_CLAY, 1, GTValues.W))
.outputs(new ItemStack(Blocks.COBBLESTONE, 1))
Expand Down
130 changes: 60 additions & 70 deletions src/test/java/gregtech/api/recipes/logic/IParallelableRecipeLogicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,12 @@ public void findMultipliedRecipe_AtMaxParallelsTest() {
int parallelLimit = 4;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -261,13 +260,12 @@ public void findMultipliedRecipe_LessThanMaxParallelsTest() {
int parallelLimit = 4;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -313,13 +311,12 @@ public void findMultipliedRecipe_FluidOnlyMaxParallelTest() {
int parallelLimit = 4;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -366,13 +363,12 @@ public void findMultipliedRecipe_FluidOnlyLessThanMaxParallelTest() {
int parallelLimit = 4;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
2,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -419,13 +415,12 @@ public void findAppendedParallelItemRecipe_AtMaxParallelsTest() {
int parallelLimit = 4;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("test_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("test_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
map.recipeBuilder()
Expand Down Expand Up @@ -466,13 +461,12 @@ public void findAppendedParallelItemRecipe_LessThanMaxParallelsTest() {
int parallelLimit = 4;

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("test_blast_furnace_2",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("test_blast_furnace_2", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
map.recipeBuilder()
Expand Down Expand Up @@ -543,13 +537,12 @@ public MetaTileEntity getMetaTileEntity() {
};

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -618,13 +611,12 @@ public MetaTileEntity getMetaTileEntity() {
};

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -683,13 +675,12 @@ public MetaTileEntity getMetaTileEntity() {
};

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down Expand Up @@ -788,13 +779,12 @@ public MetaTileEntity getMetaTileEntity() {
};

// Create a recipe Map to be used for testing
RecipeMap<BlastRecipeBuilder> map = new RecipeMap<>("electric_blast_furnace",
3,
2,
1,
1,
new BlastRecipeBuilder(),
false);
RecipeMap<BlastRecipeBuilder> map = new RecipeMapBuilder<>("electric_blast_furnace", new BlastRecipeBuilder())
.itemInputs(3)
.itemOutputs(2)
.fluidInputs(1)
.fluidOutputs(1)
.build();

// Create a simple recipe to be used for testing
Recipe recipe = map.recipeBuilder()
Expand Down
Loading
Loading