Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package com.gregtechceu.gtceu.core.mixins;

import com.gregtechceu.gtceu.api.item.IGTTool;
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;

import net.minecraft.core.RegistryAccess;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.world.Container;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.SmithingTransformRecipe;

import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(SmithingTransformRecipe.class)
public class SmithingTransformRecipeMixin {

@Shadow
@Final
ItemStack result;

@Inject(method = "assemble",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/world/item/ItemStack;setTag(Lnet/minecraft/nbt/CompoundTag;)V"))
private void gtceu$gtToolSmithingTransform1(Container container, RegistryAccess registryAccess,
CallbackInfoReturnable<ItemStack> cir,
@Share("newTag") LocalRef<CompoundTag> sharedTag) {
ItemStack output = this.result.copy();

if (!(output.getItem() instanceof IGTTool igtTool)) return;

CompoundTag originalTag = container.getItem(1).getTag();
CompoundTag newTag = originalTag != null ? originalTag.copy() : null;
if (newTag == null) return;

// Remove old tool stats
newTag.remove("GT.Tool");

// Copy stats from the upgraded tool
ItemStack newStack = ToolHelper.get(igtTool.getToolType(), igtTool.getMaterial());
Tag newStats = newStack.getTag() != null ? newStack.getTag().get("GT.Tool") : null;
if (newStats != null) {
newTag.put("GT.Tool", newStats);
sharedTag.set(newTag);
}
}

@Redirect(method = "assemble",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/world/item/ItemStack;setTag(Lnet/minecraft/nbt/CompoundTag;)V"))
private void gtceu$gtToolSmithingTransform2(ItemStack itemStack, CompoundTag tag,
@Share("newTag") LocalRef<CompoundTag> sharedTag) {
itemStack.setTag(sharedTag.get());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@
import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry;
import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
import com.gregtechceu.gtceu.data.recipe.builder.*;

import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.data.recipes.RecipeCategory;
import net.minecraft.data.recipes.SmithingTransformRecipeBuilder;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
Expand All @@ -22,12 +25,16 @@
import net.minecraft.world.level.ItemLike;

import com.tterrag.registrate.util.entry.ItemProviderEntry;
import it.unimi.dsi.fastutil.chars.*;
import it.unimi.dsi.fastutil.chars.Char2IntOpenHashMap;
import it.unimi.dsi.fastutil.chars.CharArraySet;
import it.unimi.dsi.fastutil.chars.CharSet;
import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap;
import org.jetbrains.annotations.NotNull;

import java.util.function.Consumer;

import static com.tterrag.registrate.providers.RegistrateRecipeProvider.has;

public class VanillaRecipeHelper {

public static void addSmeltingRecipe(Consumer<FinishedRecipe> provider, @NotNull String regName, TagKey<Item> input,
Expand Down Expand Up @@ -581,6 +588,38 @@ public static void addShapelessRecipe(Consumer<FinishedRecipe> provider, @NotNul
builder.save(provider);
}

public static void addSmithingTransformRecipe(Consumer<FinishedRecipe> provider, @NotNull ResourceLocation regName,
@NotNull Item result, @NotNull ItemLike baseInput,
@NotNull ItemLike template, @NotNull ItemLike addition,
@NotNull RecipeCategory category) {
SmithingTransformRecipeBuilder
.smithing(Ingredient.of(template), Ingredient.of(baseInput), Ingredient.of(addition), category, result)
.unlocks(String.format("has_%s", baseInput), has(baseInput))
.save(provider, regName);
}

public static void addSmithingTransformRecipe(Consumer<FinishedRecipe> provider, @NotNull String regName,
@NotNull Item result, @NotNull ItemLike baseInput,
@NotNull ItemLike template, @NotNull ItemLike addition) {
addSmithingTransformRecipe(provider, GTCEu.id(regName), result, baseInput, template, addition,
RecipeCategory.MISC);
}

public static void addToolUpgradingRecipe(@NotNull Consumer<FinishedRecipe> provider, @NotNull GTToolType tool,
@NotNull Material upgradeMaterial, @NotNull Material baseMaterial,
@NotNull ItemLike template, @NotNull ItemLike addition) {
ItemStack upgradeToolStack = ToolHelper.get(tool, upgradeMaterial);
ItemStack baseToolStack = ToolHelper.get(tool, baseMaterial);

if (upgradeToolStack.isEmpty() || baseToolStack.isEmpty()) return;

VanillaRecipeHelper.addSmithingTransformRecipe(provider,
String.format("%s_%s_smithing_transform_from_%s", upgradeMaterial.getName(), tool.name,
baseMaterial.getName()),
upgradeToolStack.getItem(), baseToolStack.getItem(),
template, addition);
}

/**
* @param material the material to check
* @return if the material is a wood
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ private static void processTool(@NotNull Consumer<FinishedRecipe> provider, @Not
GTCEu.LOGGER.warn("Did not find rod for " + material.getName() +
", skipping wirecutter, butchery knife, screwdriver, crowbar recipes");
}

GTToolType.getTypes().forEach((s, gtToolType) -> addNetheriteToolRecipe(provider, gtToolType));
}

private static void processElectricTool(@NotNull Consumer<FinishedRecipe> provider, @NotNull ToolProperty property,
Expand Down Expand Up @@ -347,6 +349,11 @@ public static void addToolRecipe(@NotNull Consumer<FinishedRecipe> provider, @No
}
}

public static void addNetheriteToolRecipe(@NotNull Consumer<FinishedRecipe> provider, @NotNull GTToolType tool) {
VanillaRecipeHelper.addToolUpgradingRecipe(provider, tool, GTMaterials.Netherite, GTMaterials.Diamond,
Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, ChemicalHelper.get(ingot, GTMaterials.Netherite).getItem());
}

public static void addArmorRecipe(Consumer<FinishedRecipe> provider, @NotNull Material material,
@NotNull ArmorItem.Type armor, Object... recipe) {
ItemStack armorStack = ToolHelper.getArmor(armor, material);
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/gtceu.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"ServerGamePacketListenerImplAccessor",
"ShapedRecipeAccessor",
"SidedRedstoneConnectivityMixin",
"SmithingTransformRecipeMixin",
"TagLoaderMixin",
"TagManagerMixin",
"TagValueAccessor",
Expand Down