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

Jump to bottom

cleanup the kube recipe schema #1268

Merged
merged 5 commits into from
May 17, 2024
Merged

cleanup the kube recipe schema #1268

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07e3769
cleanup the kube recipe schema
YoungOnionMC May 17, 2024
6fb0b8b
Merge branch 'sc/intermediary-1.20.5-port' into yo-recipe-schema-clea…
YoungOnionMC May 17, 2024
f60c52f
Merge branch 'sc/intermediary-1.20.5-port' of https://github.com/Youn…
YoungOnionMC May 17, 2024
af552c4
spotles
YoungOnionMC May 17, 2024
4b99b68
Merge remote-tracking branch 'origin/yo-recipe-schema-cleanup2' into …
YoungOnionMC May 17, 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
161 changes: 10 additions & 151 deletions src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,154 +179,45 @@ public GTRecipeJS outputCWU(int cwu) {
return output(CWURecipeCapability.CAP, cwu);
}

public GTRecipeJS itemInputs(InputItem... inputs) {
return inputItems(inputs);
}

public GTRecipeJS itemInput(UnificationEntry input) {
return inputItems(input);
}

public GTRecipeJS itemInput(UnificationEntry input, int count) {
return inputItems(input, count);
}

public GTRecipeJS inputItems(InputItem... inputs) {
return input(ItemRecipeCapability.CAP, (Object[]) inputs);
}

public GTRecipeJS inputItems(ItemStack... inputs) {
for (ItemStack itemStack : inputs) {
if (itemStack.isEmpty()) {
GTCEu.LOGGER.error("gt recipe {} input items is empty", id);
throw new IllegalArgumentException(id + ": input items is empty");
}
}
// TODO remove `.ingredient()`
return input(ItemRecipeCapability.CAP, Arrays.stream(inputs).map(stack -> InputItem.of(new SizedIngredient(!stack.getComponents().isEmpty() ? DataComponentIngredient.of(true, stack) : Ingredient.of(stack), stack.getCount()).ingredient(), stack.getCount())).toArray());
}

public GTRecipeJS inputItems(TagKey<Item> tag, int amount) {
return inputItems(InputItem.of(SizedIngredient.of(tag, amount)));
}

public GTRecipeJS inputItems(Item input, int amount) {
return inputItems(new ItemStack(input, amount));
}

public GTRecipeJS inputItems(Item input) {
return inputItems(InputItem.of(Ingredient.of(input), 1));
}

public GTRecipeJS inputItems(Supplier<? extends Item> input) {
return inputItems(InputItem.of(Ingredient.of(input.get()), 1));
}

public GTRecipeJS inputItems(Supplier<? extends Item> input, int amount) {
return inputItems(new ItemStack(input.get(), amount));
}

public GTRecipeJS inputItems(TagPrefix orePrefix, Material material) {
return inputItems(orePrefix, material, 1);
}

public GTRecipeJS inputItems(UnificationEntry input) {
return inputItems(input.tagPrefix, input.material, 1);
}

public GTRecipeJS inputItems(UnificationEntry input, int count) {
return inputItems(input.tagPrefix, input.material, count);
}

public GTRecipeJS inputItems(TagPrefix orePrefix, Material material, int count) {
return inputItems(ChemicalHelper.getTag(orePrefix, material), count);
}

public GTRecipeJS inputItems(MachineDefinition machine) {
return inputItems(machine, 1);
}

public GTRecipeJS inputItems(MachineDefinition machine, int count) {
return inputItems(machine.asStack(count));
}

public GTRecipeJS itemOutputs(OutputItem... outputs) {
return outputItems(outputs);
}

public GTRecipeJS itemOutput(UnificationEntry unificationEntry) {
return outputItems(unificationEntry.tagPrefix, unificationEntry.material);
}

public GTRecipeJS itemOutput(UnificationEntry unificationEntry, int count) {
return outputItems(unificationEntry.tagPrefix, unificationEntry.material, count);
}

public GTRecipeJS outputItems(OutputItem... outputs) {
for (OutputItem itemStack : outputs) {
if (itemStack.isEmpty()) {
LDLib.LOGGER.error("gt recipe {} output items is empty", id);
throw new IllegalArgumentException(id + ": output items is empty");
}
}
return output(ItemRecipeCapability.CAP, (Object[]) outputs);
}

