diff --git a/gradle.properties b/gradle.properties index f7166e4..1cae749 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G minecraft_version=1.20.1 loader_version=0.14.4 # Mod Properties - mod_version=6.0.0 + mod_version=6.0.1 maven_group=AdditionalAdditions archives_base_name=AdditionalAdditions # Dependencies diff --git a/src/main/java/dqu/additionaladditions/AdditionalAdditions.java b/src/main/java/dqu/additionaladditions/AdditionalAdditions.java index 09ed997..f349d59 100644 --- a/src/main/java/dqu/additionaladditions/AdditionalAdditions.java +++ b/src/main/java/dqu/additionaladditions/AdditionalAdditions.java @@ -3,13 +3,16 @@ import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers; import dqu.additionaladditions.behaviour.BehaviourManager; import dqu.additionaladditions.config.Config; +import dqu.additionaladditions.misc.CreativeAdder; import dqu.additionaladditions.misc.LootHandler; import dqu.additionaladditions.registry.*; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.loot.v2.LootTableEvents; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.server.packs.PackType; +import net.minecraft.world.item.CreativeModeTabs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,6 +37,8 @@ public void onInitialize() { AdditionalPotions.registerAll(); AdditionalMusicDiscs.registerAll(); + addItemsToCreative(); + LootTableEvents.MODIFY.register(((resourceManager, lootManager, id, table, setter) -> { LootHandler.handle(id, table); })); @@ -44,4 +49,14 @@ public void onInitialize() { DynamicLightHandlers.registerDynamicLightHandler(AdditionalEntities.GLOW_STICK_ENTITY_ENTITY_TYPE, entity -> 12); } } + + public void addItemsToCreative() { + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(CreativeAdder.TOOLS_AND_UTILITIES::pushAllTo); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register(CreativeAdder.INGREDIENTS::pushAllTo); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(CreativeAdder.BUILDING_BLOCKS::pushAllTo); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.REDSTONE_BLOCKS).register(CreativeAdder.REDSTONE_BLOCKS::pushAllTo); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FOOD_AND_DRINKS).register(CreativeAdder.FOOD_AND_DRINKS::pushAllTo); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FUNCTIONAL_BLOCKS).register(CreativeAdder.FUNCTIONAL_BLOCKS::pushAllTo); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register(CreativeAdder.COMBAT::pushAllTo); + } } diff --git a/src/main/java/dqu/additionaladditions/misc/CreativeAdder.java b/src/main/java/dqu/additionaladditions/misc/CreativeAdder.java new file mode 100644 index 0000000..d99d63e --- /dev/null +++ b/src/main/java/dqu/additionaladditions/misc/CreativeAdder.java @@ -0,0 +1,47 @@ +package dqu.additionaladditions.misc; + +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries; +import net.minecraft.world.level.ItemLike; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +public enum CreativeAdder { + + TOOLS_AND_UTILITIES(), + INGREDIENTS(), + BUILDING_BLOCKS(), + REDSTONE_BLOCKS(), + FOOD_AND_DRINKS(), + FUNCTIONAL_BLOCKS(), + COMBAT(); + + private final List entries = new ArrayList<>(); + + CreativeAdder() {} + + public void add(Supplier condition, ItemLike after, ItemLike... items) { + CreativeEntry entry = new CreativeEntry(condition, false, after, items); + this.entries.add(entry); + } + + public void addBefore(Supplier condition, ItemLike after, ItemLike... items) { + CreativeEntry entry = new CreativeEntry(condition, true, after, items); + this.entries.add(entry); + } + + public void pushAllTo(FabricItemGroupEntries content) { + for (CreativeEntry entry : entries) { + if (entry.condition.get()) { + if (entry.before) { + content.addBefore(entry.anchor, entry.items); + } else { + content.addAfter(entry.anchor, entry.items); + } + } + } + } + + private record CreativeEntry(Supplier condition, boolean before, ItemLike anchor, ItemLike... items) {} +} diff --git a/src/main/java/dqu/additionaladditions/registry/AdditionalBlocks.java b/src/main/java/dqu/additionaladditions/registry/AdditionalBlocks.java index f3efdbc..278b2d0 100644 --- a/src/main/java/dqu/additionaladditions/registry/AdditionalBlocks.java +++ b/src/main/java/dqu/additionaladditions/registry/AdditionalBlocks.java @@ -9,6 +9,7 @@ import dqu.additionaladditions.config.Config; import dqu.additionaladditions.config.ConfigValues; import dqu.additionaladditions.item.CopperPatinaItem; +import dqu.additionaladditions.misc.CreativeAdder; import dqu.additionaladditions.misc.LootHandler; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; @@ -74,20 +75,12 @@ public static void registerAll() { .add(LootItem.lootTableItem(AdditionalBlocks.ROPE_BLOCK)) ); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.REDSTONE_BLOCKS).register(content -> { - content.addAfter(Items.REDSTONE, COPPER_PATINA); - content.addAfter(Items.REDSTONE_LAMP, AMETHYST_LAMP); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FUNCTIONAL_BLOCKS).register(content -> { - content.addAfter(Items.REDSTONE_LAMP, AMETHYST_LAMP); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(content -> { - content.addAfter(Items.REDSTONE_BLOCK, PATINA_BLOCK); - content.addAfter(Items.CHAIN, ROPE_BLOCK); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> { - content.addAfter(Items.SPYGLASS, ROPE_BLOCK); - }); + CreativeAdder.REDSTONE_BLOCKS.add(() -> Config.getBool(ConfigValues.COPPER_PATINA), Items.REDSTONE_BLOCK, COPPER_PATINA); + CreativeAdder.REDSTONE_BLOCKS.add(() -> Config.getBool(ConfigValues.AMETHYST_LAMP, "enabled"), Items.REDSTONE_LAMP, AMETHYST_LAMP); + CreativeAdder.FUNCTIONAL_BLOCKS.add(() -> Config.getBool(ConfigValues.AMETHYST_LAMP, "enabled"), Items.REDSTONE_LAMP, AMETHYST_LAMP); + CreativeAdder.BUILDING_BLOCKS.add(() -> Config.getBool(ConfigValues.COPPER_PATINA), Items.REDSTONE_BLOCK, PATINA_BLOCK); + CreativeAdder.BUILDING_BLOCKS.add(() -> Config.getBool(ConfigValues.ROPES), Items.CHAIN, ROPE_BLOCK); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.ROPES), Items.SPYGLASS, ROPE_BLOCK); // life is meaningless and we're all gonna die } diff --git a/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java b/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java index 639f74e..58b245b 100644 --- a/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java +++ b/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java @@ -4,9 +4,9 @@ import dqu.additionaladditions.config.Config; import dqu.additionaladditions.config.ConfigValues; import dqu.additionaladditions.item.*; +import dqu.additionaladditions.misc.CreativeAdder; import dqu.additionaladditions.misc.LootHandler; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockSource; @@ -17,7 +17,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.*; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -140,28 +139,21 @@ public ItemStack execute(BlockSource pointer, ItemStack stack) { } private static void putToItemGroups() { - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> { - content.addAfter(Items.BONE_MEAL, WATERING_CAN, WRENCH_ITEM, GLOW_STICK_ITEM); - content.addAfter(Items.CLOCK, DEPTH_METER_ITEM); - content.addAfter(Items.ELYTRA, MYSTERIOUS_BUNDLE_ITEM); - content.addAfter(Items.SPYGLASS, POCKET_JUKEBOX_ITEM); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register(content -> { - content.addBefore(Items.NETHERITE_SCRAP, GOLD_RING, ROSE_GOLD_ALLOY); - content.addAfter(Items.PRISMARINE_CRYSTALS, TRIDENT_SHARD); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.REDSTONE_BLOCKS).register(content -> { - content.addAfter(Blocks.TARGET, WRENCH_ITEM); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register(content -> { - content.addAfter(Items.CROSSBOW, CROSSBOW_WITH_SPYGLASS); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.FOOD_AND_DRINKS).register(content -> { - content.addAfter(Items.COOKED_RABBIT, FRIED_EGG); - content.addAfter(Items.PUMPKIN_PIE, BERRY_PIE); - content.addAfter(Items.APPLE, HONEYED_APPLE); - content.addAfter(Items.ROTTEN_FLESH, CHICKEN_NUGGET); - }); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.WATERING_CAN), Items.BONE_MEAL, WATERING_CAN); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.WRENCH), Items.BONE_MEAL, WRENCH_ITEM); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.GLOW_STICK), Items.BONE_MEAL, GLOW_STICK_ITEM); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.DEPTH_METER, "enabled"), Items.CLOCK, DEPTH_METER_ITEM); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.MYSTERIOUS_BUNDLE), Items.ELYTRA, MYSTERIOUS_BUNDLE_ITEM); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.POCKET_JUKEBOX), Items.SPYGLASS, POCKET_JUKEBOX_ITEM); + CreativeAdder.INGREDIENTS.addBefore(() -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), Items.NETHERITE_SCRAP, GOLD_RING); + CreativeAdder.INGREDIENTS.addBefore(() -> Config.getBool(ConfigValues.ROSE_GOLD), Items.NETHERITE_SCRAP, ROSE_GOLD_ALLOY); + CreativeAdder.INGREDIENTS.add(() -> Config.getBool(ConfigValues.TRIDENT_SHARD), Items.PRISMARINE_CRYSTALS, TRIDENT_SHARD); + CreativeAdder.REDSTONE_BLOCKS.add(() -> Config.getBool(ConfigValues.WRENCH), Items.TARGET, WRENCH_ITEM); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.CROSSBOWS), Items.CROSSBOW, CROSSBOW_WITH_SPYGLASS); + CreativeAdder.FOOD_AND_DRINKS.add(() -> Config.getBool(ConfigValues.FOOD, "FriedEgg"), Items.COOKED_RABBIT, FRIED_EGG); + CreativeAdder.FOOD_AND_DRINKS.add(() -> Config.getBool(ConfigValues.FOOD, "BerryPie"), Items.PUMPKIN_PIE, BERRY_PIE); + CreativeAdder.FOOD_AND_DRINKS.add(() -> Config.getBool(ConfigValues.FOOD, "HoneyedApple"), Items.APPLE, HONEYED_APPLE); + CreativeAdder.FOOD_AND_DRINKS.add(() -> Config.getBool(ConfigValues.CHICKEN_NUGGET), Items.ROTTEN_FLESH, CHICKEN_NUGGET); } public static void registerAll() { diff --git a/src/main/java/dqu/additionaladditions/registry/AdditionalMaterials.java b/src/main/java/dqu/additionaladditions/registry/AdditionalMaterials.java index e58ac30..d10d25f 100644 --- a/src/main/java/dqu/additionaladditions/registry/AdditionalMaterials.java +++ b/src/main/java/dqu/additionaladditions/registry/AdditionalMaterials.java @@ -5,6 +5,7 @@ import dqu.additionaladditions.config.ConfigValues; import dqu.additionaladditions.item.*; import dqu.additionaladditions.material.*; +import dqu.additionaladditions.misc.CreativeAdder; import dqu.additionaladditions.misc.LootHandler; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.core.Registry; @@ -79,20 +80,15 @@ public static void registerAll() { .add(LootItem.lootTableItem(GILDED_NETHERITE_UPGRADE)) ); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> { - content.addAfter(Items.GOLDEN_HOE, ROSE_GOLD_SHOVEL, ROSE_GOLD_PICKAXE, ROSE_GOLD_AXE, ROSE_GOLD_HOE); - content.addAfter(Items.NETHERITE_HOE, GILDED_NETHERITE_SHOVEL, GILDED_NETHERITE_PICKAXE, GILDED_NETHERITE_AXE, GILDED_NETHERITE_HOE); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register(content -> { - content.addAfter(Items.GOLDEN_SWORD, ROSE_GOLD_SWORD); - content.addAfter(Items.NETHERITE_SWORD, GILDED_NETHERITE_SWORD); - content.addAfter(Items.GOLDEN_AXE, ROSE_GOLD_AXE); - content.addAfter(Items.NETHERITE_AXE, GILDED_NETHERITE_AXE); - content.addAfter(Items.GOLDEN_BOOTS, ROSE_GOLD_HELMET, ROSE_GOLD_CHESTPLATE, ROSE_GOLD_LEGGINGS, ROSE_GOLD_BOOTS); - content.addAfter(Items.NETHERITE_BOOTS, GILDED_NETHERITE_HELMET, GILDED_NETHERITE_CHESTPLATE, GILDED_NETHERITE_LEGGINGS, GILDED_NETHERITE_BOOTS); - }); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register(content -> { - content.addAfter(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, GILDED_NETHERITE_UPGRADE, ROSE_GOLD_UPGRADE); - }); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.ROSE_GOLD), Items.GOLDEN_HOE, ROSE_GOLD_SHOVEL, ROSE_GOLD_PICKAXE, ROSE_GOLD_AXE, ROSE_GOLD_HOE); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), Items.NETHERITE_HOE, GILDED_NETHERITE_SHOVEL, GILDED_NETHERITE_PICKAXE, GILDED_NETHERITE_AXE, GILDED_NETHERITE_HOE); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.ROSE_GOLD), Items.GOLDEN_SWORD, ROSE_GOLD_SWORD); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.ROSE_GOLD), Items.GOLDEN_AXE, ROSE_GOLD_AXE); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.ROSE_GOLD), Items.GOLDEN_BOOTS, ROSE_GOLD_HELMET, ROSE_GOLD_CHESTPLATE, ROSE_GOLD_LEGGINGS, ROSE_GOLD_BOOTS); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), Items.NETHERITE_SWORD, GILDED_NETHERITE_SWORD); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), Items.NETHERITE_AXE, GILDED_NETHERITE_AXE); + CreativeAdder.COMBAT.add(() -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), Items.NETHERITE_BOOTS, GILDED_NETHERITE_HELMET, GILDED_NETHERITE_CHESTPLATE, GILDED_NETHERITE_LEGGINGS, GILDED_NETHERITE_BOOTS); + CreativeAdder.INGREDIENTS.add(() -> Config.getBool(ConfigValues.ROSE_GOLD), Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, ROSE_GOLD_UPGRADE); + CreativeAdder.INGREDIENTS.add(() -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, GILDED_NETHERITE_UPGRADE); } } diff --git a/src/main/java/dqu/additionaladditions/registry/AdditionalMusicDiscs.java b/src/main/java/dqu/additionaladditions/registry/AdditionalMusicDiscs.java index 16b182d..5d44042 100644 --- a/src/main/java/dqu/additionaladditions/registry/AdditionalMusicDiscs.java +++ b/src/main/java/dqu/additionaladditions/registry/AdditionalMusicDiscs.java @@ -1,7 +1,10 @@ package dqu.additionaladditions.registry; import dqu.additionaladditions.AdditionalAdditions; +import dqu.additionaladditions.config.Config; +import dqu.additionaladditions.config.ConfigValues; import dqu.additionaladditions.item.AdditionalMusicDiscItem; +import dqu.additionaladditions.misc.CreativeAdder; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; @@ -33,9 +36,7 @@ private static void registerDiscs() { Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(AdditionalAdditions.namespace, "music_disc_1007"), MUSIC_DISC_1007); Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(AdditionalAdditions.namespace, "music_disc_1507"), MUSIC_DISC_1507); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> { - content.addAfter(Items.MUSIC_DISC_WAIT, MUSIC_DISC_0308, MUSIC_DISC_1007, MUSIC_DISC_1507); - }); + CreativeAdder.TOOLS_AND_UTILITIES.add(() -> Config.getBool(ConfigValues.MUSIC_DISCS), Items.MUSIC_DISC_WAIT, MUSIC_DISC_0308, MUSIC_DISC_1007, MUSIC_DISC_1507); } public static void registerAll() { diff --git a/src/main/resources/assets/additionaladditions/lang/de_de.json b/src/main/resources/assets/additionaladditions/lang/de_de.json index bb5b906..5d9b3cc 100644 --- a/src/main/resources/assets/additionaladditions/lang/de_de.json +++ b/src/main/resources/assets/additionaladditions/lang/de_de.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Süßbeerenkuchen", "item.additionaladditions.watering_can": "Gießkanne", "item.additionaladditions.crossbow_with_spyglass": "Armbrust mit Fernrohr", + "item.additionaladditions.rose_gold_sword": "Roségoldschwert", "item.additionaladditions.rose_gold_axe": "Roségoldaxt", "item.additionaladditions.rose_gold_pickaxe": "Roségoldspitzhacke", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Roségoldharnisch", "item.additionaladditions.rose_gold_leggings": "Roségoldbeinschutz", "item.additionaladditions.rose_gold_boots": "Roségoldstiefel", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Schraubenschlüssel", "item.additionaladditions.fried_egg": "Spiegelei", "item.additionaladditions.trident_shard": "Dreizack-Splitter", "item.additionaladditions.glow_stick": "Leuchtstab", "item.additionaladditions.honeyed_apple": "Honigapfel", "item.additionaladditions.depth_meter": "Tiefenmesser", + "item.additionaladditions.gilded_netherite_sword": "Vergoldetes Netheritschwert", "item.additionaladditions.gilded_netherite_axe": "Vergoldete Netheritaxt", "item.additionaladditions.gilded_netherite_pickaxe": "Vergoldete Netheritspitzhacke", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Vergoldeter Netheritharnisch", "item.additionaladditions.gilded_netherite_leggings": "Vergoldeter Netheritbeinschutz", "item.additionaladditions.gilded_netherite_boots": "Vergoldete Netheritstiefel", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Schallplatte", "item.additionaladditions.music_disc_1007": "Schallplatte", "item.additionaladditions.music_disc_1507": "Schallplatte", diff --git a/src/main/resources/assets/additionaladditions/lang/es_es.json b/src/main/resources/assets/additionaladditions/lang/es_es.json index 8c59326..5306de9 100644 --- a/src/main/resources/assets/additionaladditions/lang/es_es.json +++ b/src/main/resources/assets/additionaladditions/lang/es_es.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Pastel dulce", "item.additionaladditions.watering_can": "Regadera", "item.additionaladditions.crossbow_with_spyglass": "Ballesta con catalejo", + "item.additionaladditions.rose_gold_sword": "Espada de oro rosa", "item.additionaladditions.rose_gold_axe": "Hacha de oro rosa", "item.additionaladditions.rose_gold_pickaxe": "Pico de oro rosa", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Peto de oro rosa", "item.additionaladditions.rose_gold_leggings": "Grebas de oro rosa", "item.additionaladditions.rose_gold_boots": "Botas de oro rosa", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Llave de tuerca", "item.additionaladditions.fried_egg": "Huevo frito", "item.additionaladditions.trident_shard": "Punta de tridente", "item.additionaladditions.glow_stick": "Fluorescente", "item.additionaladditions.honeyed_apple": "Manzana con miel", "item.additionaladditions.depth_meter": "Barómetro", + "item.additionaladditions.gilded_netherite_sword": "Espada de netherita áurea", "item.additionaladditions.gilded_netherite_axe": "Hacha de netherita áurea", "item.additionaladditions.gilded_netherite_pickaxe": "Pico de netherita áurea", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Peto de netherita áurea", "item.additionaladditions.gilded_netherite_leggings": "Grebas de netherita áurea", "item.additionaladditions.gilded_netherite_boots": "Botas de netherita áurea", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Disco de música", "item.additionaladditions.music_disc_1007": "Disco de música", "item.additionaladditions.music_disc_1507": "Disco de música", diff --git a/src/main/resources/assets/additionaladditions/lang/id_id.json b/src/main/resources/assets/additionaladditions/lang/id_id.json index 50e9cf8..b46aa80 100644 --- a/src/main/resources/assets/additionaladditions/lang/id_id.json +++ b/src/main/resources/assets/additionaladditions/lang/id_id.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Pai Beri Manis", "item.additionaladditions.watering_can": "Penyiram", "item.additionaladditions.crossbow_with_spyglass": "Busur Silang dengan Teropong", + "item.additionaladditions.rose_gold_sword": "Pedang Emas Mawar", "item.additionaladditions.rose_gold_axe": "Kapak Emas Mawar", "item.additionaladditions.rose_gold_pickaxe": "Beliung Emas Mawar", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Baju Emas Mawar", "item.additionaladditions.rose_gold_leggings": "Celana Emas Mawar", "item.additionaladditions.rose_gold_boots": "Sepatu Emas Mawar", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Kunci", "item.additionaladditions.fried_egg": "Telur Mata Sapi", "item.additionaladditions.trident_shard": "Pecahan Trisula", "item.additionaladditions.glow_stick": "Stik Cahaya", "item.additionaladditions.honeyed_apple": "Apel Madu", "item.additionaladditions.depth_meter": "Pengukur Kedalaman", + "item.additionaladditions.gilded_netherite_sword": "Pedang Neterit Berlapis Emas", "item.additionaladditions.gilded_netherite_axe": "Kapak Neterit Berlapis Emas", "item.additionaladditions.gilded_netherite_pickaxe": "Beliung Neterit Berlapis Emas", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Baju Neterit Berlapis Emas", "item.additionaladditions.gilded_netherite_leggings": "Celana Neterit Berlapis Emas", "item.additionaladditions.gilded_netherite_boots": "Sepatu Neterit Berlapis Emas", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Cakram Musik", "item.additionaladditions.music_disc_1007": "Cakram Musik", "item.additionaladditions.music_disc_1507": "Cakram Musik", diff --git a/src/main/resources/assets/additionaladditions/lang/ko_kr.json b/src/main/resources/assets/additionaladditions/lang/ko_kr.json index 1e92871..e1d3292 100644 --- a/src/main/resources/assets/additionaladditions/lang/ko_kr.json +++ b/src/main/resources/assets/additionaladditions/lang/ko_kr.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "달콤한 열매 파이", "item.additionaladditions.watering_can": "물뿌리게", "item.additionaladditions.crossbow_with_spyglass": "석궁과 망원경", + "item.additionaladditions.rose_gold_sword": "로즈 골드 검", "item.additionaladditions.rose_gold_axe": "로즈 골드 도끼", "item.additionaladditions.rose_gold_pickaxe": "로즈 골드 곡괭이", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "로즈 골드 흉갑", "item.additionaladditions.rose_gold_leggings": "로즈 골드 각반", "item.additionaladditions.rose_gold_boots": "로즈 골드 부츠", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "렌치", "item.additionaladditions.fried_egg": "게란 후라이", "item.additionaladditions.trident_shard": "삼지창 조각", "item.additionaladditions.glow_stick": "발광 막대기", "item.additionaladditions.honeyed_apple": "꿀 사과", "item.additionaladditions.depth_meter": "깊이 미터", + "item.additionaladditions.gilded_netherite_sword": "금이 박힌 네더라이트 검", "item.additionaladditions.gilded_netherite_axe": "금이 박힌 네더라이트 도끼", "item.additionaladditions.gilded_netherite_pickaxe": "금이 박힌 네더라이트 곡괭이", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "금이 박힌 네더라이트 흉갑", "item.additionaladditions.gilded_netherite_leggings": "금이 박힌 네더라이트 각반", "item.additionaladditions.gilded_netherite_boots": "금이 박힌 네더라이트 부츠", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "뮤직 디스크", "item.additionaladditions.music_disc_1007": "뮤직 디스크", "item.additionaladditions.music_disc_1507": "뮤직 디스크", diff --git a/src/main/resources/assets/additionaladditions/lang/pl_pl.json b/src/main/resources/assets/additionaladditions/lang/pl_pl.json index 3c40175..711338a 100644 --- a/src/main/resources/assets/additionaladditions/lang/pl_pl.json +++ b/src/main/resources/assets/additionaladditions/lang/pl_pl.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Ciasto jagodowe", "item.additionaladditions.watering_can": "Konewka", "item.additionaladditions.crossbow_with_spyglass": "Kusza z lunetą", + "item.additionaladditions.rose_gold_sword": "Różowo złoty miecz", "item.additionaladditions.rose_gold_axe": "Różowo złoty topór", "item.additionaladditions.rose_gold_pickaxe": "Różowo złoty kilof", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Różowo złoty napierśnik", "item.additionaladditions.rose_gold_leggings": "Różowo złote spodnie", "item.additionaladditions.rose_gold_boots": "Różowo złote buty", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Klucz francuski", "item.additionaladditions.fried_egg": "Jajko sadzone", "item.additionaladditions.trident_shard": "Odłamek trójzębu", "item.additionaladditions.glow_stick": "Świetliki", "item.additionaladditions.honeyed_apple": "Jabłko w miodzie", "item.additionaladditions.depth_meter": "Głębokościomierz", + "item.additionaladditions.gilded_netherite_sword": "Pozłacany netheritowy miecz", "item.additionaladditions.gilded_netherite_axe": "Pozłacany netheritowy siekiera", "item.additionaladditions.gilded_netherite_pickaxe": "Pozłacany netheritowy kilof", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Pozłacany netheritowy napierśnik", "item.additionaladditions.gilded_netherite_leggings": "Pozłacane netheritowe spodnie", "item.additionaladditions.gilded_netherite_boots": "Pozłacane netheritowe buty", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Płyta muzyczna", "item.additionaladditions.music_disc_1007": "Płyta muzyczna", "item.additionaladditions.music_disc_1507": "Płyta muzyczna", diff --git a/src/main/resources/assets/additionaladditions/lang/pt_br.json b/src/main/resources/assets/additionaladditions/lang/pt_br.json index 24dcb6a..d51bf28 100644 --- a/src/main/resources/assets/additionaladditions/lang/pt_br.json +++ b/src/main/resources/assets/additionaladditions/lang/pt_br.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Torta de bagas doces", "item.additionaladditions.watering_can": "Regador", "item.additionaladditions.crossbow_with_spyglass": "Besta com luneta", + "item.additionaladditions.rose_gold_sword": "Espada de ouro rosa", "item.additionaladditions.rose_gold_axe": "Machado de ouro rosa", "item.additionaladditions.rose_gold_pickaxe": "Picareta de ouro rosa", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Peitoral de ouro rosa", "item.additionaladditions.rose_gold_leggings": "Calças de ouro rosa", "item.additionaladditions.rose_gold_boots": "Botas de ouro rosa", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Chave inglesa", "item.additionaladditions.fried_egg": "Ovo frito", "item.additionaladditions.trident_shard": "Fragmento de tridente", "item.additionaladditions.glow_stick": "Vareta luminosa", "item.additionaladditions.honeyed_apple": "Maçã com mel", "item.additionaladditions.depth_meter": "Medidor de profundidade", + "item.additionaladditions.gilded_netherite_sword": "Espada de netherita dourada", "item.additionaladditions.gilded_netherite_axe": "Machado de netherita dourada", "item.additionaladditions.gilded_netherite_pickaxe": "Picareta de netherita dourada", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Peitoral de netherita dourada", "item.additionaladditions.gilded_netherite_leggings": "Calças de netherita dourada", "item.additionaladditions.gilded_netherite_boots": "Botas de netherita dourada", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Disco musical", "item.additionaladditions.music_disc_1007": "Disco musical", "item.additionaladditions.music_disc_1507": "Disco musical", diff --git a/src/main/resources/assets/additionaladditions/lang/pt_pt.json b/src/main/resources/assets/additionaladditions/lang/pt_pt.json index befa24f..89e44c0 100644 --- a/src/main/resources/assets/additionaladditions/lang/pt_pt.json +++ b/src/main/resources/assets/additionaladditions/lang/pt_pt.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Tarte de bagas doces", "item.additionaladditions.watering_can": "Regador", "item.additionaladditions.crossbow_with_spyglass": "Besta com luneta", + "item.additionaladditions.rose_gold_sword": "Espada de ouro rosa", "item.additionaladditions.rose_gold_axe": "Machado de ouro rosa", "item.additionaladditions.rose_gold_pickaxe": "Picareta de ouro rosa", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Peitoral de ouro rosa", "item.additionaladditions.rose_gold_leggings": "Calças de ouro rosa", "item.additionaladditions.rose_gold_boots": "Botas de ouro rosa", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Chave inglesa", "item.additionaladditions.fried_egg": "Ovo frito", "item.additionaladditions.trident_shard": "Fragmento de tridente", "item.additionaladditions.glow_stick": "Vareta luminosa", "item.additionaladditions.honeyed_apple": "Maçã com mel", "item.additionaladditions.depth_meter": "Medidor de profundidade", + "item.additionaladditions.gilded_netherite_sword": "Espada de netherita dourada", "item.additionaladditions.gilded_netherite_axe": "Machado de netherita dourada", "item.additionaladditions.gilded_netherite_pickaxe": "Picareta de netherita dourada", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Peitoral de netherita dourada", "item.additionaladditions.gilded_netherite_leggings": "Calças de netherita dourada", "item.additionaladditions.gilded_netherite_boots": "Botas de netherita dourada", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Disco musical", "item.additionaladditions.music_disc_1007": "Disco musical", "item.additionaladditions.music_disc_1507": "Disco musical", diff --git a/src/main/resources/assets/additionaladditions/lang/ro_ro.json b/src/main/resources/assets/additionaladditions/lang/ro_ro.json index 091b8d4..813b5d3 100644 --- a/src/main/resources/assets/additionaladditions/lang/ro_ro.json +++ b/src/main/resources/assets/additionaladditions/lang/ro_ro.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Plăcintă cu fructe de pădure dulci", "item.additionaladditions.watering_can": "Stropitoare", "item.additionaladditions.crossbow_with_spyglass": "Arbaletă cu ochean", + "item.additionaladditions.rose_gold_sword": "Sabie de aur roz", "item.additionaladditions.rose_gold_axe": "Topor de aur roz", "item.additionaladditions.rose_gold_pickaxe": "Târnăcop de aur roz", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Platoşă de aur roz", "item.additionaladditions.rose_gold_leggings": "Jambiere de aur roz", "item.additionaladditions.rose_gold_boots": "Cizme de aur roz", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Cheie franceză", "item.additionaladditions.fried_egg": "Ou prăjit", "item.additionaladditions.trident_shard": "Ciob de trident", "item.additionaladditions.glow_stick": "Baton luminos", "item.additionaladditions.honeyed_apple": "Măr glazurat cu miere", "item.additionaladditions.depth_meter": "Metru de adâncime", + "item.additionaladditions.gilded_netherite_sword": "Sabie de netherit aurit", "item.additionaladditions.gilded_netherite_axe": "Topor de netherit aurit", "item.additionaladditions.gilded_netherite_pickaxe": "Târnăcop de netherit aurit", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Platoşă de netherit aurit", "item.additionaladditions.gilded_netherite_leggings": "Jambiere de netherit aurit", "item.additionaladditions.gilded_netherite_boots": "Cizme de netherit aurit", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Disc muzical", "item.additionaladditions.music_disc_1007": "Disc muzical", "item.additionaladditions.music_disc_1507": "Disc muzical", diff --git a/src/main/resources/assets/additionaladditions/lang/rpr.json b/src/main/resources/assets/additionaladditions/lang/rpr.json deleted file mode 100644 index a35fe0d..0000000 --- a/src/main/resources/assets/additionaladditions/lang/rpr.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "item.additionaladditions.berry_pie": "Пирогъ изъ Сладкихъ Ягодъ", - "item.additionaladditions.watering_can": "Лейка", - "item.additionaladditions.crossbow_with_spyglass": "Самострѣлъ съ Подзорной Трубой", - "item.additionaladditions.rose_gold_sword": "Мечъ изъ Розоваго Золота", - "item.additionaladditions.rose_gold_axe": "Топоръ изъ Розоваго Золота", - "item.additionaladditions.rose_gold_pickaxe": "Кирка из Розового Золота", - "item.additionaladditions.rose_gold_shovel": "Лопата изъ Розоваго Золота", - "item.additionaladditions.rose_gold_hoe": "Мотыга изъ Розоваго Золота", - "item.additionaladditions.rose_gold_helmet": "Шлемъ изъ Розоваго Золота", - "item.additionaladditions.rose_gold_chestplate": "Нагрудникъ изъ Розоваго Золота", - "item.additionaladditions.rose_gold_leggings": "Поножи изъ Розоваго Золота", - "item.additionaladditions.rose_gold_boots": "Ботинки изъ Розоваго Золота", - "item.additionaladditions.wrench": "Гаечный Ключъ", - "item.additionaladditions.fried_egg": "Жареное Яйцо", - "item.additionaladditions.trident_shard": "Осколокъ Трезубца", - "item.additionaladditions.glow_stick": "Свѣтящаяся Палочка", - "item.additionaladditions.honeyed_apple": "Медовое Яблоко", - "item.additionaladditions.depth_meter": "Глубомѣръ", - "item.additionaladditions.gilded_netherite_sword": "Мечъ Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_axe": "Топоръ Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_pickaxe": "Кирка Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_shovel": "Лопата Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_hoe": "Мотыга Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_helmet": "Шлемъ Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_chestplate": "Нагрудникъ Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_leggings": "Поножи Позолоченнаго Нѣдрита", - "item.additionaladditions.gilded_netherite_boots": "Ботинки Позолоченнаго Нѣдрита", - "item.additionaladditions.music_disc_0308": "Пластинка", - "item.additionaladditions.music_disc_1007": "Пластинка", - "item.additionaladditions.music_disc_1507": "Пластинка", - "item.additionaladditions.music_disc_0308.desc": "adoghr - 0308", - "item.additionaladditions.music_disc_1007.desc": "adoghr - 1007", - "item.additionaladditions.music_disc_1507.desc": "adoghr - 1507", - "item.additionaladditions.mysterious_bundle": "Таинственный Мѣшокъ", - "item.additionaladditions.pocket_jukebox": "Карманный Проигрыватель", - "item.additionaladditions.chicken_nugget": "Куриный Наггетсъ", - "item.additionaladditions.gold_ring": "Золотое Кольцо", - "item.additionaladditions.rose_gold_alloy": "Сплав Розового Золота", - "block.additionaladditions.glow_stick": "Свѣтящаяся Палочка", - "block.additionaladditions.copper_patina": "Мѣдная Патина", - "block.additionaladditions.rope": "Веревка", - "block.additionaladditions.amethyst_lamp": "Аметистовый Фонарь", - "block.additionaladditions.patina_block": "Блокъ Патины", - "enchantment.additionaladditions.precision": "Мѣткость", - "enchantment.additionaladditions.precision.desc": "Улучшаетъ точность арбалета.", - "enchantment.additionaladditions.speed": "Рѣзвость", - "enchantment.additionaladditions.speed.desc": "Увеличиваетъ скорость передвиженія.", - "entity.additionaladditions.glow_stick": "Свѣтящаяся Палочка", - - "depth_meter.elevation": "Высота: %s", - - "item.minecraft.potion.effect.haste_potion": "Снадобье Спѣшки", - "item.minecraft.potion.effect.long_haste_potion": "Снадобье Спѣшки", - "item.minecraft.potion.effect.strong_haste_potion": "Снадобье Спѣшки", - "item.minecraft.splash_potion.effect.haste_potion": "Взрывное Снадобье Спѣшки", - "item.minecraft.splash_potion.effect.long_haste_potion": "Взрывное Снадобье Спѣшки", - "item.minecraft.splash_potion.effect.strong_haste_potion": "Взрывное Снадобье Спѣшки", - "item.minecraft.lingering_potion.effect.haste_potion": "Туманное Снадобье Спѣшки", - "item.minecraft.lingering_potion.effect.long_haste_potion": "Туманное Снадобье Спѣшки", - "item.minecraft.lingering_potion.effect.strong_haste_potion": "Туманное Снадобье Спѣшки", - "item.minecraft.tipped_arrow.effect.haste_potion": "Стрѣла Спѣшки", - "item.minecraft.tipped_arrow.effect.long_haste_potion": "Стрѣла Спѣшки", - "item.minecraft.tipped_arrow.effect.strong_haste_potion": "Стрѣла Спѣшки", - - "additionaladditions.advancements.obtain_adoghr_disc": "adoghr", - "additionaladditions.advancements.obtain_adoghr_disc.desc": "Найдите одну изъ пластинокъ adoghr", - "additionaladditions.advancements.obtain_chicken_nugget": "Курица или Яйцо? Наггетсъ!", - "additionaladditions.advancements.obtain_chicken_nugget.desc": "Поймайте дикій Куриный Наггетсъ", - "additionaladditions.advancements.obtain_gilded_netherite": "Позолоченный", - "additionaladditions.advancements.obtain_gilded_netherite.desc": "Получите Позолоченную Нѣдритовую броню", - "additionaladditions.advancements.obtain_glow_stick": "Да будетъ свѣтъ!", - "additionaladditions.advancements.obtain_glow_stick.desc": "Получите Свѣтящуюся Палочку чтобы освѣщать пещеры", - "additionaladditions.advancements.obtain_mysterious_bundle": "Котъ въ Мѣшкѣ", - "additionaladditions.advancements.obtain_mysterious_bundle.desc": "Пріобрѣтите Таинственный Мѣшокъ у Странствующаго Торговца", - "additionaladditions.advancements.obtain_pocket_jukebox": "Музыка для моихъ ушей", - "additionaladditions.advancements.obtain_pocket_jukebox.desc": "Создайте Карманный Проигрыватель чтобы слушать музыку на ходу", - "additionaladditions.advancements.obtain_rose_gold": "Gold n' Roses", - "additionaladditions.advancements.obtain_rose_gold.desc": "Создайте броню изъ Розоваго Золота", - "additionaladditions.advancements.obtain_scoped_crossbow": "Хитмэнъ", - "additionaladditions.advancements.obtain_scoped_crossbow.desc": "Создайте Арбалетъ съ Подзорной Трубой", - "additionaladditions.advancements.shot_self_scoped_crossbow": "Самозанятый Хитмэнъ", - "additionaladditions.advancements.shot_self_scoped_crossbow.desc": "Попадите въ себя своей же стрѣлой используя Арбалетъ съ Подзорной Трубой", - "additionaladditions.advancements.use_watering_can": "Лей ка", - "additionaladditions.advancements.use_watering_can.desc": "Используйте Лейку чтобы удобрять растенія", - - "additionaladditions.gui.config.restart": "Перезапустите игру чтобы примѣнить измѣненія", - "additionaladditions.gui.pocket_jukebox.tooltip": "Вторичный Кликъ пластинкой чтобы играть" -} \ No newline at end of file diff --git a/src/main/resources/assets/additionaladditions/lang/ru_ru.json b/src/main/resources/assets/additionaladditions/lang/ru_ru.json index cac5a4b..fc20697 100644 --- a/src/main/resources/assets/additionaladditions/lang/ru_ru.json +++ b/src/main/resources/assets/additionaladditions/lang/ru_ru.json @@ -4,6 +4,13 @@ "item.additionaladditions.crossbow_with_spyglass": "Арбалет с подзорной трубой", "item.additionaladditions.rose_gold_sword": "Меч из розового золота", "item.additionaladditions.rose_gold_axe": "Топор из розового золота", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.rose_gold_pickaxe": "Кирка из розового золота", "item.additionaladditions.rose_gold_shovel": "Лопата из розового золота", "item.additionaladditions.rose_gold_hoe": "Мотыга из розового золота", @@ -17,6 +24,7 @@ "item.additionaladditions.glow_stick": "Светящаяся палочка", "item.additionaladditions.honeyed_apple": "Яблоко в меду", "item.additionaladditions.depth_meter": "Глубиномер", + "item.additionaladditions.gilded_netherite_sword": "Позолоченный незеритовый меч", "item.additionaladditions.gilded_netherite_axe": "Позолоченный незеритовый топор", "item.additionaladditions.gilded_netherite_pickaxe": "Позолоченная незеритовая кирка", @@ -26,6 +34,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Позолоченный незеритовый нагрудник", "item.additionaladditions.gilded_netherite_leggings": "Позолоченные незеритовые поножи", "item.additionaladditions.gilded_netherite_boots": "Позолоченные незеритовые ботинки", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Пластинка", "item.additionaladditions.music_disc_1007": "Пластинка", "item.additionaladditions.music_disc_1507": "Пластинка", diff --git a/src/main/resources/assets/additionaladditions/lang/uk_ua.json b/src/main/resources/assets/additionaladditions/lang/uk_ua.json index 75831d1..4ca8adf 100644 --- a/src/main/resources/assets/additionaladditions/lang/uk_ua.json +++ b/src/main/resources/assets/additionaladditions/lang/uk_ua.json @@ -2,6 +2,13 @@ "item.additionaladditions.berry_pie": "Пиріг із солодких ягід", "item.additionaladditions.watering_can": "Лійка", "item.additionaladditions.crossbow_with_spyglass": "Арбалет з підзорною трубою", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Розмістіть сплав рожевого золота", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Залізне спорядження", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Розмістіть залізні обладунки, зброю або інструмент", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Сплав рожевого золота", + "upgrade.additionaladditions.rose_gold_upgrade": "Покращення з рожевого золота", + "item.additionaladditions.rose_gold_sword": "Меч з рожевого золота", "item.additionaladditions.rose_gold_axe": "Сокира з рожевого золота", "item.additionaladditions.rose_gold_pickaxe": "Кайло з рожевого золота", @@ -17,6 +24,7 @@ "item.additionaladditions.glow_stick": "Неонова палиця", "item.additionaladditions.honeyed_apple": "Медове яблуко", "item.additionaladditions.depth_meter": "Глибиномір", + "item.additionaladditions.gilded_netherite_sword": "Позолочений меч", "item.additionaladditions.gilded_netherite_axe": "Позолочена сокира", "item.additionaladditions.gilded_netherite_pickaxe": "Позолочене кайло", @@ -26,6 +34,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Позолочений нагрудник", "item.additionaladditions.gilded_netherite_leggings": "Позолочені наголінники", "item.additionaladditions.gilded_netherite_boots": "Позолочені чоботи", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Розмістіть золоте кільце", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Незеритове спорядження", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Розмістіть незеритові обладунки, зброю або інструмент", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Золоте кільце", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Позолочене покращення", + "item.additionaladditions.music_disc_0308": "Платівка", "item.additionaladditions.music_disc_1007": "Платівка", "item.additionaladditions.music_disc_1507": "Платівка", @@ -36,6 +51,7 @@ "item.additionaladditions.pocket_jukebox": "Кишеньковий програвач", "item.additionaladditions.chicken_nugget": "Курячий наггетс", "item.additionaladditions.gold_ring": "Золоте кільце", + "item.additionaladditions.rose_gold_alloy": "Сплав рожевого золота", "block.additionaladditions.glow_stick": "Неонова палиця", "block.additionaladditions.copper_patina": "Мідна патина", "block.additionaladditions.rope": "Мотузка", diff --git a/src/main/resources/assets/additionaladditions/lang/vi_vn.json b/src/main/resources/assets/additionaladditions/lang/vi_vn.json index 17d699f..8c10b09 100644 --- a/src/main/resources/assets/additionaladditions/lang/vi_vn.json +++ b/src/main/resources/assets/additionaladditions/lang/vi_vn.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "Bánh quả mọng", "item.additionaladditions.watering_can": "Bình tưới nước", "item.additionaladditions.crossbow_with_spyglass": "Nỏ với ống ngắm", + "item.additionaladditions.rose_gold_sword": "Kiếm vàng hồng", "item.additionaladditions.rose_gold_axe": "Rìu vàng hồng", "item.additionaladditions.rose_gold_pickaxe": "Cúp vàng hồng", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "Áo vàng hồng", "item.additionaladditions.rose_gold_leggings": "Quần vàng hồng", "item.additionaladditions.rose_gold_boots": "Ủng vàng hồng", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "Cờ lê", "item.additionaladditions.fried_egg": "Trứng chiên", "item.additionaladditions.trident_shard": "Mảnh đinh ba", "item.additionaladditions.glow_stick": "Gậy phát sáng", "item.additionaladditions.honeyed_apple": "Táo phủ mật ong", "item.additionaladditions.depth_meter": "Máy đo độ sâu", + "item.additionaladditions.gilded_netherite_sword": "Kiếm Netherit mạ vàng", "item.additionaladditions.gilded_netherite_axe": "Rìu Netherit mạ vàng", "item.additionaladditions.gilded_netherite_pickaxe": "Cúp Netherit mạ vàng", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "Áo Netherit mạ vàng", "item.additionaladditions.gilded_netherite_leggings": "Quần Netherit mạ vàng", "item.additionaladditions.gilded_netherite_boots": "Ủng Netherit mạ vàng", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "Đĩa nhạc", "item.additionaladditions.music_disc_1007": "Đĩa nhạc", "item.additionaladditions.music_disc_1507": "Đĩa nhạc", diff --git a/src/main/resources/assets/additionaladditions/lang/zh_cn.json b/src/main/resources/assets/additionaladditions/lang/zh_cn.json index 69b9b04..718731d 100644 --- a/src/main/resources/assets/additionaladditions/lang/zh_cn.json +++ b/src/main/resources/assets/additionaladditions/lang/zh_cn.json @@ -2,6 +2,7 @@ "item.additionaladditions.berry_pie": "甜浆果派", "item.additionaladditions.watering_can": "水壶", "item.additionaladditions.crossbow_with_spyglass": "带有瞄准镜的弩", + "item.additionaladditions.rose_gold_sword": "玫瑰金剑", "item.additionaladditions.rose_gold_axe": "玫瑰金斧", "item.additionaladditions.rose_gold_pickaxe": "玫瑰金镐", @@ -11,12 +12,20 @@ "item.additionaladditions.rose_gold_chestplate": "玫瑰金胸甲", "item.additionaladditions.rose_gold_leggings": "玫瑰金护腿", "item.additionaladditions.rose_gold_boots": "玫瑰金靴子", + + "item.additionaladditions.smithing_template.rose_gold_upgrade.additions_slot_description": "Add Rose Gold Alloy", + "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Iron Equipment", + "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Add iron armor, weapon, or tool", + "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Rose Gold Alloy", + "upgrade.additionaladditions.rose_gold_upgrade": "Rose Gold Upgrade", + "item.additionaladditions.wrench": "扳手", "item.additionaladditions.fried_egg": "煎鸡蛋", "item.additionaladditions.trident_shard": "三叉戟碎片", "item.additionaladditions.glow_stick": "荧光棒", "item.additionaladditions.honeyed_apple": "蜜饯苹果", "item.additionaladditions.depth_meter": "深度计", + "item.additionaladditions.gilded_netherite_sword": "镶金的下界合金剑", "item.additionaladditions.gilded_netherite_axe": "镶金的下界合金斧", "item.additionaladditions.gilded_netherite_pickaxe": "镶金的下界合金镐", @@ -26,6 +35,13 @@ "item.additionaladditions.gilded_netherite_chestplate": "镶金的下界合金胸甲", "item.additionaladditions.gilded_netherite_leggings": "镶金的下界合金护腿", "item.additionaladditions.gilded_netherite_boots": "镶金的下界合金靴子", + + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.additions_slot_description": "Add Gold Ring", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netherite Equipment", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Add netherite armor, weapon, or tool", + "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Gold Ring", + "upgrade.additionaladditions.gilded_netherite_upgrade": "Gilded Netherite Upgrade", + "item.additionaladditions.music_disc_0308": "音乐唱片", "item.additionaladditions.music_disc_1007": "音乐唱片", "item.additionaladditions.music_disc_1507": "音乐唱片", diff --git a/src/main/resources/assets/additionaladditions/textures/item/gilded_netherite_upgrade.png b/src/main/resources/assets/additionaladditions/textures/item/gilded_netherite_upgrade.png index 074dce9..4c9f073 100644 Binary files a/src/main/resources/assets/additionaladditions/textures/item/gilded_netherite_upgrade.png and b/src/main/resources/assets/additionaladditions/textures/item/gilded_netherite_upgrade.png differ diff --git a/src/main/resources/data/additionaladditions/recipes/gilded_netherite_upgrade.json b/src/main/resources/data/additionaladditions/recipes/gilded_netherite_upgrade.json new file mode 100644 index 0000000..e26befc --- /dev/null +++ b/src/main/resources/data/additionaladditions/recipes/gilded_netherite_upgrade.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:diamond" + }, + "C": { + "item": "minecraft:blackstone" + }, + "S": { + "item": "additionaladditions:gilded_netherite_upgrade" + } + }, + "pattern": [ + "#S#", + "#C#", + "###" + ], + "result": { + "count": 2, + "item": "additionaladditions:gilded_netherite_upgrade" + }, + "show_notification": true +} diff --git a/src/main/resources/data/additionaladditions/recipes/rose_gold_upgrade.json b/src/main/resources/data/additionaladditions/recipes/rose_gold_upgrade.json new file mode 100644 index 0000000..8074b02 --- /dev/null +++ b/src/main/resources/data/additionaladditions/recipes/rose_gold_upgrade.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:diamond" + }, + "C": { + "item": "minecraft:cobblestone" + }, + "S": { + "item": "additionaladditions:rose_gold_upgrade" + } + }, + "pattern": [ + "#S#", + "#C#", + "###" + ], + "result": { + "count": 2, + "item": "additionaladditions:rose_gold_upgrade" + }, + "show_notification": true +} diff --git a/src/main/resources/data/minecraft/tags/items/trimmable_armor.json b/src/main/resources/data/minecraft/tags/items/trimmable_armor.json new file mode 100644 index 0000000..f73a871 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/trimmable_armor.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + {"id": "additionaladditions:gilded_netherite_helmet", "required": false}, + {"id": "additionaladditions:gilded_netherite_chestplate", "required": false}, + {"id": "additionaladditions:gilded_netherite_leggings", "required": false}, + {"id": "additionaladditions:gilded_netherite_boots", "required": false}, + + {"id": "additionaladditions:rose_gold_helmet", "required": false}, + {"id": "additionaladditions:rose_gold_chestplate", "required": false}, + {"id": "additionaladditions:rose_gold_leggings", "required": false}, + {"id": "additionaladditions:rose_gold_boots", "required": false} + ] +} \ No newline at end of file