diff options
Diffstat (limited to 'default-plugin')
5 files changed, 139 insertions, 10 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java index d7c34faf1..b8ec0b0b6 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java @@ -94,6 +94,7 @@ import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionBrewing; import net.minecraft.world.item.alchemy.PotionUtils; import net.minecraft.world.item.crafting.*; +import net.minecraft.world.item.enchantment.EnchantmentInstance; import net.minecraft.world.level.GameType; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.ComposterBlock; @@ -102,12 +103,14 @@ import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; +import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.ApiStatus; import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.function.Supplier; import java.util.function.UnaryOperator; +import java.util.stream.IntStream; import java.util.stream.Stream; @Environment(EnvType.CLIENT) @@ -388,6 +391,66 @@ public class DefaultClientPlugin implements REIClientPlugin, BuiltinClientPlugin registerForgePotions(registry, this); } + for (Item item : BuiltInRegistries.ITEM) { + ItemStack stack = item.getDefaultInstance(); + if (!stack.isDamageableItem()) continue; + EntryIngredient repairMaterialBase = null; + if (item instanceof TieredItem tieredItem) { + Tier tier = tieredItem.getTier(); + repairMaterialBase = EntryIngredients.ofIngredient(tier.getRepairIngredient()); + } else if (item instanceof ArmorItem armorItem) { + ArmorMaterial material = armorItem.getMaterial(); + repairMaterialBase = EntryIngredients.ofIngredient(material.getRepairIngredient()); + } else if (item instanceof ShieldItem shieldItem) { + repairMaterialBase = EntryIngredients.ofItemTag(ItemTags.PLANKS); + repairMaterialBase.filter(s -> shieldItem.isValidRepairItem(stack, s.castValue())); + } else if (item instanceof ElytraItem elytraItem) { + repairMaterialBase = EntryIngredients.of(Items.PHANTOM_MEMBRANE); + repairMaterialBase.filter(s -> elytraItem.isValidRepairItem(stack, s.castValue())); + } + if (repairMaterialBase == null || repairMaterialBase.isEmpty()) continue; + for (int[] i = {1}; i[0] <= 4; i[0]++) { + ItemStack baseStack = item.getDefaultInstance(); + int toRepair = i[0] == 4 ? item.getMaxDamage() : baseStack.getMaxDamage() / 4 * i[0]; + baseStack.setDamageValue(toRepair); + EntryIngredient repairMaterial = repairMaterialBase.map(s -> { + EntryStack<?> newStack = s.copy(); + newStack.<ItemStack>castValue().setCount(i[0]); + return newStack; + }); + Optional<Pair<ItemStack, Integer>> output = DefaultAnvilDisplay.calculateOutput(baseStack, repairMaterial.get(0).castValue()); + if (output.isEmpty()) continue; + registry.add(new DefaultAnvilDisplay(List.of(EntryIngredients.of(baseStack), repairMaterial), + Collections.singletonList(EntryIngredients.of(output.get().getLeft())), Optional.empty(), OptionalInt.of(output.get().getRight()))); + } + } + List<Pair<EnchantmentInstance, ItemStack>> enchantmentBooks = BuiltInRegistries.ENCHANTMENT.stream() + .flatMap(enchantment -> { + if (enchantment.getMaxLevel() - enchantment.getMinLevel() >= 10) { + return IntStream.of(enchantment.getMinLevel(), enchantment.getMaxLevel()) + .mapToObj(lvl -> new EnchantmentInstance(enchantment, lvl)); + } else { + return IntStream.rangeClosed(enchantment.getMinLevel(), enchantment.getMaxLevel()) + .mapToObj(lvl -> new EnchantmentInstance(enchantment, lvl)); + } + }) + .map(instance -> { + return Pair.of(instance, EnchantedBookItem.createForEnchantment(instance)); + }) + .toList(); + EntryRegistry.getInstance().getEntryStacks().forEach(stack -> { + if (stack.getType() != VanillaEntryTypes.ITEM) return; + ItemStack itemStack = stack.castValue(); + if (!itemStack.isEnchantable()) return; + for (Pair<EnchantmentInstance, ItemStack> pair : enchantmentBooks) { + if (!pair.getKey().enchantment.canEnchant(itemStack)) continue; + Optional<Pair<ItemStack, Integer>> output = DefaultAnvilDisplay.calculateOutput(itemStack, pair.getValue()); + if (output.isEmpty()) continue; + registry.add(new DefaultAnvilDisplay(List.of(EntryIngredients.of(itemStack), EntryIngredients.of(pair.getValue())), + Collections.singletonList(EntryIngredients.of(output.get().getLeft())), Optional.empty(), OptionalInt.of(output.get().getRight()))); + } + }); + for (Registry<?> reg : BuiltInRegistries.REGISTRY) { reg.getTags().forEach(tagPair -> registry.add(tagPair.getFirst())); } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java index 27005fee2..01b9edfaa 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultCompostingCategory.java @@ -34,6 +34,7 @@ import me.shedaniel.rei.api.client.gui.widgets.Widgets; import me.shedaniel.rei.api.client.registry.display.DisplayCategory; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.entry.EntryIngredient; +import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import me.shedaniel.rei.api.common.util.EntryStacks; import me.shedaniel.rei.plugin.common.BuiltinPlugin; import me.shedaniel.rei.plugin.common.displays.DefaultCompostingDisplay; @@ -95,8 +96,8 @@ public class DefaultCompostingCategory implements DisplayCategory<DefaultCompost for (int y = 0; y < 5; y++) for (int x = 0; x < 7; x++) { EntryIngredient entryIngredient = stacks.size() > i ? stacks.get(i) : EntryIngredient.empty(); - if (!entryIngredient.isEmpty()) { - ItemStack firstStack = (ItemStack) entryIngredient.get(0).getValue(); + if (!entryIngredient.isEmpty() && entryIngredient.get(0).getType() == VanillaEntryTypes.ITEM) { + ItemStack firstStack = entryIngredient.get(0).castValue(); float chance = ComposterBlock.COMPOSTABLES.getFloat(firstStack.getItem()); if (chance > 0.0f) { entryIngredient = entryIngredient.map(stack -> stack.copy().tooltip(Component.translatable("text.rei.composting.chance", Mth.clamp(Mth.floor(chance * 100), 0, 100)).withStyle(ChatFormatting.YELLOW))); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java index f8c16278e..c1f292e96 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/anvil/DefaultAnvilCategory.java @@ -34,6 +34,8 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.util.EntryStacks; import me.shedaniel.rei.plugin.common.BuiltinPlugin; import me.shedaniel.rei.plugin.common.displays.anvil.DefaultAnvilDisplay; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.Blocks; @@ -57,7 +59,7 @@ public class DefaultAnvilCategory implements DisplayCategory<DefaultAnvilDisplay @Override public List<Widget> setupDisplay(DefaultAnvilDisplay display, Rectangle bounds) { - Point startPoint = new Point(bounds.getCenterX() - 31, bounds.getCenterY() - 13); + Point startPoint = new Point(bounds.getCenterX() - 31, bounds.getCenterY() - (display.getCost().isPresent() ? 20 : 13)); List<Widget> widgets = Lists.newArrayList(); widgets.add(Widgets.createRecipeBase(bounds)); widgets.add(Widgets.createArrow(new Point(startPoint.x + 27, startPoint.y + 4))); @@ -65,11 +67,20 @@ public class DefaultAnvilCategory implements DisplayCategory<DefaultAnvilDisplay widgets.add(Widgets.createSlot(new Point(startPoint.x + 4 - 22, startPoint.y + 5)).entries(display.getInputEntries().get(0)).markInput()); widgets.add(Widgets.createSlot(new Point(startPoint.x + 4, startPoint.y + 5)).entries(display.getInputEntries().get(1)).markInput()); widgets.add(Widgets.createSlot(new Point(startPoint.x + 61, startPoint.y + 5)).entries(display.getOutputEntries().get(0)).disableBackground().markOutput()); + if (display.getCost().isPresent()) { + widgets.add(Widgets.createDrawableWidget((graphics, mouseX, mouseY, delta) -> { + Font font = Minecraft.getInstance().font; + Component component = Component.translatable("container.repair.cost", display.getCost().getAsInt()); + int x = startPoint.x + 102 - font.width(component) - 2; + graphics.fill(x - 2, startPoint.y + 28, startPoint.x + 102, startPoint.y + 28 + 12, 0x4f000000); + graphics.drawString(font, component, x, startPoint.y + 28 + 2, 0x80ff20); + })); + } return widgets; } @Override public int getDisplayHeight() { - return 36; + return 48; } } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/AnvilRecipe.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/AnvilRecipe.java index ba4f70458..694868145 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/AnvilRecipe.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/AnvilRecipe.java @@ -28,6 +28,7 @@ import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; import java.util.List; +import java.util.OptionalInt; public class AnvilRecipe { @Nullable @@ -35,12 +36,18 @@ public class AnvilRecipe { private final List<ItemStack> leftInput; private final List<ItemStack> rightInputs; private final List<ItemStack> outputs; + private final OptionalInt cost; public AnvilRecipe(@Nullable ResourceLocation id, List<ItemStack> leftInput, List<ItemStack> rightInputs, List<ItemStack> outputs) { + this(id, leftInput, rightInputs, outputs, OptionalInt.empty()); + } + + public AnvilRecipe(@Nullable ResourceLocation id, List<ItemStack> leftInput, List<ItemStack> rightInputs, List<ItemStack> outputs, OptionalInt cost) { this.id = id; this.leftInput = leftInput; this.rightInputs = rightInputs; this.outputs = outputs; + this.cost = cost; } public ResourceLocation getId() { @@ -58,4 +65,8 @@ public class AnvilRecipe { public List<ItemStack> getOutputs() { return outputs; } + + public OptionalInt getCost() { + return cost; + } } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/DefaultAnvilDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/DefaultAnvilDisplay.java index 0c2b5e655..befc8d143 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/DefaultAnvilDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/anvil/DefaultAnvilDisplay.java @@ -28,14 +28,20 @@ import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.util.EntryIngredients; import me.shedaniel.rei.plugin.common.BuiltinPlugin; +import net.minecraft.client.Minecraft; +import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AnvilMenu; +import net.minecraft.world.item.ItemStack; +import org.apache.commons.lang3.tuple.Pair; +import org.jetbrains.annotations.ApiStatus; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import java.util.*; public class DefaultAnvilDisplay extends BasicDisplay { + private final OptionalInt cost; + public DefaultAnvilDisplay(AnvilRecipe recipe) { this( Arrays.asList( @@ -43,12 +49,22 @@ public class DefaultAnvilDisplay extends BasicDisplay { EntryIngredients.ofItemStacks(recipe.getRightInputs()) ), Collections.singletonList(EntryIngredients.ofItemStacks(recipe.getOutputs())), - Optional.ofNullable(recipe.getId()) + Optional.ofNullable(recipe.getId()), + recipe.getCost() ); } public DefaultAnvilDisplay(List<EntryIngredient> inputs, List<EntryIngredient> outputs, Optional<ResourceLocation> location) { + this(inputs, outputs, location, OptionalInt.empty()); + } + + public DefaultAnvilDisplay(List<EntryIngredient> inputs, List<EntryIngredient> outputs, Optional<ResourceLocation> location, CompoundTag tag) { + this(inputs, outputs, location, tag.contains("Cost") ? OptionalInt.of(tag.getInt("Cost")) : OptionalInt.empty()); + } + + public DefaultAnvilDisplay(List<EntryIngredient> inputs, List<EntryIngredient> outputs, Optional<ResourceLocation> location, OptionalInt cost) { super(inputs, outputs, location); + this.cost = cost; } @Override @@ -56,7 +72,34 @@ public class DefaultAnvilDisplay extends BasicDisplay { return BuiltinPlugin.ANVIL; } + public OptionalInt getCost() { + return cost; + } + public static BasicDisplay.Serializer<DefaultAnvilDisplay> serializer() { - return BasicDisplay.Serializer.ofSimple(DefaultAnvilDisplay::new); + return BasicDisplay.Serializer.of(DefaultAnvilDisplay::new, (display, tag) -> { + if (display.getCost().isPresent()) { + tag.putInt("Cost", display.getCost().getAsInt()); + } + }); + } + + @ApiStatus.Experimental + @ApiStatus.Internal + public static Optional<Pair<ItemStack, Integer>> calculateOutput(ItemStack left, ItemStack right) { + try { + if (Minecraft.getInstance().player == null) return Optional.empty(); + AnvilMenu menu = new AnvilMenu(0, new Inventory(Minecraft.getInstance().player)); + menu.setItem(0, menu.incrementStateId(), left); + menu.setItem(1, menu.incrementStateId(), right); + ItemStack output = menu.getSlot(2).getItem().copy(); + if (!output.isEmpty()) { + return Optional.of(Pair.of(output, menu.getCost())); + } else { + return Optional.empty(); + } + } catch (Throwable ignored) { + return Optional.empty(); + } } } |