Skip to content

Commit 1093f7c

Browse files
committed
drop groovyscript compat
1 parent 9883ff9 commit 1093f7c

File tree

2 files changed

+1
-84
lines changed

2 files changed

+1
-84
lines changed

src/main/java/gregtech/api/recipes/RecipeMap.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import gregtech.api.util.*;
2929
import gregtech.common.ConfigHolder;
3030
import gregtech.integration.GroovyScriptCompat;
31-
import gregtech.integration.VirtualizedRecipeMap;
3231
import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
3332
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
3433
import net.minecraft.item.ItemStack;
@@ -85,8 +84,7 @@ public class RecipeMap<R extends RecipeBuilder<R>> {
8584
protected TextureArea progressBarTexture;
8685
protected MoveType moveType;
8786
public final boolean isHidden;
88-
89-
private final VirtualizedRecipeMap virtualizedRecipeMap;
87+
9088
private final Branch lookup = new Branch();
9189
private boolean hasOreDictedInputs = false;
9290
private boolean hasNBTMatcherInputs = false;
@@ -118,12 +116,6 @@ public RecipeMap(String unlocalizedName, int minInputs, int maxInputs, int minOu
118116
defaultRecipe.setRecipeMap(this);
119117
this.recipeBuilderSample = defaultRecipe;
120118
RECIPE_MAP_REGISTRY.put(unlocalizedName, this);
121-
122-
if (Loader.isModLoaded(GTValues.MODID_GROOVYSCRIPT)) {
123-
this.virtualizedRecipeMap = GroovyScriptCompat.isLoaded() ? new VirtualizedRecipeMap(this) : null;
124-
} else {
125-
this.virtualizedRecipeMap = null;
126-
}
127119
}
128120

129121
@ZenMethod
@@ -207,10 +199,6 @@ public void addRecipe(ValidationResult<Recipe> validationResult) {
207199
return;
208200
}
209201
Recipe recipe = validationResult.getResult();
210-
211-
if (recipe.isGroovyRecipe()) {
212-
this.virtualizedRecipeMap.addScripted(recipe);
213-
}
214202
compileRecipe(recipe);
215203

216204
}
@@ -226,9 +214,6 @@ public void compileRecipe(Recipe recipe) {
226214
public boolean removeRecipe(Recipe recipe) {
227215
List<List<AbstractMapIngredient>> items = fromRecipe(recipe);
228216
if (recurseIngredientTreeRemove(recipe, items, lookup, 0) != null) {
229-
if (GroovyScriptCompat.isCurrentlyRunning()) {
230-
this.virtualizedRecipeMap.addBackup(recipe);
231-
}
232217
return true;
233218
}
234219
return false;

src/main/java/gregtech/integration/VirtualizedRecipeMap.java

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)