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

Now you can't craft mince meat out of mince meat #1203

Merged
merged 1 commit into from
Feb 17, 2025
+31 −2
Merged

Now you can't craft mince meat out of mince meat #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;

import net.minecraft.block.Block;
import net.minecraft.init.Items;
Expand Down Expand Up @@ -47,6 +48,19 @@ public ShapelessUniversalRecipe(ItemStack result, Object... recipe) {
}
this.recipe.add(oresHashes);
this.recipeXY.add(ores);
} else if (value instanceof List<?>list) {
List<ItemStack> items = new ArrayList<>();
HashSet<GTUtility.ItemId> itemHash = new HashSet<>();
for (Object o : list) {
if (!(o instanceof ItemStack itemStack)) {
throw new IllegalArgumentException("Invalid item stack: " + o);
}
ItemStack i = itemStack.copy();
items.add(i);
itemHash.add(GTUtility.ItemId.createNoCopy(i));
}
this.recipe.add(itemHash);
this.recipeXY.add(items);
} else if (value instanceof ItemStack) {
ItemStack i = ((ItemStack) value).copy();
this.recipe.add(i);
Expand Down
19 changes: 17 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptGregtech.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@
import static gregtech.api.util.GTRecipeBuilder.TICKS;
import static gregtech.api.util.GTRecipeConstants.UniversalChemical;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;

import com.dreammaster.gthandler.CustomItemList;
import com.dreammaster.item.NHItemList;
Expand Down Expand Up @@ -115,10 +118,16 @@ public void loadRecipes() {
GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Glass, 1L),
"craftingToolMortar",
getModItem(TinkerConstruct.ID, "GlassPane", 1, 0, missing));
List<ItemStack> meatItems = new ArrayList<>(OreDictionary.getOres("listAllmeatraw")).stream()
.filter(
itemStack -> !ItemStack.areItemStacksEqual(
itemStack,
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L)))
.collect(Collectors.toList());
addShapelessRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L),
"craftingToolMortar",
"listAllmeatraw");
meatItems);
addShapelessRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L),
"craftingToolMortar",
Expand All @@ -127,10 +136,16 @@ public void loadRecipes() {
getModItem(Minecraft.ID, "sugar", 4, 0, missing),
"craftingToolMortar",
getModItem(CropsPlusPlus.ID, "foodBerries", 1, 1, missing));
List<ItemStack> cookedMeatItems = new ArrayList<>(OreDictionary.getOres("listAllmeatcooked")).stream()
.filter(
itemStack -> !ItemStack.areItemStacksEqual(
itemStack,
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L)))
.collect(Collectors.toList());
addShapelessRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L),
"craftingToolMortar",
"listAllmeatcooked");
cookedMeatItems);
addShapelessRecipe(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L),
"craftingToolMortar",
Expand Down