diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index ad6d2922..9726fe23 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -15,6 +15,7 @@ import ru.betterend.recipe.CraftingRecipes; import ru.betterend.recipe.FurnaceRecipes; import ru.betterend.recipe.InfusionRecipes; import ru.betterend.recipe.SmithingRecipes; +import ru.betterend.recipe.AnvilRecipes; import ru.betterend.registry.EndBiomes; import ru.betterend.registry.EndBlockEntities; import ru.betterend.registry.EndBlocks; @@ -51,6 +52,7 @@ public class BetterEnd implements ModInitializer { CraftingRecipes.register(); FurnaceRecipes.register(); AlloyingRecipes.register(); + AnvilRecipes.register(); SmithingRecipes.register(); InfusionRecipes.register(); EndStructures.register(); diff --git a/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java b/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java index 88c9363b..9dfe08c1 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java @@ -52,8 +52,8 @@ public class REIAnvilCategory implements TransferRecipeCategory widgets.add(Widgets.createArrow(new Point(x + 24, y + 3))); widgets.add(Widgets.createLabel(new Point(bounds.x + bounds.width - 5, bounds.y + bounds.height - 12), new TranslatableText("category.rei.damage.amount&dmg", display.getDamage())).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); - widgets.add(Widgets.createSlot(new Point(x - 20, y + 3)).entries(inputEntries.get(0)).markInput()); - widgets.add(Widgets.createSlot(new Point(x + 1, y + 3)).entries(inputEntries.get(1)).markInput()); + widgets.add(Widgets.createSlot(new Point(x - 20, y + 3)).entries(inputEntries.get(1)).markInput()); + widgets.add(Widgets.createSlot(new Point(x + 1, y + 3)).entries(inputEntries.get(0)).markInput()); widgets.add(Widgets.createSlot(new Point(x + 61, y + 4)).entries(display.getResultingEntries().get(0)).disableBackground().markOutput()); return widgets; } diff --git a/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java b/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java index df870fc7..07618850 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java @@ -12,15 +12,15 @@ import me.shedaniel.rei.server.ContainerInfo; import net.minecraft.recipe.Recipe; import net.minecraft.screen.ScreenHandler; import net.minecraft.util.Identifier; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; +import ru.betterend.recipe.builders.AnvilRecipe; public class REIAnvilDisplay implements TransferRecipeDisplay { - private AnvilSmithingRecipe recipe; + private AnvilRecipe recipe; private List> input; private List output; - public REIAnvilDisplay(AnvilSmithingRecipe recipe) { + public REIAnvilDisplay(AnvilRecipe recipe) { this.recipe = recipe; this.input = EntryStack.ofIngredients(recipe.getPreviewInputs()); this.output = Collections.singletonList(EntryStack.create(recipe.getOutput())); diff --git a/src/main/java/ru/betterend/integration/rei/REIPlugin.java b/src/main/java/ru/betterend/integration/rei/REIPlugin.java index ee84dea5..ad41e411 100644 --- a/src/main/java/ru/betterend/integration/rei/REIPlugin.java +++ b/src/main/java/ru/betterend/integration/rei/REIPlugin.java @@ -10,7 +10,7 @@ import net.minecraft.recipe.BlastingRecipe; import net.minecraft.util.Identifier; import ru.betterend.BetterEnd; import ru.betterend.recipe.builders.AlloyingRecipe; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; +import ru.betterend.recipe.builders.AnvilRecipe; import ru.betterend.recipe.builders.InfusionRecipe; import ru.betterend.registry.EndBlocks; @@ -19,7 +19,7 @@ public class REIPlugin implements REIPluginV0 { public final static Identifier PLUGIN_ID = BetterEnd.makeID("rei_plugin"); public final static Identifier ALLOYING = AlloyingRecipe.ID; - public final static Identifier SMITHING = AnvilSmithingRecipe.ID; + public final static Identifier SMITHING = AnvilRecipe.ID; public final static Identifier INFUSION = InfusionRecipe.ID; public final static EntryStack END_STONE_SMELTER = EntryStack.create(EndBlocks.END_STONE_SMELTER); @@ -35,7 +35,7 @@ public class REIPlugin implements REIPluginV0 { public void registerRecipeDisplays(RecipeHelper recipeHelper) { recipeHelper.registerRecipes(ALLOYING, AlloyingRecipe.class, REIAlloyingDisplay::new); recipeHelper.registerRecipes(ALLOYING, BlastingRecipe.class, REIAlloyingDisplay::new); - recipeHelper.registerRecipes(SMITHING, AnvilSmithingRecipe.class, REIAnvilDisplay::new); + recipeHelper.registerRecipes(SMITHING, AnvilRecipe.class, REIAnvilDisplay::new); recipeHelper.registerRecipes(INFUSION, InfusionRecipe.class, REIInfusionDisplay::new); } diff --git a/src/main/java/ru/betterend/interfaces/AnvilScreenHandlerExtended.java b/src/main/java/ru/betterend/interfaces/AnvilScreenHandlerExtended.java index 2c6fbc71..37c04cf2 100644 --- a/src/main/java/ru/betterend/interfaces/AnvilScreenHandlerExtended.java +++ b/src/main/java/ru/betterend/interfaces/AnvilScreenHandlerExtended.java @@ -2,10 +2,30 @@ package ru.betterend.interfaces; import java.util.List; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; +import ru.betterend.recipe.builders.AnvilRecipe; public interface AnvilScreenHandlerExtended { - public void be_updateCurrentRecipe(AnvilSmithingRecipe recipe); - public AnvilSmithingRecipe be_getCurrentRecipe(); - public List be_getRecipes(); + public void be_updateCurrentRecipe(AnvilRecipe recipe); + public AnvilRecipe be_getCurrentRecipe(); + public List be_getRecipes(); + + default void be_nextRecipe() { + List recipes = this.be_getRecipes(); + AnvilRecipe current = this.be_getCurrentRecipe(); + int i = recipes.indexOf(current) + 1; + if (i >= recipes.size()) { + i = 0; + } + this.be_updateCurrentRecipe(recipes.get(i)); + } + + default void be_previousRecipe() { + List recipes = this.be_getRecipes(); + AnvilRecipe current = this.be_getCurrentRecipe(); + int i = recipes.indexOf(current) - 1; + if (i <= 0) { + i = recipes.size() - 1; + } + this.be_updateCurrentRecipe(recipes.get(i)); + } } diff --git a/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java b/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java index 6716f669..a9d0a4c1 100644 --- a/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java +++ b/src/main/java/ru/betterend/mixin/client/AnvilScreenMixin.java @@ -25,7 +25,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import ru.betterend.interfaces.AnvilScreenHandlerExtended; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; @Mixin(AnvilScreen.class) public class AnvilScreenMixin extends ForgingScreen { @@ -34,6 +33,7 @@ public class AnvilScreenMixin extends ForgingScreen { private TextFieldWidget nameField; private List be_buttons = Lists.newArrayList(); + private AnvilScreenHandlerExtended anvilHandler; public AnvilScreenMixin(AnvilScreenHandler handler, PlayerInventory playerInventory, Text title, Identifier texture) { @@ -43,23 +43,22 @@ public class AnvilScreenMixin extends ForgingScreen { @Inject(method = "setup", at = @At("TAIL")) protected void setup(CallbackInfo info) { this.be_buttons.clear(); - int x = (this.width - this.backgroundWidth) / 2; - int y = (this.height - this.backgroundHeight) / 2; - this.be_buttons.add(new ButtonWidget(x + 8, y + 45, 15, 20, new LiteralText("<"), (b) -> be_previousRecipe())); + int x = (width - backgroundWidth) / 2; + int y = (height - backgroundHeight) / 2; + this.anvilHandler = AnvilScreenHandlerExtended.class.cast(this.handler); + this.be_buttons.add(new ButtonWidget(x + 8, y + 45, 15, 20, new LiteralText("<"), (b) -> be_previousRecipe())); this.be_buttons.add(new ButtonWidget(x + 154, y + 45, 15, 20, new LiteralText(">"), (b) -> be_nextRecipe())); } @Inject(method = "renderForeground", at = @At("TAIL")) protected void renderForeground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info) { - AnvilScreenHandlerExtended handler = AnvilScreenHandlerExtended.class.cast(this.handler); - if (handler.be_getRecipes().size() > 1) { + if (anvilHandler.be_getRecipes().size() > 1) { this.be_buttons.forEach(button -> button.render(matrices, mouseX, mouseY, delta)); } } @Inject(method = "onSlotUpdate", at = @At("HEAD"), cancellable = true) public void onSlotUpdate(ScreenHandler handler, int slotId, ItemStack stack, CallbackInfo info) { - AnvilScreenHandlerExtended anvilHandler = AnvilScreenHandlerExtended.class.cast(this.handler); if (anvilHandler.be_getCurrentRecipe() != null) { this.nameField.setText(""); this.nameField.setEditable(false); @@ -69,31 +68,19 @@ public class AnvilScreenMixin extends ForgingScreen { } private void be_nextRecipe() { - AnvilScreenHandlerExtended handler = AnvilScreenHandlerExtended.class.cast(this.handler); - List recipes = handler.be_getRecipes(); - AnvilSmithingRecipe current = handler.be_getCurrentRecipe(); - int i = recipes.indexOf(current) + 1; - if (i == recipes.size()) { - i = 0; - } - handler.be_updateCurrentRecipe(recipes.get(i)); + this.anvilHandler.be_nextRecipe(); } private void be_previousRecipe() { - AnvilScreenHandlerExtended handler = AnvilScreenHandlerExtended.class.cast(this.handler); - List recipes = handler.be_getRecipes(); - AnvilSmithingRecipe current = handler.be_getCurrentRecipe(); - int i = recipes.indexOf(current) - 1; - if (i == 0) { - i = recipes.size() - 1; - } - handler.be_updateCurrentRecipe(recipes.get(i)); + this.anvilHandler.be_previousRecipe(); } @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { for (AbstractButtonWidget elem : be_buttons) { if (elem.mouseClicked(mouseX, mouseY, button)) { + int i = be_buttons.indexOf(elem); + this.client.interactionManager.clickButton(handler.syncId, i); return true; } } diff --git a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java index 9c1f528b..eba846f9 100644 --- a/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java +++ b/src/main/java/ru/betterend/mixin/common/AnvilScreenHandlerMixin.java @@ -22,13 +22,13 @@ import net.minecraft.screen.ScreenHandlerContext; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.tag.BlockTags; import ru.betterend.interfaces.AnvilScreenHandlerExtended; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; +import ru.betterend.recipe.builders.AnvilRecipe; @Mixin(AnvilScreenHandler.class) public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler implements AnvilScreenHandlerExtended { - private List be_recipes = Collections.emptyList(); - private AnvilSmithingRecipe be_currentRecipe; + private List be_recipes = Collections.emptyList(); + private AnvilRecipe be_currentRecipe; public AnvilScreenHandlerMixin(ScreenHandlerType type, int syncId, PlayerInventory playerInventory, ScreenHandlerContext context) { @@ -44,7 +44,6 @@ public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler imple ItemStack output = this.be_currentRecipe.craft(input, player); if (!output.isEmpty()) { info.setReturnValue(true); - info.cancel(); } } } @@ -52,8 +51,8 @@ public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler imple @Inject(method = "onTakeOutput", at = @At("HEAD"), cancellable = true) protected void onTakeOutput(PlayerEntity player, ItemStack stack, CallbackInfoReturnable info) { if (be_currentRecipe != null) { - this.input.getStack(1).decrement(1); - this.updateResult(); + this.input.getStack(0).decrement(1); + this.onContentChanged(input); this.context.run((world, blockPos) -> { BlockState anvilState = world.getBlockState(blockPos); if (!player.abilities.creativeMode && anvilState.isIn(BlockTags.ANVIL) && player.getRandom().nextFloat() < 0.12F) { @@ -70,16 +69,15 @@ public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler imple } }); info.setReturnValue(stack); - info.cancel(); } } @Inject(method = "updateResult", at = @At("HEAD"), cancellable = true) public void updateOutput(CallbackInfo info) { RecipeManager recipeManager = this.player.world.getRecipeManager(); - this.be_recipes = recipeManager.getAllMatches(AnvilSmithingRecipe.TYPE, input, player.world); + this.be_recipes = recipeManager.getAllMatches(AnvilRecipe.TYPE, input, player.world); if (be_recipes.size() > 0) { - this.be_currentRecipe = recipeManager.getFirstMatch(AnvilSmithingRecipe.TYPE, input, player.world).get(); + this.be_currentRecipe = recipeManager.getFirstMatch(AnvilRecipe.TYPE, input, player.world).get(); this.be_updateResult(); info.cancel(); } @@ -92,6 +90,18 @@ public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler imple } } + @Override + public boolean onButtonClick(PlayerEntity player, int id) { + if (id == 0) { + this.be_previousRecipe(); + return true; + } else if (id == 1) { + this.be_nextRecipe(); + return true; + } + return super.onButtonClick(player, id); + } + private void be_updateResult() { if (be_currentRecipe == null) return; this.output.setStack(0, be_currentRecipe.craft(input)); @@ -99,18 +109,18 @@ public abstract class AnvilScreenHandlerMixin extends ForgingScreenHandler imple } @Override - public void be_updateCurrentRecipe(AnvilSmithingRecipe recipe) { + public void be_updateCurrentRecipe(AnvilRecipe recipe) { this.be_currentRecipe = recipe; this.be_updateResult(); } @Override - public AnvilSmithingRecipe be_getCurrentRecipe() { + public AnvilRecipe be_getCurrentRecipe() { return this.be_currentRecipe; } @Override - public List be_getRecipes() { + public List be_getRecipes() { return this.be_recipes; } } diff --git a/src/main/java/ru/betterend/recipe/AnvilRecipes.java b/src/main/java/ru/betterend/recipe/AnvilRecipes.java new file mode 100644 index 00000000..83207d3a --- /dev/null +++ b/src/main/java/ru/betterend/recipe/AnvilRecipes.java @@ -0,0 +1,59 @@ +package ru.betterend.recipe; + +import net.minecraft.item.Items; +import ru.betterend.recipe.builders.AnvilRecipe; +import ru.betterend.registry.EndItems; + +public class AnvilRecipes { + public static void register() { + AnvilRecipe.Builder.create("ender_pearl_to_dust") + .setInput(Items.ENDER_PEARL) + .setOutput(EndItems.ENDER_DUST) + .setLevel(4) + .setDamage(5) + .build(); + AnvilRecipe.Builder.create("ender_shard_to_dust") + .setInput(EndItems.ENDER_SHARD) + .setOutput(EndItems.ENDER_DUST) + .setLevel(2) + .setDamage(3) + .build(); + + AnvilRecipe.Builder.create("aeternium_axe_head") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_AXE_HEAD) + .setLevel(4) + .setDamage(6) + .build(); + AnvilRecipe.Builder.create("aeternium_pickaxe_head") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_PICKAXE_HEAD) + .setLevel(4) + .setDamage(6) + .build(); + AnvilRecipe.Builder.create("aeternium_shovel_head") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_SHOVEL_HEAD) + .setLevel(4) + .setDamage(6) + .build(); + AnvilRecipe.Builder.create("aeternium_hoe_head") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_HOE_HEAD) + .setLevel(4) + .setDamage(6) + .build(); + AnvilRecipe.Builder.create("aeternium_hammer_head") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_HAMMER_HEAD) + .setLevel(4) + .setDamage(6) + .build(); + AnvilRecipe.Builder.create("aeternium_sword_blade") + .setInput(EndItems.AETERNIUM_INGOT) + .setOutput(EndItems.AETERNIUM_SWORD_BLADE) + .setLevel(4) + .setDamage(6) + .build(); + } +} diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index c8c5b390..791ea368 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -17,6 +17,15 @@ import ru.betterend.registry.EndTags; public class CraftingRecipes { public static void register() { + if (BetterEnd.hasGuideBook()) { + GridRecipe.make("guide_book", GuideBookItem.GUIDE_BOOK) + .setShape("D", "B", "C") + .addMaterial('D', EndItems.ENDER_DUST) + .addMaterial('B', Items.BOOK) + .addMaterial('C', EndItems.CRYSTAL_SHARDS) + .build(); + } + GridRecipe.make("ender_pearl_to_block", EndBlocks.ENDER_BLOCK) .setShape("OO", "OO") .addMaterial('O', Items.ENDER_PEARL) @@ -79,17 +88,6 @@ public class CraftingRecipes { .setList("#") .build(); - registerHelmet(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HELMET); - registerChestplate(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_CHESTPLATE); - registerLeggings(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_LEGGINGS); - registerBoots(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_BOOTS); - registerShovel(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_SHOVEL); - registerSword(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_SWORD); - registerPickaxe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_PICKAXE); - registerAxe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_AXE); - registerHoe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HOE); - registerHammer(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HAMMER); - registerHammer("iron", Items.IRON_INGOT, EndItems.IRON_HAMMER); registerHammer("golden", Items.GOLD_INGOT, EndItems.GOLDEN_HAMMER); registerHammer("diamond", Items.DIAMOND, EndItems.DIAMOND_HAMMER); @@ -141,15 +139,6 @@ public class CraftingRecipes { .addMaterial('B', EndItems.SHADOW_BERRY_COOKED) .build(); - if (BetterEnd.hasGuideBook()) { - GridRecipe.make("guide_book", GuideBookItem.GUIDE_BOOK) - .setShape("D", "B", "C") - .addMaterial('D', EndItems.ENDER_DUST) - .addMaterial('B', Items.BOOK) - .addMaterial('C', EndItems.CRYSTAL_SHARDS) - .build(); - } - GridRecipe.make("sulphur_gunpowder", Items.GUNPOWDER).setList("SCB").addMaterial('S', EndItems.CRYSTALLINE_SULPHUR).addMaterial('C', Items.COAL, Items.CHARCOAL).addMaterial('B', Items.BONE_MEAL).build(); GridRecipe.make("dense_emerald_ice", EndBlocks.DENSE_EMERALD_ICE).setShape("##", "##").addMaterial('#', EndBlocks.EMERALD_ICE).build(); diff --git a/src/main/java/ru/betterend/recipe/SmithingRecipes.java b/src/main/java/ru/betterend/recipe/SmithingRecipes.java index c5ab7711..43a795f0 100644 --- a/src/main/java/ru/betterend/recipe/SmithingRecipes.java +++ b/src/main/java/ru/betterend/recipe/SmithingRecipes.java @@ -1,47 +1,67 @@ -package ru.betterend.recipe; - -import net.minecraft.item.Items; -import ru.betterend.recipe.builders.AnvilSmithingRecipe; -import ru.betterend.registry.EndItems; - -public class SmithingRecipes { - public static void register() { - AnvilSmithingRecipe.Builder.create("ender_pearl_to_dust") - .setInput(Items.ENDER_PEARL) - .setOutput(EndItems.ENDER_DUST, 1) - .setLevel(4) - .setDamage(5) - .build(); - AnvilSmithingRecipe.Builder.create("ender_shard_to_dust") - .setInput(EndItems.ENDER_SHARD) - .setOutput(EndItems.ENDER_DUST, 1) - .setLevel(2) - .setDamage(3) - .build(); - - AnvilSmithingRecipe.Builder.create("aeternium_axe_head") - .setInput(EndItems.AETERNIUM_INGOT) - .setOutput(EndItems.AETERNIUM_AXE_HEAD, 1) - .setLevel(4) - .setDamage(6) - .build(); - AnvilSmithingRecipe.Builder.create("aeternium_pickaxe_head") - .setInput(EndItems.AETERNIUM_INGOT) - .setOutput(EndItems.AETERNIUM_PICKAXE_HEAD, 1) - .setLevel(4) - .setDamage(6) - .build(); - AnvilSmithingRecipe.Builder.create("aeternium_shovel_head") - .setInput(EndItems.AETERNIUM_INGOT) - .setOutput(EndItems.AETERNIUM_SHOVEL_HEAD, 1) - .setLevel(4) - .setDamage(6) - .build(); - AnvilSmithingRecipe.Builder.create("aeternium_hoe_head") - .setInput(EndItems.AETERNIUM_INGOT) - .setOutput(EndItems.AETERNIUM_HOE_HEAD, 1) - .setLevel(4) - .setDamage(6) - .build(); - } -} +package ru.betterend.recipe; + +import ru.betterend.recipe.builders.SmithingTableRecipe; +import ru.betterend.registry.EndItems; + +public class SmithingRecipes { + + public static void register() { + SmithingTableRecipe.create("aeternium_sword_handle") + .setResult(EndItems.AETERNIUM_SWORD_HANDLE) + .setBase(EndItems.TERMINITE_INGOT) + .setAddition(EndItems.LEATHER_WRAPPED_STICK) + .build(); + + SmithingTableRecipe.create("aeternium_sword") + .setResult(EndItems.AETERNIUM_SWORD) + .setBase(EndItems.AETERNIUM_SWORD_BLADE) + .setAddition(EndItems.AETERNIUM_SWORD_HANDLE) + .build(); + SmithingTableRecipe.create("aeternium_pickaxe") + .setResult(EndItems.AETERNIUM_PICKAXE) + .setBase(EndItems.AETERNIUM_PICKAXE_HEAD) + .setAddition(EndItems.LEATHER_WRAPPED_STICK) + .build(); + SmithingTableRecipe.create("aeternium_axe") + .setResult(EndItems.AETERNIUM_AXE) + .setBase(EndItems.AETERNIUM_AXE_HEAD) + .setAddition(EndItems.LEATHER_WRAPPED_STICK) + .build(); + SmithingTableRecipe.create("aeternium_shovel") + .setResult(EndItems.AETERNIUM_SHOVEL) + .setBase(EndItems.AETERNIUM_SHOVEL_HEAD) + .setAddition(EndItems.LEATHER_WRAPPED_STICK) + .build(); + SmithingTableRecipe.create("aeternium_hoe") + .setResult(EndItems.AETERNIUM_HOE) + .setBase(EndItems.AETERNIUM_HOE_HEAD) + .setAddition(EndItems.LEATHER_WRAPPED_STICK) + .build(); + SmithingTableRecipe.create("aeternium_hammer") + .setResult(EndItems.AETERNIUM_HAMMER) + .setBase(EndItems.AETERNIUM_HAMMER_HEAD) + .setAddition(EndItems.LEATHER_WRAPPED_STICK) + .build(); + + SmithingTableRecipe.create("aeternium_helmet") + .setResult(EndItems.AETERNIUM_HELMET) + .setBase(EndItems.TERMINITE_HELMET) + .setAddition(EndItems.AETERNIUM_INGOT) + .build(); + SmithingTableRecipe.create("aeternium_chestplate") + .setResult(EndItems.AETERNIUM_CHESTPLATE) + .setBase(EndItems.TERMINITE_CHESTPLATE) + .setAddition(EndItems.AETERNIUM_INGOT) + .build(); + SmithingTableRecipe.create("aeternium_leggings") + .setResult(EndItems.AETERNIUM_LEGGINGS) + .setBase(EndItems.TERMINITE_LEGGINGS) + .setAddition(EndItems.AETERNIUM_INGOT) + .build(); + SmithingTableRecipe.create("aeternium_boots") + .setResult(EndItems.AETERNIUM_BOOTS) + .setBase(EndItems.TERMINITE_BOOTS) + .setAddition(EndItems.AETERNIUM_INGOT) + .build(); + } +} diff --git a/src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java b/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java similarity index 76% rename from src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java rename to src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java index fc32a204..3af522cb 100644 --- a/src/main/java/ru/betterend/recipe/builders/AnvilSmithingRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java @@ -1,246 +1,247 @@ -package ru.betterend.recipe.builders; - -import com.google.gson.JsonObject; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolItem; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.RecipeType; -import net.minecraft.tag.Tag; -import net.minecraft.util.Identifier; -import net.minecraft.util.JsonHelper; -import net.minecraft.util.collection.DefaultedList; -import net.minecraft.world.World; -import ru.betterend.BetterEnd; -import ru.betterend.config.Configs; -import ru.betterend.recipe.EndRecipeManager; -import ru.betterend.registry.EndTags; -import ru.betterend.util.ItemUtil; -import ru.betterend.util.RecipeHelper; - -public class AnvilSmithingRecipe implements Recipe { - - public final static String GROUP = "smithing"; - public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); - public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); - public final static Identifier ID = BetterEnd.makeID(GROUP); - - private final Identifier id; - private final Ingredient input; - private final ItemStack output; - private final int damage; - private final int level; - - public AnvilSmithingRecipe(Identifier identifier, Ingredient input, ItemStack output, int level, int damage) { - this.id = identifier; - this.input = input; - this.output = output; - this.level = level; - this.damage = damage; - } - - @Override - public RecipeSerializer getSerializer() { - return SERIALIZER; - } - - @Override - public ItemStack getOutput() { - return this.output; - } - - @Override - public boolean matches(Inventory craftingInventory, World world) { - return this.matches(craftingInventory); - } - - @Override - public ItemStack craft(Inventory craftingInventory) { - return this.output.copy(); - } - - public ItemStack craft(Inventory craftingInventory, PlayerEntity player) { - if (!player.isCreative()) { - ItemStack hammer = craftingInventory.getStack(0); - int damage = hammer.getDamage() + this.damage; - if (damage >= hammer.getMaxDamage()) return ItemStack.EMPTY; - hammer.damage(this.damage, player, entity -> { - entity.sendEquipmentBreakStatus(null); - }); - } - return this.craft(craftingInventory); - } - - public boolean matches(Inventory craftingInventory) { - ItemStack hammer = craftingInventory.getStack(0); - if (hammer.isEmpty() || !EndTags.HAMMERS.contains(hammer.getItem())) { - return false; - } - int level = ((ToolItem) hammer.getItem()).getMaterial().getMiningLevel(); - return level >= this.level && this.input.test(craftingInventory.getStack(1)); - } - - public int getDamage() { - return this.damage; - } - - @Override - public DefaultedList getPreviewInputs() { - DefaultedList defaultedList = DefaultedList.of(); - defaultedList.add(Ingredient.ofStacks(EndTags.HAMMERS.values().stream().filter(hammer -> { - return ((ToolItem) hammer).getMaterial().getMiningLevel() >= level; - }).map(ItemStack::new))); - defaultedList.add(input); - - return defaultedList; - } - - @Override - @Environment(EnvType.CLIENT) - public boolean fits(int width, int height) { - return true; - } - - @Override - public Identifier getId() { - return this.id; - } - - @Override - public RecipeType getType() { - return TYPE; - } - - @Override - public boolean isIgnoredInRecipeBook() { - return true; - } - - public static class Builder { - private final static Builder INSTANCE = new Builder(); - private static boolean exist; - - public static Builder create(String id) { - return create(BetterEnd.makeID(id)); - } - - public static Builder create(Identifier id) { - INSTANCE.id = id; - INSTANCE.input = null; - INSTANCE.output = null; - INSTANCE.level = 1; - INSTANCE.damage = 1; - exist = Configs.RECIPE_CONFIG.getBoolean("anvil", id.getPath(), true); - - return INSTANCE; - } - - private Identifier id; - private Ingredient input; - private ItemStack output; - private int level = 1; - private int damage = 1; - private boolean alright = true; - - private Builder() {} - - public Builder setInput(ItemConvertible... inputItems) { - for (ItemConvertible item : inputItems) { - this.alright &= RecipeHelper.exists(item); - } - this.setInput(Ingredient.ofItems(inputItems)); - return this; - } - - public Builder setInput(Tag inputTag) { - this.setInput(Ingredient.fromTag(inputTag)); - return this; - } - - public Builder setInput(Ingredient ingredient) { - this.input = ingredient; - return this; - } - - public Builder setOutput(ItemConvertible output, int amount) { - this.alright &= RecipeHelper.exists(output); - this.output = new ItemStack(output, amount); - return this; - } - - public Builder setLevel(int level) { - this.level = level; - return this; - } - - public Builder setDamage(int damage) { - this.damage = damage; - return this; - } - - public void build() { - if (exist) { - if (input == null) { - BetterEnd.LOGGER.warning("Input for Smithing recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - if(output == null) { - BetterEnd.LOGGER.warning("Output for Smithing recipe can't be 'null', recipe {} will be ignored!", id); - return; - } - if (EndRecipeManager.getRecipe(TYPE, id) != null) { - BetterEnd.LOGGER.warning("Can't add Smithing recipe! Id {} already exists!", id); - return; - } - if (!alright) { - BetterEnd.LOGGER.debug("Can't add Smithing recipe {}! Ingeredient or output not exists.", id); - return; - } - EndRecipeManager.addRecipe(TYPE, new AnvilSmithingRecipe(id, input, output, level, damage)); - } - } - } - - public static class Serializer implements RecipeSerializer { - @Override - public AnvilSmithingRecipe read(Identifier id, JsonObject json) { - Ingredient input = Ingredient.fromJson(json.get("input")); - JsonObject result = JsonHelper.getObject(json, "result"); - ItemStack output = ItemUtil.fromJsonRecipe(result); - if (output == null) { - throw new IllegalStateException("Output item does not exists!"); - } - int level = JsonHelper.getInt(json, "level", 1); - int damage = JsonHelper.getInt(json, "damage", 1); - - return new AnvilSmithingRecipe(id, input, output, level, damage); - } - - @Override - public AnvilSmithingRecipe read(Identifier id, PacketByteBuf packetBuffer) { - Ingredient input = Ingredient.fromPacket(packetBuffer); - ItemStack output = packetBuffer.readItemStack(); - int level = packetBuffer.readVarInt(); - int damage = packetBuffer.readVarInt(); - - return new AnvilSmithingRecipe(id, input, output, level, damage); - } - - @Override - public void write(PacketByteBuf packetBuffer, AnvilSmithingRecipe recipe) { - recipe.input.write(packetBuffer); - packetBuffer.writeItemStack(recipe.output); - packetBuffer.writeVarInt(recipe.level); - packetBuffer.writeVarInt(recipe.damage); - } - } -} +package ru.betterend.recipe.builders; + +import com.google.gson.JsonObject; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.RecipeType; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; +import net.minecraft.util.JsonHelper; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.World; +import ru.betterend.BetterEnd; +import ru.betterend.config.Configs; +import ru.betterend.recipe.EndRecipeManager; +import ru.betterend.registry.EndTags; +import ru.betterend.util.ItemUtil; +import ru.betterend.util.RecipeHelper; + +public class AnvilRecipe implements Recipe { + + public final static String GROUP = "smithing"; + public final static RecipeType TYPE = EndRecipeManager.registerType(GROUP); + public final static Serializer SERIALIZER = EndRecipeManager.registerSerializer(GROUP, new Serializer()); + public final static Identifier ID = BetterEnd.makeID(GROUP); + + private final Identifier id; + private final Ingredient input; + private final ItemStack output; + private final int damage; + private final int level; + + public AnvilRecipe(Identifier identifier, Ingredient input, ItemStack output, int level, int damage) { + this.id = identifier; + this.input = input; + this.output = output; + this.level = level; + this.damage = damage; + } + + @Override + public RecipeSerializer getSerializer() { + return SERIALIZER; + } + + @Override + public ItemStack getOutput() { + return this.output; + } + + @Override + public boolean matches(Inventory craftingInventory, World world) { + return this.matches(craftingInventory); + } + + @Override + public ItemStack craft(Inventory craftingInventory) { + return this.output.copy(); + } + + public ItemStack craft(Inventory craftingInventory, PlayerEntity player) { + if (!player.isCreative()) { + ItemStack hammer = craftingInventory.getStack(1); + int damage = hammer.getDamage() + this.damage; + if (damage >= hammer.getMaxDamage()) return ItemStack.EMPTY; + hammer.damage(this.damage, player, entity -> { + entity.sendEquipmentBreakStatus(null); + }); + } + return this.craft(craftingInventory); + } + + public boolean matches(Inventory craftingInventory) { + ItemStack hammer = craftingInventory.getStack(1); + if (hammer.isEmpty() || !EndTags.HAMMERS.contains(hammer.getItem())) { + return false; + } + int level = ((ToolItem) hammer.getItem()).getMaterial().getMiningLevel(); + return level >= this.level && this.input.test(craftingInventory.getStack(0)); + } + + public int getDamage() { + return this.damage; + } + + @Override + public DefaultedList getPreviewInputs() { + DefaultedList defaultedList = DefaultedList.of(); + defaultedList.add(Ingredient.ofStacks(EndTags.HAMMERS.values().stream().filter(hammer -> { + return ((ToolItem) hammer).getMaterial().getMiningLevel() >= level; + }).map(ItemStack::new))); + defaultedList.add(input); + + return defaultedList; + } + + @Override + @Environment(EnvType.CLIENT) + public boolean fits(int width, int height) { + return true; + } + + @Override + public Identifier getId() { + return this.id; + } + + @Override + public RecipeType getType() { + return TYPE; + } + + @Override + public boolean isIgnoredInRecipeBook() { + return true; + } + + public static class Builder { + private final static Builder INSTANCE = new Builder(); + + public static Builder create(String id) { + return create(BetterEnd.makeID(id)); + } + + public static Builder create(Identifier id) { + INSTANCE.id = id; + INSTANCE.input = null; + INSTANCE.output = null; + INSTANCE.level = 1; + INSTANCE.damage = 1; + INSTANCE.alright = true; + + return INSTANCE; + } + + private Identifier id; + private Ingredient input; + private ItemStack output; + private int level = 1; + private int damage = 1; + private boolean alright; + + private Builder() {} + + public Builder setInput(ItemConvertible... inputItems) { + this.alright &= RecipeHelper.exists(inputItems); + this.setInput(Ingredient.ofItems(inputItems)); + return this; + } + + public Builder setInput(Tag inputTag) { + this.setInput(Ingredient.fromTag(inputTag)); + return this; + } + + public Builder setInput(Ingredient ingredient) { + this.input = ingredient; + return this; + } + + public Builder setOutput(ItemConvertible output) { + return this.setOutput(output, 1); + } + + public Builder setOutput(ItemConvertible output, int amount) { + this.alright &= RecipeHelper.exists(output); + this.output = new ItemStack(output, amount); + return this; + } + + public Builder setLevel(int level) { + this.level = level; + return this; + } + + public Builder setDamage(int damage) { + this.damage = damage; + return this; + } + + public void build() { + if (Configs.RECIPE_CONFIG.getBoolean("anvil", id.getPath(), true)) { + if (input == null) { + BetterEnd.LOGGER.warning("Input for Anvil recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if(output == null) { + BetterEnd.LOGGER.warning("Output for Anvil recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if (EndRecipeManager.getRecipe(TYPE, id) != null) { + BetterEnd.LOGGER.warning("Can't add Anvil recipe! Id {} already exists!", id); + return; + } + if (!alright) { + BetterEnd.LOGGER.debug("Can't add Anvil recipe {}! Ingeredient or output not exists.", id); + return; + } + EndRecipeManager.addRecipe(TYPE, new AnvilRecipe(id, input, output, level, damage)); + } + } + } + + public static class Serializer implements RecipeSerializer { + @Override + public AnvilRecipe read(Identifier id, JsonObject json) { + Ingredient input = Ingredient.fromJson(json.get("input")); + JsonObject result = JsonHelper.getObject(json, "result"); + ItemStack output = ItemUtil.fromJsonRecipe(result); + if (output == null) { + throw new IllegalStateException("Output item does not exists!"); + } + int level = JsonHelper.getInt(json, "level", 1); + int damage = JsonHelper.getInt(json, "damage", 1); + + return new AnvilRecipe(id, input, output, level, damage); + } + + @Override + public AnvilRecipe read(Identifier id, PacketByteBuf packetBuffer) { + Ingredient input = Ingredient.fromPacket(packetBuffer); + ItemStack output = packetBuffer.readItemStack(); + int level = packetBuffer.readVarInt(); + int damage = packetBuffer.readVarInt(); + + return new AnvilRecipe(id, input, output, level, damage); + } + + @Override + public void write(PacketByteBuf packetBuffer, AnvilRecipe recipe) { + recipe.input.write(packetBuffer); + packetBuffer.writeItemStack(recipe.output); + packetBuffer.writeVarInt(recipe.level); + packetBuffer.writeVarInt(recipe.damage); + } + } +} diff --git a/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java b/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java new file mode 100644 index 00000000..7bde239e --- /dev/null +++ b/src/main/java/ru/betterend/recipe/builders/SmithingTableRecipe.java @@ -0,0 +1,101 @@ +package ru.betterend.recipe.builders; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.RecipeType; +import net.minecraft.recipe.SmithingRecipe; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; + +import ru.betterend.BetterEnd; +import ru.betterend.config.Configs; +import ru.betterend.recipe.EndRecipeManager; +import ru.betterend.util.RecipeHelper; + +public class SmithingTableRecipe { + + private final static SmithingTableRecipe BUILDER = new SmithingTableRecipe(); + private final static RecipeType TYPE = RecipeType.SMITHING; + + public static SmithingTableRecipe create(String name) { + return create(BetterEnd.makeID(name)); + } + + public static SmithingTableRecipe create(Identifier id) { + BUILDER.id = id; + BUILDER.base = null; + BUILDER.addition = null; + BUILDER.result = null; + BUILDER.alright = true; + + return BUILDER; + } + + private Identifier id; + private Ingredient base; + private Ingredient addition; + private ItemStack result; + private boolean alright; + + private SmithingTableRecipe() {} + + public SmithingTableRecipe setResult(ItemConvertible item) { + return this.setResult(item, 1); + } + + public SmithingTableRecipe setResult(ItemConvertible item, int count) { + this.alright &= RecipeHelper.exists(item); + this.result = new ItemStack(item, count); + return this; + } + + public SmithingTableRecipe setBase(ItemConvertible... items) { + this.alright &= RecipeHelper.exists(items); + this.base = Ingredient.ofItems(items); + return this; + } + + public SmithingTableRecipe setBase(Tag tag) { + this.base = (Ingredient.fromTag(tag)); + return this; + } + + public SmithingTableRecipe setAddition(ItemConvertible... items) { + this.alright &= RecipeHelper.exists(items); + this.addition = Ingredient.ofItems(items); + return this; + } + + public SmithingTableRecipe setAddition(Tag tag) { + this.addition = (Ingredient.fromTag(tag)); + return this; + } + + public void build() { + if (Configs.RECIPE_CONFIG.getBoolean("smithing", id.getPath(), true)) { + if (base == null) { + BetterEnd.LOGGER.warning("Base input for Smithing recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if (addition == null) { + BetterEnd.LOGGER.warning("Addition input for Smithing recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if(result == null) { + BetterEnd.LOGGER.warning("Result for Smithing recipe can't be 'null', recipe {} will be ignored!", id); + return; + } + if (EndRecipeManager.getRecipe(TYPE, id) != null) { + BetterEnd.LOGGER.warning("Can't add Smithing recipe! Id {} already exists!", id); + return; + } + if (!alright) { + BetterEnd.LOGGER.debug("Can't add Smithing recipe {}! Ingeredients or output not exists.", id); + return; + } + EndRecipeManager.addRecipe(TYPE, new SmithingRecipe(id, base, addition, result)); + } + } +} diff --git a/src/main/java/ru/betterend/util/RecipeHelper.java b/src/main/java/ru/betterend/util/RecipeHelper.java index 36696623..a95a372c 100644 --- a/src/main/java/ru/betterend/util/RecipeHelper.java +++ b/src/main/java/ru/betterend/util/RecipeHelper.java @@ -12,4 +12,13 @@ public class RecipeHelper { return Registry.ITEM.getId(item.asItem()) != Registry.ITEM.getDefaultId(); } } + + public static boolean exists(ItemConvertible... items) { + for (ItemConvertible item : items) { + if (!exists(item)) { + return false; + } + } + return true; + } } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 50a5a8d4..c55118c5 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -66,6 +66,15 @@ "item.betterend.crystalite_chestplate": "Crystalite Chestplate", "item.betterend.crystalite_helmet": "Crystalite Helmet", "item.betterend.crystalite_leggings": "Crystalite Leggings", + "item.betterend.aeternium_axe_head": "Aeternium Axe Head", + "item.betterend.aeternium_hammer_head": "Aeternium Hammer Head", + "item.betterend.aeternium_hoe_head": "Aeternium Hoe Head", + "item.betterend.aeternium_pickaxe_head": "Aeternium Pickaxe Head", + "item.betterend.aeternium_shovel_head": "Aeternium Shovel Head", + "item.betterend.aeternium_sword_blade": "Aeternium Sword Blade", + "item.betterend.aeternium_sword_handle": "Aeternium Sword Handle", + "item.betterend.leather_stripe": "Leather Stripe", + "item.betterend.leather_wrapped_stick": "Leather Wrapped Stick", "effect.betterend.end_veil": "End Veil", "enchantment.betterend.end_veil": "End Veil", diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 7412bf81..2ede618f 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -66,6 +66,15 @@ "item.betterend.crystalite_chestplate": "Кристалитовая кираса", "item.betterend.crystalite_helmet": "Кристалитовый шлем", "item.betterend.crystalite_leggings": "Кристалитовые поножи", + "item.betterend.aeternium_axe_head": "Навершие Этериевого топора", + "item.betterend.aeternium_hammer_head": "Навершие Этериевого молота", + "item.betterend.aeternium_hoe_head": "Навершие Этериевой мотыги", + "item.betterend.aeternium_pickaxe_head": "Навершие Этериевой кирки", + "item.betterend.aeternium_shovel_head": "Навершие Этериевой лопаты", + "item.betterend.aeternium_sword_blade": "Лезвие Этериевого меча", + "item.betterend.aeternium_sword_handle": "Рукоятка Этериевого меча", + "item.betterend.leather_stripe": "Полоска кожи", + "item.betterend.leather_wrapped_stick": "Обернутая кожей палка", "effect.betterend.end_veil": "Вуаль Края", "enchantment.betterend.end_veil": "Вуаль Края",