diff --git a/build.gradle b/build.gradle index 4a6f9a15..9af39314 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,7 @@ def useApi(String dep) { exclude group: "me.shedaniel" } } + dependencies.include(dep) } processResources { diff --git a/src/main/java/ru/betterend/item/GuideBook.java b/src/main/java/ru/betterend/item/GuideBook.java index 13dc2a60..3cc7eae5 100644 --- a/src/main/java/ru/betterend/item/GuideBook.java +++ b/src/main/java/ru/betterend/item/GuideBook.java @@ -6,21 +6,21 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Style; import net.minecraft.text.Text; -import net.minecraft.text.TextColor; -import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; + import ru.betterend.BetterEnd; import ru.betterend.registry.EndItems; +import ru.betterend.util.LangUtil; + import vazkii.patchouli.api.PatchouliAPI; public class GuideBook extends PatternedItem { - private static final Style TEXT_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0x7e6b9a)).withItalic(true); public final static Identifier BOOK_ID = BetterEnd.makeID("guidebook"); public GuideBook() { @@ -29,7 +29,7 @@ public class GuideBook extends PatternedItem { @Override public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - if (!world.isClient && user instanceof ServerPlayerEntity) { + if (!world.isClient && user instanceof ServerPlayerEntity) { PatchouliAPI.get().openBookGUI((ServerPlayerEntity) user, BOOK_ID); return TypedActionResult.success(user.getStackInHand(hand)); } @@ -38,6 +38,6 @@ public class GuideBook extends PatternedItem { @Override public void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context) { - tooltip.add(new TranslatableText("book.betterend.subtitle").setStyle(TEXT_STYLE)); + tooltip.add(LangUtil.getText("book.betterend", "subtitle").formatted(Formatting.DARK_PURPLE, Formatting.ITALIC)); } } diff --git a/src/main/java/ru/betterend/recipe/SmithingRecipes.java b/src/main/java/ru/betterend/recipe/SmithingRecipes.java index f5e92d89..369236f2 100644 --- a/src/main/java/ru/betterend/recipe/SmithingRecipes.java +++ b/src/main/java/ru/betterend/recipe/SmithingRecipes.java @@ -7,10 +7,16 @@ import ru.betterend.registry.EndItems; public class SmithingRecipes { public static void register() { AnvilSmithingRecipe.Builder.create("ender_pearl_to_dust") - .setInput(Items.ENDER_PEARL, EndItems.ENDER_SHARD) + .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(); } } diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 6ad9eb7a..8e096744 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -106,7 +106,8 @@ public class EndItems { // Other // public static final Item ETERNAL_CRYSTAL = registerItem("eternal_crystal", new EternalCrystal()); - public static final Item GUIDE_BOOK = registerItem(GuideBook.BOOK_ID, new GuideBook()); + public static final Item GUIDE_BOOK = EndItems.registerItem(GuideBook.BOOK_ID, new GuideBook()); + protected static Item registerItem(String name) { return registerItem(BetterEnd.makeID(name), new PatternedItem(makeItemSettings())); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 016df9e3..f57c2432 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -3,7 +3,7 @@ "itemGroup.betterend.end_blocks": "Better End: Blocks", "item.betterend.guidebook": "The End for Dummies", - "book.betterend.landing_text": "A short guide about surviving in the extreme conditions of The End.", + "book.betterend.landing": "A short guide about surviving in the extreme conditions of The End.", "book.betterend.subtitle": "Survive in The End", "category.rei.damage.amount&dmg": "Tool damage: %s", diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 21227a8f..26ab6d19 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -3,7 +3,7 @@ "itemGroup.betterend.end_blocks": "Better End: Блоки", "item.betterend.guidebook": "Край для чайников", - "book.betterend.landing_text": "Краткое руководство по выживанию в экстремальных условиях Края.", + "book.betterend.landing": "Краткое руководство по выживанию в экстремальных условиях Края.", "book.betterend.subtitle": "Выживание в Краю", "category.rei.damage.amount&dmg": "Износ инструмента: %s", diff --git a/src/main/resources/assets/betterend/models/item/guide_book.json b/src/main/resources/assets/betterend/models/item/guidebook.json similarity index 100% rename from src/main/resources/assets/betterend/models/item/guide_book.json rename to src/main/resources/assets/betterend/models/item/guidebook.json diff --git a/src/main/resources/data/betterend/patchouli_books/the_end_for_dummies/book.json b/src/main/resources/data/betterend/patchouli_books/guidebook/book.json similarity index 63% rename from src/main/resources/data/betterend/patchouli_books/the_end_for_dummies/book.json rename to src/main/resources/data/betterend/patchouli_books/guidebook/book.json index c5acfc3b..6fcf2591 100644 --- a/src/main/resources/data/betterend/patchouli_books/the_end_for_dummies/book.json +++ b/src/main/resources/data/betterend/patchouli_books/guidebook/book.json @@ -1,10 +1,11 @@ { "name": "item.betterend.guidebook", - "landing_text": "book.betterend.landing_text", "subtitle": "book.betterend.subtitle", - "creative_tab": "betterend.end_items", + "landing_text": "book.betterend.landing", "custom_book_item": "betterend:guidebook", - "model": "betterend:guide_book", + "book_texture": "patchouli:textures/gui/book_green.png", + "creative_tab": "betterend.end_items", + "model": "betterend:guidebook", "dont_generate_book": true, "show_progress": false, "version": 1