diff --git a/src/main/java/ru/betterend/item/EternalCrystal.java b/src/main/java/ru/betterend/item/EternalCrystal.java index 9d2cf07b..f233bacf 100644 --- a/src/main/java/ru/betterend/item/EternalCrystal.java +++ b/src/main/java/ru/betterend/item/EternalCrystal.java @@ -1,18 +1,10 @@ package ru.betterend.item; -import net.minecraft.item.Item; -import ru.betterend.patterns.Patterned; -import ru.betterend.patterns.Patterns; import ru.betterend.registry.EndItems; -public class EternalCrystal extends Item implements Patterned { +public class EternalCrystal extends PatternedItem { public EternalCrystal() { super(EndItems.makeSettings()); } - - @Override - public String getModelPattern(String name) { - return Patterns.createJson(Patterns.ITEM_GENERATED, name); - } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/item/PatternedItem.java b/src/main/java/ru/betterend/item/PatternedItem.java new file mode 100644 index 00000000..c2b8eeff --- /dev/null +++ b/src/main/java/ru/betterend/item/PatternedItem.java @@ -0,0 +1,16 @@ +package ru.betterend.item; + +import net.minecraft.item.Item; +import ru.betterend.patterns.Patterned; +import ru.betterend.patterns.Patterns; + +public class PatternedItem extends Item implements Patterned { + public PatternedItem(Settings settings) { + super(settings); + } + + @Override + public String getModelPattern(String name) { + return Patterns.createJson(Patterns.ITEM_GENERATED, name); + } +} diff --git a/src/main/java/ru/betterend/recipe/InfusionRecipes.java b/src/main/java/ru/betterend/recipe/InfusionRecipes.java index 14d8b67e..f365e231 100644 --- a/src/main/java/ru/betterend/recipe/InfusionRecipes.java +++ b/src/main/java/ru/betterend/recipe/InfusionRecipes.java @@ -24,10 +24,10 @@ public class InfusionRecipes { .addCatalyst(2, EndItems.CRYSTAL_SHARDS) .addCatalyst(4, EndItems.CRYSTAL_SHARDS) .addCatalyst(6, EndItems.CRYSTAL_SHARDS) - .addCatalyst(1, EndItems.ENDER_DUST) - .addCatalyst(3, EndItems.ENDER_DUST) - .addCatalyst(5, EndItems.ENDER_DUST) - .addCatalyst(7, EndItems.ENDER_DUST) + .addCatalyst(1, EndItems.ENDER_SHARD) + .addCatalyst(3, EndItems.ENDER_SHARD) + .addCatalyst(5, EndItems.ENDER_SHARD) + .addCatalyst(7, EndItems.ENDER_SHARD) .setTime(250) .build(); diff --git a/src/main/java/ru/betterend/recipe/SmithingRecipes.java b/src/main/java/ru/betterend/recipe/SmithingRecipes.java index da3a04f0..f5e92d89 100644 --- a/src/main/java/ru/betterend/recipe/SmithingRecipes.java +++ b/src/main/java/ru/betterend/recipe/SmithingRecipes.java @@ -7,7 +7,7 @@ import ru.betterend.registry.EndItems; public class SmithingRecipes { public static void register() { AnvilSmithingRecipe.Builder.create("ender_pearl_to_dust") - .setInput(Items.ENDER_PEARL) + .setInput(Items.ENDER_PEARL, EndItems.ENDER_SHARD) .setOutput(EndItems.ENDER_DUST, 1) .setLevel(4) .setDamage(5) diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index a6834dcf..dff1f275 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -182,7 +182,7 @@ public class EndBlocks { public static final Block BULB_VINE = registerBlock("bulb_vine", new BlockBulbVine()); // Ores // - public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(EndItems.ENDER_DUST, 1, 3, 5)); + public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(EndItems.ENDER_SHARD, 1, 3, 5)); public static final Block AMBER_ORE = registerBlock("amber_ore", new BlockOre(EndItems.RAW_AMBER, 1, 2, 4)); // Materials // diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 62c811f4..d06c933f 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -40,6 +40,7 @@ import ru.betterend.item.EndHoe; import ru.betterend.item.EndPickaxe; import ru.betterend.item.EndToolMaterial; import ru.betterend.item.EternalCrystal; +import ru.betterend.item.PatternedItem; import ru.betterend.tab.CreativeTab; import ru.betterend.util.TagHelper; @@ -51,6 +52,7 @@ public class EndItems { // Materials // public final static Item ENDER_DUST = registerItem("ender_dust"); + public final static Item ENDER_SHARD = registerItem("ender_shard"); public final static Item TERMINITE_INGOT = registerItem("terminite_ingot"); public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot"); public final static Item END_LILY_LEAF = registerItem("end_lily_leaf"); @@ -104,7 +106,7 @@ public class EndItems { public static final Item ETERNAL_CRYSTAL = registerItem("eternal_crystal", new EternalCrystal()); protected static Item registerItem(String name) { - return registerItem(BetterEnd.makeID(name), new Item(makeSettings())); + return registerItem(BetterEnd.makeID(name), new PatternedItem(makeSettings())); } protected static Item registerItem(String name, Item item) { diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 8c544af4..09754d89 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -30,6 +30,7 @@ "block.betterend.end_stone_smelter": "End Stone Smelter", "item.betterend.ender_dust": "Ender Dust", + "item.betterend.ender_shard": "Ender Shard", "item.betterend.terminite_ingot": "Terminite Ingot", "item.betterend.aeternium_ingot": "Aeternium Ingot", "item.betterend.terminite_helmet": "Terminite Helmet", @@ -56,6 +57,10 @@ "item.betterend.golden_hammer": "Golden Smith Hammer", "item.betterend.diamond_hammer": "Diamond Smith Hammer", "item.betterend.netherite_hammer": "Netherite Smith Hammer", + "item.betterend.crystalite_boots": "Crystalite Boots", + "item.betterend.crystalite_chestplate": "Crystalite Chestplate", + "item.betterend.crystalite_helmet": "Crystalite Helmet", + "item.betterend.crystalite_leggings": "Crystalite Leggings", "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 8464489a..4650be78 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -30,6 +30,7 @@ "block.betterend.end_stone_smelter": "Плавильня из камня Края", "item.betterend.ender_dust": "Пыль Края", + "item.betterend.ender_shard": "Осколок Края", "item.betterend.terminite_ingot": "Слиток Терминита", "item.betterend.aeternium_ingot": "Этериевый слиток", "item.betterend.terminite_helmet": "Шлем из Терминита", @@ -56,6 +57,10 @@ "item.betterend.golden_hammer": "Золотой Кузнечный Молот", "item.betterend.diamond_hammer": "Алмазный Кузнечный Молот", "item.betterend.netherite_hammer": "Кузнечный Молот из Незерита", + "item.betterend.crystalite_boots": "Кристалитовые сапоги", + "item.betterend.crystalite_chestplate": "Кристалитовая кираса", + "item.betterend.crystalite_helmet": "Кристалитовый шлем", + "item.betterend.crystalite_leggings": "Кристалитовые поножи", "effect.betterend.end_veil": "Вуаль Края", "enchantment.betterend.end_veil": "Вуаль Края", diff --git a/src/main/resources/assets/betterend/textures/item/ender_shard.png b/src/main/resources/assets/betterend/textures/item/ender_shard.png new file mode 100644 index 00000000..fecf3ae0 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/ender_shard.png differ