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 stackoverflow & update GroovyScript #2657

Merged
merged 2 commits into from
Nov 10, 2024
Merged

Fix stackoverflow & update GroovyScript #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2c2b8
fix stackoverflow & upadte grs dep
brachy84 Nov 9, 2024
9de43fc
spotless :heart:
brachy84 Nov 9, 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
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
// Published dependencies
api("codechicken:codechickenlib:3.2.3.358")
api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false }
api("com.cleanroommc:groovyscript:1.1.1") { transitive = false }
api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false }
api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700")
api("appeng:ae2-uel:v0.56.4") { transitive = false }
api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/GregTechMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
dependencies = "required:forge@[14.23.5.2847,);" + "required-after:codechickenlib@[3.2.3,);" +
"required-after:modularui@[2.3,);" + "required-after:mixinbooter@[8.0,);" + "after:appliedenergistics2;" +
"after:forestry;" + "after:extrabees;" + "after:extratrees;" + "after:genetics;" + "after:magicbees;" +
"after:jei@[4.15.0,);" + "after:crafttweaker@[4.1.20,);" + "after:groovyscript@[1.1.0,);" +
"after:jei@[4.15.0,);" + "after:crafttweaker@[4.1.20,);" + "after:groovyscript@[1.2.0,);" +
"after:theoneprobe;" + "after:hwyla;")
public class GregTechMod {

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/gregtech/integration/groovy/GrSRecipeHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import net.minecraft.item.ItemStack;

import com.cleanroommc.groovyscript.helper.ingredient.IngredientHelper;
import com.cleanroommc.groovyscript.helper.ingredient.GroovyScriptCodeConverter;
import com.cleanroommc.groovyscript.helper.ingredient.NbtHelper;

public class GrSRecipeHelper {
Expand All @@ -20,7 +20,7 @@ public static String getRecipeRemoveLine(RecipeMap<?> recipeMap, Recipe recipe)
.append(recipe.getEUt())
.append(", ");

if (recipe.getInputs().size() > 0) {
if (!recipe.getInputs().isEmpty()) {
builder.append("[");
for (GTRecipeInput ci : recipe.getInputs()) {
String ingredient = getGroovyItemString(ci);
Expand All @@ -32,10 +32,10 @@ public static String getRecipeRemoveLine(RecipeMap<?> recipeMap, Recipe recipe)
builder.append("null, ");
}

if (recipe.getFluidInputs().size() > 0) {
if (!recipe.getFluidInputs().isEmpty()) {
builder.append("[");
for (GTRecipeInput fluidIngredient : recipe.getFluidInputs()) {
builder.append(IngredientHelper.asGroovyCode(fluidIngredient.getInputFluidStack(), false));
builder.append(GroovyScriptCodeConverter.asGroovyCode(fluidIngredient.getInputFluidStack(), false));

if (fluidIngredient.getAmount() > 1) {
builder.append(" * ")
Expand Down Expand Up @@ -72,7 +72,7 @@ public static String getGroovyItemString(GTRecipeInput recipeInput) {
}
if (itemStack != null) {
if (itemId == null) {
builder.append(IngredientHelper.asGroovyCode(itemStack, false));
builder.append(GroovyScriptCodeConverter.asGroovyCode(itemStack, false));
}

if (itemStack.getTagCompound() != null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/integration/groovy/GroovyExpansions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static Material.Builder materialBuilder(MaterialEvent event, int id, Reso
}

public static Material.Builder materialBuilder(MaterialEvent event, int id, String domain, String path) {
return materialBuilder(event, id, domain, path);
return materialBuilder(event, id, new ResourceLocation(domain, path));
}

public static Material.Builder materialBuilder(MaterialEvent event, int id, String s) {
Expand Down