Skip to content

Add a varargs variant for yeeting items in JEI #70

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
merged 4 commits into from
Aug 1, 2023
Merged

Add a varargs variant for yeeting items in JEI #70

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94038c6
Add varargs yeet
Testure Jun 28, 2023
423cbaf
remove list
Testure Jul 26, 2023
8795ba4
collection version
Testure Jul 26, 2023
097d75e
varargs for hide
Testure Jul 26, 2023
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
69 changes: 69 additions & 0 deletions src/main/java/com/cleanroommc/groovyscript/compat/mods/jei/JustEnoughItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import com.cleanroommc.groovyscript.compat.mods.ModPropertyContainer;
import com.cleanroommc.groovyscript.compat.vanilla.VanillaModule;
import com.cleanroommc.groovyscript.helper.ingredient.IngredientHelper;
import com.cleanroommc.groovyscript.registry.ReloadableRegistryManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.fml.common.registry.ForgeRegistries;

public class JustEnoughItems extends ModPropertyContainer {

Expand All @@ -23,6 +26,18 @@ public void hide(IIngredient ingredient) {
}
}

public void hide(IIngredient... ingredients) {
for (IIngredient ingredient : ingredients) {
hide(ingredient);
}
}

public void hide(Iterable<IIngredient> ingredients) {
for (IIngredient ingredient : ingredients) {
hide(ingredient);
}
}

public void removeAndHide(IIngredient ingredient) {
if (IngredientHelper.isEmpty(ingredient)) {
GroovyLog.msg("Error remove and hide items {}", ingredient)
Expand All @@ -35,10 +50,64 @@ public void removeAndHide(IIngredient ingredient) {
JeiPlugin.hideItem(ingredient.getMatchingStacks());
}

public void removeAndHide(IIngredient... ingredients) {
for (IIngredient ingredient : ingredients) {
if (IngredientHelper.isEmpty(ingredient)) {
GroovyLog.msg("Error remove and hide items {}", ingredient)
.add("Items must not be empty")
.error()
.post();
return;
}
JeiPlugin.hideItem(ingredient.getMatchingStacks());
}
for (IRecipe recipe : ForgeRegistries.RECIPES) {
if (recipe.getRegistryName() != null) {
for (IIngredient ingredient : ingredients) {
if (ingredient.test(recipe.getRecipeOutput())) {
ReloadableRegistryManager.removeRegistryEntry(ForgeRegistries.RECIPES, recipe.getRegistryName());
break;
}
}
}
}
}

public void removeAndHide(Iterable<IIngredient> ingredients) {
for (IIngredient ingredient : ingredients) {
if (IngredientHelper.isEmpty(ingredient)) {
GroovyLog.msg("Error remove and hide items {}", ingredient)
.add("Items must not be empty")
.error()
.post();
return;
}
JeiPlugin.hideItem(ingredient.getMatchingStacks());
}
for (IRecipe recipe : ForgeRegistries.RECIPES) {
if (recipe.getRegistryName() != null) {
for (IIngredient ingredient : ingredients) {
if (ingredient.test(recipe.getRecipeOutput())) {
ReloadableRegistryManager.removeRegistryEntry(ForgeRegistries.RECIPES, recipe.getRegistryName());
break;
}
}
}
}
}

public void yeet(IIngredient ingredient) {
removeAndHide(ingredient);
}

public void yeet(IIngredient... ingredients) {
removeAndHide(ingredients);
}

public void yeet(Iterable<IIngredient> ingredients) {
removeAndHide(ingredients);
}

public void hideCategory(String category) {
if (category == null || category.isEmpty()) {
GroovyLog.msg("Error hiding category")
Expand Down