upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 08:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace string with forge tag in vanilla recipes. Closes #9062

Browse Source
This commit is contained in:
LexManos committed 2023-07-19 00:02:11 -07:00
1 parent bad5b1b5d4
commit bcdd44aece
8 files changed
+121 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java
+34 -44
View File
@@ -29,34 +29,37 @@ import net.minecraftforge.registries.ForgeRegistries;
import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Field;
import java.nio.file.Path;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
public final class ForgeRecipeProvider extends VanillaRecipeProvider
{
public final class ForgeRecipeProvider extends VanillaRecipeProvider {
private final Map<Item, TagKey<Item>> replacements = new HashMap<>();
private final Set<ResourceLocation> excludes = new HashSet<>();
public ForgeRecipeProvider(PackOutput packOutput)
{
public ForgeRecipeProvider(PackOutput packOutput) {
super(packOutput);
}
private void exclude(ItemLike item)
{
private void exclude(ItemLike item) {
excludes.add(ForgeRegistries.ITEMS.getKey(item.asItem()));
}
private void replace(ItemLike item, TagKey<Item> tag)
{
private void exclude(String name) {
excludes.add(new ResourceLocation(name));
}
private void replace(ItemLike item, TagKey<Item> tag) {
replacements.put(item.asItem(), tag);
}
@Override
protected void buildRecipes(Consumer<FinishedRecipe> consumer)
{
protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
replace(Items.STICK, Tags.Items.RODS_WOODEN);
replace(Items.GOLD_INGOT, Tags.Items.INGOTS_GOLD);
replace(Items.IRON_INGOT, Tags.Items.INGOTS_IRON);
@@ -69,6 +72,9 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider
replace(Blocks.COBBLESTONE, Tags.Items.COBBLESTONE_NORMAL);
replace(Blocks.COBBLED_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE);
replace(Items.STRING, Tags.Items.STRING);
exclude(getConversionRecipeName(Blocks.WHITE_WOOL, Items.STRING));
exclude(Blocks.GOLD_BLOCK);
exclude(Items.GOLD_NUGGET);
exclude(Blocks.IRON_BLOCK);
@@ -94,8 +100,7 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider
}
@Nullable
private FinishedRecipe enhance(FinishedRecipe vanilla)
{
private FinishedRecipe enhance(FinishedRecipe vanilla) {
if (vanilla instanceof ShapelessRecipeBuilder.Result shapeless)
return enhance(shapeless);
if (vanilla instanceof ShapedRecipeBuilder.Result shaped)
@@ -104,15 +109,12 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider
}
@Nullable
private FinishedRecipe enhance(ShapelessRecipeBuilder.Result vanilla)
{
private FinishedRecipe enhance(ShapelessRecipeBuilder.Result vanilla) {
List<Ingredient> ingredients = getField(ShapelessRecipeBuilder.Result.class, vanilla, 4);
boolean modified = false;
for (int x = 0; x < ingredients.size(); x++)
{
for (int x = 0; x < ingredients.size(); x++) {
Ingredient ing = enhance(vanilla.getId(), ingredients.get(x));
if (ing != null)
{
if (ing != null) {
ingredients.set(x, ing);
modified = true;
}
@@ -122,29 +124,24 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider
@Nullable
@Override
protected CompletableFuture<?> saveAdvancement(CachedOutput output, FinishedRecipe finishedRecipe, JsonObject advancementJson)
{
protected CompletableFuture<?> saveAdvancement(CachedOutput output, FinishedRecipe recipe, JsonObject json) {
// NOOP - We don't replace any of the advancement things yet...
return null;
}
@Override
protected CompletableFuture<?> buildAdvancement(CachedOutput p_253674_, ResourceLocation p_254102_, Advancement.Builder p_253712_)
{
protected CompletableFuture<?> buildAdvancement(CachedOutput output, ResourceLocation name, Advancement.Builder builder) {
// NOOP - We don't replace any of the advancement things yet...
return CompletableFuture.allOf();
}
@Nullable
private FinishedRecipe enhance(ShapedRecipeBuilder.Result vanilla)
{
private FinishedRecipe enhance(ShapedRecipeBuilder.Result vanilla) {
Map<Character, Ingredient> ingredients = getField(ShapedRecipeBuilder.Result.class, vanilla, 5);
boolean modified = false;
for (Character x : ingredients.keySet())
{
for (Character x : ingredients.keySet()) {
Ingredient ing = enhance(vanilla.getId(), ingredients.get(x));
if (ing != null)
{
if (ing != null) {
ingredients.put(x, ing);
modified = true;
}
@@ -153,22 +150,18 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider
}
@Nullable
private Ingredient enhance(ResourceLocation name, Ingredient vanilla)
{
private Ingredient enhance(ResourceLocation name, Ingredient vanilla) {
if (excludes.contains(name))
return null;
boolean modified = false;
List<Value> items = new ArrayList<>();
Value[] vanillaItems = getField(Ingredient.class, vanilla, 2); //This will probably crash between versions, if null fix index
for (Value entry : vanillaItems)
{
if (entry instanceof ItemValue)
{
for (Value entry : vanillaItems) {
if (entry instanceof ItemValue) {
ItemStack stack = entry.getItems().stream().findFirst().orElse(ItemStack.EMPTY);
TagKey<Item> replacement = replacements.get(stack.getItem());
if (replacement != null)
{
if (replacement != null) {
items.add(new TagValue(replacement));
modified = true;
} else
@@ -180,15 +173,12 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider
}
@SuppressWarnings("unchecked")
private <T, R> R getField(Class<T> clz, T inst, int index)
{
private <T, R> R getField(Class<T> clz, T inst, int index) {
Field fld = clz.getDeclaredFields()[index];
fld.setAccessible(true);
try
{
try {
return (R) fld.get(inst);
} catch (IllegalArgumentException | IllegalAccessException e)
{
} catch (IllegalArgumentException | IllegalAccessException e) {
throw new RuntimeException(e);
}
}