diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gregtech/api/recipe | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gregtech/api/recipe')
43 files changed, 610 insertions, 614 deletions
diff --git a/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java b/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java index 7be2c94b23..adb2ee40e8 100644 --- a/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java +++ b/src/main/java/gregtech/api/recipe/BasicUIPropertiesBuilder.java @@ -20,7 +20,7 @@ import com.gtnewhorizons.modularui.api.math.Size; import com.gtnewhorizons.modularui.common.widget.ProgressBar; import gregtech.api.gui.modularui.FallbackableSteamTexture; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.gui.modularui.SteamTexture; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.common.gui.modularui.UIHelper; @@ -59,7 +59,7 @@ public final class BasicUIPropertiesBuilder { private final ImmutableList.Builder<Pair<SteamTexture, Pair<Size, Pos2d>>> specialTexturesSteam = ImmutableList .builder(); - private IDrawable logo = GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT; + private IDrawable logo = GTUITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT; private Size logoSize = new Size(17, 17); private Pos2d logoPos = new Pos2d(152, 63); diff --git a/src/main/java/gregtech/api/recipe/FindRecipeQuery.java b/src/main/java/gregtech/api/recipe/FindRecipeQuery.java index 77c0648688..16702b6be6 100644 --- a/src/main/java/gregtech/api/recipe/FindRecipeQuery.java +++ b/src/main/java/gregtech/api/recipe/FindRecipeQuery.java @@ -9,7 +9,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; // spotless:off spotless likes formatting @code to @code @@ -20,7 +20,7 @@ import gregtech.api.util.MethodsReturnNonnullByDefault; * * <pre> * {@code - * GT_Recipe recipe = recipeMap.findRecipeQuery() + * GTRecipe recipe = recipeMap.findRecipeQuery() * .items(inputItems) * .fluids(inputFluids) * .find(); @@ -33,7 +33,7 @@ import gregtech.api.util.MethodsReturnNonnullByDefault; @MethodsReturnNonnullByDefault public final class FindRecipeQuery { - private static final Predicate<GT_Recipe> ALWAYS = r -> true; + private static final Predicate<GTRecipe> ALWAYS = r -> true; private final RecipeMap<?> recipeMap; @@ -43,10 +43,10 @@ public final class FindRecipeQuery { private FluidStack[] fluids; @Nullable private ItemStack specialSlot; - private Predicate<GT_Recipe> filter = ALWAYS; + private Predicate<GTRecipe> filter = ALWAYS; private long voltage = Integer.MAX_VALUE; @Nullable - private GT_Recipe cachedRecipe; + private GTRecipe cachedRecipe; private boolean notUnificated; private boolean dontCheckStackSizes; private boolean forCollisionCheck; @@ -61,7 +61,7 @@ public final class FindRecipeQuery { * @return The first matched recipe, or null if not found. */ @Nullable - public GT_Recipe find() { + public GTRecipe find() { return findAll().findFirst() .orElse(null); } @@ -69,7 +69,7 @@ public final class FindRecipeQuery { /** * @return All the matched recipes in the form of Stream. */ - public Stream<GT_Recipe> findAll() { + public Stream<GTRecipe> findAll() { if (items == null) { items = new ItemStack[0]; } @@ -135,7 +135,7 @@ public final class FindRecipeQuery { * @param filter Matched recipe will be tested by this function. If it returns false, the query will attempt to * find next recipe. */ - public FindRecipeQuery filter(Predicate<GT_Recipe> filter) { + public FindRecipeQuery filter(Predicate<GTRecipe> filter) { this.filter = filter; return this; } @@ -152,7 +152,7 @@ public final class FindRecipeQuery { /** * @param cachedRecipe If this is not null, the query tests it before all other recipes. */ - public FindRecipeQuery cachedRecipe(@Nullable GT_Recipe cachedRecipe) { + public FindRecipeQuery cachedRecipe(@Nullable GTRecipe cachedRecipe) { this.cachedRecipe = cachedRecipe; return this; } diff --git a/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java b/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java index 2ba49f5da1..1b62ca0390 100644 --- a/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java +++ b/src/main/java/gregtech/api/recipe/NEIRecipeProperties.java @@ -12,7 +12,7 @@ import com.gtnewhorizons.modularui.api.math.Size; import codechicken.nei.recipe.HandlerInfo; import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.util.FieldsAreNonnullByDefault; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.formatter.INEISpecialInfoFormatter; @@ -49,7 +49,7 @@ public final class NEIRecipeProperties { public final Pos2d recipeBackgroundOffset; /** - * Formats special description for the recipe, mainly {@link gregtech.api.util.GT_Recipe#mSpecialValue}. + * Formats special description for the recipe, mainly {@link GTRecipe#mSpecialValue}. */ public final INEISpecialInfoFormatter neiSpecialInfoFormatter; @@ -68,14 +68,14 @@ public final class NEIRecipeProperties { public final boolean renderRealStackSizes; /** - * Comparator for NEI recipe sort. {@link GT_Recipe#compareTo(GT_Recipe)} by default. + * Comparator for NEI recipe sort. {@link GTRecipe#compareTo(GTRecipe)} by default. */ - public final Comparator<GT_Recipe> comparator; + public final Comparator<GTRecipe> comparator; NEIRecipeProperties(boolean registerNEI, @Nullable UnaryOperator<HandlerInfo.Builder> handlerInfoCreator, Size recipeBackgroundSize, Pos2d recipeBackgroundOffset, INEISpecialInfoFormatter neiSpecialInfoFormatter, boolean unificateOutput, boolean useCustomFilter, boolean renderRealStackSizes, - Comparator<GT_Recipe> comparator) { + Comparator<GTRecipe> comparator) { this.registerNEI = registerNEI; this.handlerInfoCreator = handlerInfoCreator; this.recipeBackgroundOffset = recipeBackgroundOffset; diff --git a/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java b/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java index 050a1c4920..3b47e9ce13 100644 --- a/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java +++ b/src/main/java/gregtech/api/recipe/NEIRecipePropertiesBuilder.java @@ -10,7 +10,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.api.math.Size; import codechicken.nei.recipe.HandlerInfo; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.formatter.DefaultSpecialValueFormatter; import gregtech.nei.formatter.INEISpecialInfoFormatter; @@ -36,7 +36,7 @@ public final class NEIRecipePropertiesBuilder { private boolean useCustomFilter; private boolean renderRealStackSizes = true; - private Comparator<GT_Recipe> comparator = GT_Recipe::compareTo; + private Comparator<GTRecipe> comparator = GTRecipe::compareTo; NEIRecipePropertiesBuilder() {} @@ -93,7 +93,7 @@ public final class NEIRecipePropertiesBuilder { return this; } - public NEIRecipePropertiesBuilder recipeComparator(Comparator<GT_Recipe> comparator) { + public NEIRecipePropertiesBuilder recipeComparator(Comparator<GTRecipe> comparator) { this.comparator = comparator; return this; } diff --git a/src/main/java/gregtech/api/recipe/RecipeMap.java b/src/main/java/gregtech/api/recipe/RecipeMap.java index 46b32d18dd..669c7de2cf 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMap.java +++ b/src/main/java/gregtech/api/recipe/RecipeMap.java @@ -1,6 +1,6 @@ package gregtech.api.recipe; -import static gregtech.api.util.GT_RecipeBuilder.ENABLE_COLLISION_CHECK; +import static gregtech.api.util.GTRecipeBuilder.ENABLE_COLLISION_CHECK; import java.util.Collection; import java.util.HashMap; @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Unmodifiable; import gregtech.api.interfaces.IRecipeMap; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.util.FieldsAreNonnullByDefault; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_RecipeBuilder; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTRecipeBuilder; import gregtech.api.util.MethodsReturnNonnullByDefault; /** @@ -82,7 +82,7 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap { * @return All the recipes belonging to this recipemap. */ @Unmodifiable - public Collection<GT_Recipe> getAllRecipes() { + public Collection<GTRecipe> getAllRecipes() { return backend.getAllRecipes(); } @@ -116,13 +116,13 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap { // region add recipe @Deprecated @Nullable - public GT_Recipe addRecipe(GT_Recipe aRecipe) { + public GTRecipe addRecipe(GTRecipe aRecipe) { return addRecipe(aRecipe, true, false, false); } @Deprecated @Nullable - public GT_Recipe addRecipe(GT_Recipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) { + public GTRecipe addRecipe(GTRecipe aRecipe, boolean aCheckForCollisions, boolean aFakeRecipe, boolean aHidden) { aRecipe.mHidden = aHidden; aRecipe.mFakeRecipe = aFakeRecipe; if (aRecipe.mFluidInputs.length < backend.properties.minFluidInputs @@ -137,13 +137,13 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap { */ @Deprecated @Nullable - public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, @Nullable ItemStack[] aInputs, + public GTRecipe addFakeRecipe(boolean aCheckForCollisions, @Nullable ItemStack[] aInputs, @Nullable ItemStack[] aOutputs, @Nullable Object aSpecial, @Nullable FluidStack[] aFluidInputs, @Nullable FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue, ItemStack[][] aAlt, boolean hidden) { return addFakeRecipe( aCheckForCollisions, - new GT_Recipe.GT_Recipe_WithAlt( + new GTRecipe.GTRecipe_WithAlt( false, aInputs, aOutputs, @@ -164,23 +164,23 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap { */ @Deprecated @Nullable - public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, GT_Recipe aRecipe) { + public GTRecipe addFakeRecipe(boolean aCheckForCollisions, GTRecipe aRecipe) { return addRecipe(aRecipe, aCheckForCollisions, true, false); } @Deprecated @Nullable - public GT_Recipe addFakeRecipe(boolean aCheckForCollisions, GT_Recipe aRecipe, boolean hidden) { + public GTRecipe addFakeRecipe(boolean aCheckForCollisions, GTRecipe aRecipe, boolean hidden) { return addRecipe(aRecipe, aCheckForCollisions, true, hidden); } @Nonnull @Override - public Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) { + public Collection<GTRecipe> doAdd(GTRecipeBuilder builder) { return backend.doAdd(builder); } - public GT_Recipe add(GT_Recipe aRecipe) { + public GTRecipe add(GTRecipe aRecipe) { return backend.compileRecipe(aRecipe); } @@ -217,26 +217,26 @@ public final class RecipeMap<B extends RecipeMapBackend> implements IRecipeMap { } @Nullable - public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage, + public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack... aInputs) { return findRecipe(aTileEntity, null, aNotUnificated, aVoltage, aFluids, null, aInputs); } @Nullable - public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, + public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, boolean aDontCheckStackSizes, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack... aInputs) { return findRecipe(aTileEntity, null, aNotUnificated, aDontCheckStackSizes, aVoltage, aFluids, null, aInputs); } @Nullable - public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GT_Recipe aRecipe, + public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GTRecipe aRecipe, boolean aNotUnificated, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack aSpecialSlot, @Nullable ItemStack... aInputs) { return findRecipe(aTileEntity, aRecipe, aNotUnificated, false, aVoltage, aFluids, aSpecialSlot, aInputs); } @Nullable - public GT_Recipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GT_Recipe aRecipe, + public GTRecipe findRecipe(@Nullable IHasWorldObjectAndCoords aTileEntity, @Nullable GTRecipe aRecipe, boolean aNotUnificated, boolean aDontCheckStackSizes, long aVoltage, @Nullable FluidStack[] aFluids, @Nullable ItemStack aSpecialSlot, @Nullable ItemStack... aInputs) { return findRecipeQuery().items(aInputs != null ? aInputs : new ItemStack[0]) diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBackend.java b/src/main/java/gregtech/api/recipe/RecipeMapBackend.java index 8ba0895a7f..f78e367adf 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMapBackend.java +++ b/src/main/java/gregtech/api/recipe/RecipeMapBackend.java @@ -1,9 +1,9 @@ package gregtech.api.recipe; -import static gregtech.api.util.GT_RecipeBuilder.ENABLE_COLLISION_CHECK; -import static gregtech.api.util.GT_RecipeBuilder.handleInvalidRecipe; -import static gregtech.api.util.GT_RecipeBuilder.handleRecipeCollision; -import static gregtech.api.util.GT_Utility.areStacksEqualOrNull; +import static gregtech.api.util.GTRecipeBuilder.ENABLE_COLLISION_CHECK; +import static gregtech.api.util.GTRecipeBuilder.handleInvalidRecipe; +import static gregtech.api.util.GTRecipeBuilder.handleRecipeCollision; +import static gregtech.api.util.GTUtility.areStacksEqualOrNull; import java.util.ArrayList; import java.util.Collection; @@ -28,13 +28,13 @@ import org.jetbrains.annotations.Unmodifiable; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IRecipeMap; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_StreamUtil; +import gregtech.api.objects.GTItemStack; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTStreamUtil; import gregtech.api.util.MethodsReturnNonnullByDefault; /** @@ -52,16 +52,16 @@ public class RecipeMapBackend { /** * Recipe index based on items. */ - private final SetMultimap<GT_ItemStack, GT_Recipe> itemIndex = HashMultimap.create(); + private final SetMultimap<GTItemStack, GTRecipe> itemIndex = HashMultimap.create(); /** * Recipe index based on fluids. */ - private final SetMultimap<String, GT_Recipe> fluidIndex = HashMultimap.create(); + private final SetMultimap<String, GTRecipe> fluidIndex = HashMultimap.create(); /** * All the recipes belonging to this backend, indexed by recipe category. */ - private final Map<RecipeCategory, Collection<GT_Recipe>> recipesByCategory = new HashMap<>(); + private final Map<RecipeCategory, Collection<GTRecipe>> recipesByCategory = new HashMap<>(); /** * List of recipemaps that also receive recipe addition from this backend. @@ -75,7 +75,7 @@ public class RecipeMapBackend { public RecipeMapBackend(RecipeMapBackendPropertiesBuilder propertiesBuilder) { this.properties = propertiesBuilder.build(); - GregTech_API.itemStackMultiMaps.add(itemIndex); + GregTechAPI.itemStackMultiMaps.add(itemIndex); } void setRecipeMap(RecipeMap<?> recipeMap) { @@ -94,14 +94,14 @@ public class RecipeMapBackend { * use {@link #compileRecipe} to add / {@link #removeRecipes} to remove. */ @Unmodifiable - public Collection<GT_Recipe> getAllRecipes() { + public Collection<GTRecipe> getAllRecipes() { return Collections.unmodifiableCollection(allRecipes()); } /** * @return Raw recipe list */ - private Collection<GT_Recipe> allRecipes() { + private Collection<GTRecipe> allRecipes() { return recipesByCategory.values() .stream() .flatMap(Collection::stream) @@ -112,13 +112,13 @@ public class RecipeMapBackend { * @return All the recipes belonging to this backend, indexed by recipe category. */ @Unmodifiable - public Collection<GT_Recipe> getRecipesByCategory(RecipeCategory recipeCategory) { + public Collection<GTRecipe> getRecipesByCategory(RecipeCategory recipeCategory) { return Collections .unmodifiableCollection(recipesByCategory.getOrDefault(recipeCategory, Collections.emptyList())); } @Unmodifiable - public Map<RecipeCategory, Collection<GT_Recipe>> getRecipeCategoryMap() { + public Map<RecipeCategory, Collection<GTRecipe>> getRecipeCategoryMap() { return Collections.unmodifiableMap(recipesByCategory); } @@ -129,7 +129,7 @@ public class RecipeMapBackend { * * @return Supplied recipe. */ - public GT_Recipe compileRecipe(GT_Recipe recipe) { + public GTRecipe compileRecipe(GTRecipe recipe) { if (recipe.getRecipeCategory() == null) { recipe.setRecipeCategory(recipeMap.getDefaultRecipeCategory()); } @@ -148,17 +148,17 @@ public class RecipeMapBackend { /** * Adds the supplied recipe to the item cache. */ - protected GT_Recipe addToItemMap(GT_Recipe recipe) { + protected GTRecipe addToItemMap(GTRecipe recipe) { for (ItemStack item : recipe.mInputs) { if (item == null) continue; - itemIndex.put(new GT_ItemStack(item), recipe); + itemIndex.put(new GTItemStack(item), recipe); } - if (recipe instanceof GT_Recipe.GT_Recipe_WithAlt recipeWithAlt) { + if (recipe instanceof GTRecipe.GTRecipe_WithAlt recipeWithAlt) { for (ItemStack[] itemStacks : recipeWithAlt.mOreDictAlt) { if (itemStacks == null) continue; for (ItemStack item : itemStacks) { if (item == null) continue; - itemIndex.put(new GT_ItemStack(item), recipe); + itemIndex.put(new GTItemStack(item), recipe); } } } @@ -168,10 +168,10 @@ public class RecipeMapBackend { /** * Builds recipe from supplied recipe builder and adds it. */ - protected Collection<GT_Recipe> doAdd(GT_RecipeBuilder builder) { - Iterable<? extends GT_Recipe> recipes = properties.recipeEmitter.apply(builder); - Collection<GT_Recipe> ret = new ArrayList<>(); - for (GT_Recipe recipe : recipes) { + protected Collection<GTRecipe> doAdd(GTRecipeBuilder builder) { + Iterable<? extends GTRecipe> recipes = properties.recipeEmitter.apply(builder); + Collection<GTRecipe> ret = new ArrayList<>(); + for (GTRecipe recipe : recipes) { if (recipe.mFluidInputs.length < properties.minFluidInputs || recipe.mInputs.length < properties.minItemInputs) { return Collections.emptyList(); @@ -199,7 +199,7 @@ public class RecipeMapBackend { return ret; } - private void handleCollision(GT_Recipe recipe) { + private void handleCollision(GTRecipe recipe) { StringBuilder errorInfo = new StringBuilder(); boolean hasAnEntry = false; for (FluidStack fluid : recipe.mFluidInputs) { @@ -241,11 +241,11 @@ public class RecipeMapBackend { /** * Removes supplied recipes from recipe list. Do not use unless absolute necessity! */ - public void removeRecipes(Collection<? extends GT_Recipe> recipesToRemove) { - for (Collection<GT_Recipe> recipes : recipesByCategory.values()) { + public void removeRecipes(Collection<? extends GTRecipe> recipesToRemove) { + for (Collection<GTRecipe> recipes : recipesByCategory.values()) { recipes.removeAll(recipesToRemove); } - for (GT_ItemStack key : new HashMap<>(itemIndex.asMap()).keySet()) { + for (GTItemStack key : new HashMap<>(itemIndex.asMap()).keySet()) { itemIndex.get(key) .removeAll(recipesToRemove); } @@ -258,7 +258,7 @@ public class RecipeMapBackend { /** * Removes supplied recipe from recipe list. Do not use unless absolute necessity! */ - public void removeRecipe(GT_Recipe recipe) { + public void removeRecipe(GTRecipe recipe) { removeRecipes(Collections.singleton(recipe)); } @@ -276,9 +276,9 @@ public class RecipeMapBackend { */ public void reInit() { itemIndex.clear(); - for (GT_Recipe recipe : allRecipes()) { - GT_OreDictUnificator.setStackArray(true, recipe.mInputs); - GT_OreDictUnificator.setStackArray(true, recipe.mOutputs); + for (GTRecipe recipe : allRecipes()) { + GTOreDictUnificator.setStackArray(true, recipe.mInputs); + GTOreDictUnificator.setStackArray(true, recipe.mOutputs); addToItemMap(recipe); } } |
