Skip to content
Merged
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
20 changes: 8 additions & 12 deletions src/main/java/dev/anvilcraft/guideme/command/GetHandCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.core.Holder;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.Style;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.tags.TagKey;
Expand Down Expand Up @@ -38,10 +39,11 @@ private static int showInfo(CommandContext<CommandSourceStack> ctx) {
ItemStack itemStack = player.getMainHandItem();
Item item = itemStack.getItem();


components.add(Component.nullToEmpty("=========="));

// Item ID
Component itemMessage = Component.translatable("command.ac_guideme.item", item.toString())
MutableComponent itemMessage = Component.translatable("command.ac_guideme.item", item.toString())
.withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD);
components.add(copy(itemMessage, item.toString()));

Expand All @@ -51,9 +53,9 @@ private static int showInfo(CommandContext<CommandSourceStack> ctx) {
components.add(copy(countMessage, String.valueOf(count)));

// Mod
String modInfo = getMod(item.toString());
Component ModMessage = Component.translatable("command.ac_guideme.mod", modInfo).withStyle(ChatFormatting.RED);
components.add(copy(ModMessage, modInfo));
String modId = item.getCreatorModId(itemStack);
Component ModMessage = Component.translatable("command.ac_guideme.mod", modId).withStyle(ChatFormatting.RED);
components.add(copy(ModMessage, modId));

// Item Tag
Holder<Item> itemHolder = itemStack.getItemHolder();
Expand Down Expand Up @@ -92,15 +94,9 @@ private static int showInfo(CommandContext<CommandSourceStack> ctx) {
return returnValue.get();
}

private static Component copy(Component c, String info) {
private static Component copy(Component component, String info) {
return Component.literal("- ")
.withStyle(Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, info)))
.append(c);
}

private static String getMod(String item) {
if (!item.contains(":")) return item;
String[] parts = item.split(":", 2);
return parts[0];
.append(component);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import dev.anvilcraft.guideme.guide.recipe.LytSuperHeatingRecipe;
import dev.anvilcraft.guideme.guide.recipe.LytTimeWarpRecipe;
import dev.anvilcraft.guideme.guide.recipe.LytUnpackRecipe;
import dev.anvilcraft.guideme.guide.recipe.vanilla.VanillaRecipes;
import dev.dubhe.anvilcraft.init.reicpe.ModRecipeTypes;
import dev.dubhe.anvilcraft.recipe.ChargerChargingRecipe;
import dev.dubhe.anvilcraft.recipe.JewelCraftingRecipe;
Expand Down Expand Up @@ -54,6 +55,7 @@
import net.minecraft.network.chat.Style;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeType;

import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
Expand All @@ -64,6 +66,10 @@ public class RecipeTypeContributions implements RecipeTypeMappingSupplier {

@Override
public void collect(RecipeTypeMappings mappings) {
// Vanilla
mappings.add(RecipeType.STONECUTTING, VanillaRecipes::createStonecutter);

// Anvil
mappings.add(ModRecipeTypes.BLOCK_COMPRESS_TYPE.get(), RecipeTypeContributions::blockCompress);
mappings.add(ModRecipeTypes.BLOCK_CRUSH_TYPE.get(), RecipeTypeContributions::blockCrush);
mappings.add(ModRecipeTypes.BLOCK_SMEAR_TYPE.get(), RecipeTypeContributions::blockSmear);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package dev.anvilcraft.guideme.guide.recipe.vanilla;

import guideme.document.block.LytSlotGrid;
import guideme.document.block.recipes.LytStandardRecipeBox;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.StonecutterRecipe;
import net.minecraft.world.level.block.Blocks;

public class VanillaRecipes {

private VanillaRecipes() {
}

public static LytStandardRecipeBox<StonecutterRecipe> createStonecutter(RecipeHolder<StonecutterRecipe> recipe) {
return LytStandardRecipeBox.builder()
.title(Blocks.STONECUTTER.asItem().getDescription().getString())
.icon(Blocks.STONECUTTER)
.input(LytSlotGrid.row(recipe.value().getIngredients(), true))
.outputFromResultOf(recipe)
.build(recipe);
}
}