public GTRecipeJS outputItems(Item input, int amount) {
return outputItems(OutputItem.of(new ItemStack(input, amount)));
}

public GTRecipeJS outputItems(Item input) {
return outputItems(OutputItem.of(new ItemStack(input)));
}

public GTRecipeJS outputItems(TagPrefix orePrefix, Material material) {
return outputItems(orePrefix, material, 1);
public GTRecipeJS inputFluids(GTRecipeComponents.FluidIngredientJS... inputs) {
return input(FluidRecipeCapability.CAP, (Object[]) inputs);
}

public GTRecipeJS outputItems(TagPrefix orePrefix, Material material, int count) {
return outputItems(OutputItem.of(ChemicalHelper.get(orePrefix, material, count)));
public GTRecipeJS outputFluids(FluidStackJS... outputs) {
return output(FluidRecipeCapability.CAP, (Object[]) outputs);
}

public GTRecipeJS outputItems(MachineDefinition machine) {
return outputItems(machine, 1);
public GTRecipeJS inputStress(float stress) {
return input(StressRecipeCapability.CAP, stress);
}

public GTRecipeJS outputItems(MachineDefinition machine, int count) {
return outputItems(OutputItem.of(machine.asStack(count)));
public GTRecipeJS outputStress(float stress) {
return output(StressRecipeCapability.CAP, stress);
}

public GTRecipeJS notConsumable(InputItem itemStack) {
public GTRecipeJS notConsumableItem(InputItem itemStack) {
float lastChance = this.chance;
this.chance = 0;
inputItems(itemStack);
this.chance = lastChance;
return this;
}

public GTRecipeJS notConsumable(Supplier<? extends Item> item) {
float lastChance = this.chance;
this.chance = 0;
inputItems(item);
this.chance = lastChance;
return this;
}

public GTRecipeJS notConsumable(TagPrefix orePrefix, Material material) {
float lastChance = this.chance;
this.chance = 0;
inputItems(orePrefix, material);
this.chance = lastChance;
return this;
}

public GTRecipeJS notConsumableFluid(GTRecipeComponents.FluidIngredientJS fluid) {
chancedFluidInput(fluid, 0, 0);
return this;
}

public GTRecipeJS circuit(int configuration) {
return notConsumable(InputItem.of(IntCircuitIngredient.circuitInput(configuration).toVanilla(), 1));
return notConsumableItem(InputItem.of(IntCircuitIngredient.circuitInput(configuration).toVanilla(), 1));
}

public GTRecipeJS chancedInput(InputItem stack, int chance, int tierChanceBoost) {
Expand Down Expand Up @@ -373,29 +264,7 @@ public GTRecipeJS chancedFluidOutput(FluidStackJS stack, int chance, int tierCha
return this;
}

public GTRecipeJS chancedOutput(TagPrefix tag, Material mat, int chance, int tierChanceBoost) {
return chancedOutput(OutputItem.of(ChemicalHelper.get(tag, mat), chance), chance, tierChanceBoost);
}

public GTRecipeJS chancedOutput(TagPrefix tag, Material mat, int count, int chance, int tierChanceBoost) {
return chancedOutput(OutputItem.of(ChemicalHelper.get(tag, mat, count), chance), chance, tierChanceBoost);
}

public GTRecipeJS inputFluids(GTRecipeComponents.FluidIngredientJS... inputs) {
return input(FluidRecipeCapability.CAP, (Object[]) inputs);
}

public GTRecipeJS outputFluids(FluidStackJS... outputs) {
return output(FluidRecipeCapability.CAP, (Object[]) outputs);
}

public GTRecipeJS inputStress(float stress) {
return input(StressRecipeCapability.CAP, stress);
}

public GTRecipeJS outputStress(float stress) {
return output(StressRecipeCapability.CAP, stress);
}

//////////////////////////////////////
//********** DATA ***********//
Expand Down Expand Up @@ -592,16 +461,6 @@ public GTRecipeJS scannerResearch(UnaryOperator<ResearchRecipeBuilder.ScannerRec
return this;
}

/**
* Generates a research recipe for the Scanner. All values are defaults other than the research stack.
*
* @param researchStack the stack to use for research
* @return this
*/
public GTRecipeJS scannerResearch(@NotNull ItemStack researchStack) {
return scannerResearch(b -> b.researchStack(researchStack));
}

/**
* Generates a research recipe for the Research Station.
*/
Expand Down