diff --git a/build.gradle b/build.gradle index 2549581..7076899 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.5-SNAPSHOT' id 'io.github.juuxel.loom-quiltflower' version '1.7.1' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 1cae749..ea24330 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,14 +2,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.20.1 + minecraft_version=1.20.4 loader_version=0.14.4 # Mod Properties - mod_version=6.0.1 + mod_version=6.0.2 maven_group=AdditionalAdditions archives_base_name=AdditionalAdditions # Dependencies - fabric_version=0.85.0+1.20.1 - modmenu_version=7.1.0 - libgui_version=8.0.1+1.20 + fabric_version=0.96.0+1.20.4 + modmenu_version=9.0.0 + libgui_version=9.2.2+1.20.2 lambdynamiclights_version=2.3.1+1.20.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a..db9a6b8 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/dqu/additionaladditions/block/GlowStickBlock.java b/src/main/java/dqu/additionaladditions/block/GlowStickBlock.java index 78bbb69..9b75366 100644 --- a/src/main/java/dqu/additionaladditions/block/GlowStickBlock.java +++ b/src/main/java/dqu/additionaladditions/block/GlowStickBlock.java @@ -1,9 +1,11 @@ package dqu.additionaladditions.block; +import com.mojang.serialization.MapCodec; import dqu.additionaladditions.registry.AdditionalItems; import net.minecraft.core.BlockPos; import net.minecraft.world.item.Item; import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.AnvilBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FallingBlock; import net.minecraft.world.level.block.state.BlockState; @@ -16,12 +18,18 @@ public class GlowStickBlock extends FallingBlock { public static final VoxelShape shape = Block.box(2, 0, 2,14, 2, 14); public static final BooleanProperty FLIPPED = BooleanProperty.create("flipped"); + public static final MapCodec CODEC = simpleCodec(GlowStickBlock::new); public GlowStickBlock(Properties settings) { super(settings); registerDefaultState(getStateDefinition().any().setValue(FLIPPED, false)); } + @Override + protected MapCodec codec() { + return CODEC; + } + @Override protected void createBlockStateDefinition(StateDefinition.Builder stateManager) { stateManager.add(FLIPPED); diff --git a/src/main/java/dqu/additionaladditions/block/PatinaBlock.java b/src/main/java/dqu/additionaladditions/block/PatinaBlock.java index 9e94f56..b75a9c0 100644 --- a/src/main/java/dqu/additionaladditions/block/PatinaBlock.java +++ b/src/main/java/dqu/additionaladditions/block/PatinaBlock.java @@ -1,8 +1,16 @@ package dqu.additionaladditions.block; +import com.mojang.serialization.MapCodec; import net.minecraft.world.level.block.FallingBlock; public class PatinaBlock extends FallingBlock { + public static final MapCodec CODEC = simpleCodec(PatinaBlock::new); + + @Override + protected MapCodec codec() { + return CODEC; + } + public PatinaBlock(Properties properties) { super(properties); } diff --git a/src/main/java/dqu/additionaladditions/gui/ConfigGui.java b/src/main/java/dqu/additionaladditions/gui/ConfigGui.java index 0805f36..c12c03d 100644 --- a/src/main/java/dqu/additionaladditions/gui/ConfigGui.java +++ b/src/main/java/dqu/additionaladditions/gui/ConfigGui.java @@ -11,12 +11,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.network.chat.contents.TranslatableContents; public class ConfigGui extends LightweightGuiDescription { private static final Component OPTION_DONE = MutableComponent.create(new TranslatableContents("gui.done", null, new String[]{})); - private static final Component SCREEN_TITLE = MutableComponent.create(new LiteralContents("Additional Additions ")).withStyle(ChatFormatting.BOLD).append(MutableComponent.create(new LiteralContents("options.title"))); + private static final Component SCREEN_TITLE = MutableComponent.create(new PlainTextContents.LiteralContents("Additional Additions ")).withStyle(ChatFormatting.BOLD).append(MutableComponent.create(new PlainTextContents.LiteralContents("options.title"))); public ConfigGui() { WGridPanel root = (WGridPanel) rootPanel; @@ -27,12 +27,12 @@ public ConfigGui() { for (ConfigValues value : ConfigValues.values()) { if (value.getType() == ConfigValueType.BOOLEAN) { - WToggleButton button = new WToggleButton(MutableComponent.create(new LiteralContents(value.getProperty().key()))); + WToggleButton button = new WToggleButton(MutableComponent.create(new PlainTextContents.LiteralContents(value.getProperty().key()))); button.setToggle(Config.getBool(value)); button.setOnToggle(on -> Config.set(value, on)); box.add(button); } else { - WLabel text = new WLabel(MutableComponent.create(new LiteralContents(value.getProperty().key() + " | Unable to manage ingame. Edit in file instead."))); + WLabel text = new WLabel(MutableComponent.create(new PlainTextContents.LiteralContents(value.getProperty().key() + " | Unable to manage ingame. Edit in file instead."))); box.add(text); } } diff --git a/src/main/java/dqu/additionaladditions/gui/ConfirmGui.java b/src/main/java/dqu/additionaladditions/gui/ConfirmGui.java index 79d0b3e..2cb9c10 100644 --- a/src/main/java/dqu/additionaladditions/gui/ConfirmGui.java +++ b/src/main/java/dqu/additionaladditions/gui/ConfirmGui.java @@ -9,11 +9,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.network.chat.contents.TranslatableContents; public class ConfirmGui extends LightweightGuiDescription { - private static final Component SCREEN_TITLE = MutableComponent.create(new LiteralContents("Additional Additions ")).withStyle(ChatFormatting.BOLD); + private static final Component SCREEN_TITLE = MutableComponent.create(new PlainTextContents.LiteralContents("Additional Additions ")).withStyle(ChatFormatting.BOLD); private static final Component OPTION_DONE = MutableComponent.create(new TranslatableContents("gui.done", null, new String[]{})); private static final Component DESCRIPTION = MutableComponent.create(new TranslatableContents("additionaladditions.gui.config.restart", null, new String[]{})); diff --git a/src/main/java/dqu/additionaladditions/item/WateringCanItem.java b/src/main/java/dqu/additionaladditions/item/WateringCanItem.java index 43de58e..2efb3c8 100644 --- a/src/main/java/dqu/additionaladditions/item/WateringCanItem.java +++ b/src/main/java/dqu/additionaladditions/item/WateringCanItem.java @@ -75,7 +75,7 @@ public InteractionResultHolder use(Level world, Player player, Intera fluid.getPickupSound().ifPresent((sound) -> player.playSound(sound, 1.0F, 1.0F)); if (!world.isClientSide()) { stack.setDamageValue(100); - fluid.pickupBlock(world, pos, state); + fluid.pickupBlock(player, world, pos, state); player.swing(hand); } return InteractionResultHolder.success(stack); diff --git a/src/main/java/dqu/additionaladditions/mixin/AxeItemMixin.java b/src/main/java/dqu/additionaladditions/mixin/AxeItemMixin.java index 12621bf..d59a35c 100644 --- a/src/main/java/dqu/additionaladditions/mixin/AxeItemMixin.java +++ b/src/main/java/dqu/additionaladditions/mixin/AxeItemMixin.java @@ -22,8 +22,8 @@ @Mixin(AxeItem.class) public class AxeItemMixin { - @Inject(method = "useOn", at = @At(value = "FIELD", target = "Lnet/minecraft/sounds/SoundEvents;AXE_SCRAPE:Lnet/minecraft/sounds/SoundEvent;"), locals = LocalCapture.CAPTURE_FAILSOFT) - private void spawnCopperPatina(UseOnContext iuc, CallbackInfoReturnable cir, Level world, BlockPos blockPos, Player playerEntity, BlockState blockState, Optional optional, Optional optional2, Optional optional3, ItemStack itemStack, Optional optional4) { + @Inject(method = "evaluateNewBlockState", at = @At(value = "FIELD", target = "Lnet/minecraft/sounds/SoundEvents;AXE_SCRAPE:Lnet/minecraft/sounds/SoundEvent;"), locals = LocalCapture.CAPTURE_FAILSOFT) + private void spawnCopperPatina(Level world, BlockPos blockPos, Player player, BlockState blockState, CallbackInfoReturnable> cir, Optional optional, Optional optional2) { if (!Config.getBool(ConfigValues.COPPER_PATINA)) return; ItemStack stack = new ItemStack(AdditionalBlocks.COPPER_PATINA); ItemEntity itemEntity = new ItemEntity(world, blockPos.getX(), blockPos.getY(), blockPos.getZ(), stack); diff --git a/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java b/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java index 58b245b..b6dd465 100644 --- a/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java +++ b/src/main/java/dqu/additionaladditions/registry/AdditionalItems.java @@ -9,8 +9,8 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.minecraft.core.BlockPos; -import net.minecraft.core.BlockSource; import net.minecraft.core.Registry; +import net.minecraft.core.dispenser.BlockSource; import net.minecraft.core.dispenser.DefaultDispenseItemBehavior; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; @@ -112,7 +112,7 @@ private static void registerLootTables() { .when(LootItemRandomChanceWithLootingCondition.randomChanceAndLootingBoost(0.025f, 0.01f)) .add(LootItem.lootTableItem(CHICKEN_NUGGET)) ); - LootHandler.register(BuiltInLootTables.PIGLIN_BARTERING, () -> Config.getBool(ConfigValues.GILDED_NETHERITE), LootPool.lootPool() + LootHandler.register(BuiltInLootTables.PIGLIN_BARTERING, () -> Config.getBool(ConfigValues.GILDED_NETHERITE, "enabled"), LootPool.lootPool() .setRolls(ConstantValue.exactly(1)) .when(LootItemRandomChanceCondition.randomChance(0.015f)) .add(LootItem.lootTableItem(GOLD_RING)) @@ -125,11 +125,11 @@ private static void registerOther() { public ItemStack execute(BlockSource pointer, ItemStack stack) { WrenchItem wrench = (WrenchItem) stack.getItem(); - BlockState dstate = pointer.getBlockState(); - BlockPos pos = pointer.getPos().relative(dstate.getValue(BlockStateProperties.FACING)); - BlockState state = pointer.getLevel().getBlockState(pos); + BlockState dstate = pointer.state(); + BlockPos pos = pointer.pos().relative(dstate.getValue(BlockStateProperties.FACING)); + BlockState state = pointer.level().getBlockState(pos); - wrench.dispenserUse(pointer.getLevel(), pos, state, stack); + wrench.dispenserUse(pointer.level(), pos, state, stack); return stack; } }); diff --git a/src/main/resources/assets/additionaladditions/lang/cs_cz.json b/src/main/resources/assets/additionaladditions/lang/cs_cz.json index 3a2314a..481a1be 100644 --- a/src/main/resources/assets/additionaladditions/lang/cs_cz.json +++ b/src/main/resources/assets/additionaladditions/lang/cs_cz.json @@ -15,7 +15,7 @@ "item.additionaladditions.smithing_template.rose_gold_upgrade.applies_to": "Železné Vybavení", "item.additionaladditions.smithing_template.rose_gold_upgrade.base_slot_description": "Přidej železnou zbroj, zbraň nebo nástroj", "item.additionaladditions.smithing_template.rose_gold_upgrade.ingredients": "Slitina Růžového Zlata", - "upgrade.additionaladditions.rose_gold_upgrade": "Růžově Zlaté Vylepšení", + "item.additionaladditions.rose_gold_upgrade": "Růžově Zlaté Vylepšení", "item.additionaladditions.wrench": "Klíč", "item.additionaladditions.fried_egg": "Smažené Vejce", "item.additionaladditions.trident_shard": "Úlomek Trojzubce", @@ -35,7 +35,7 @@ "item.additionaladditions.smithing_template.gilded_netherite_upgrade.applies_to": "Netheritové Vybavení", "item.additionaladditions.smithing_template.gilded_netherite_upgrade.base_slot_description": "Přidej Netheritovou Zbroj, Zbraň nebo Nástroj", "item.additionaladditions.smithing_template.gilded_netherite_upgrade.ingredients": "Zlatý Prsten", - "upgrade.additionaladditions.gilded_netherite_upgrade": "Pozlacené Netheritové Vylepšení", + "item.additionaladditions.gilded_netherite_upgrade": "Pozlacené Netheritové Vylepšení", "item.additionaladditions.music_disc_0308": "Gramofonová Deska", "item.additionaladditions.music_disc_1007": "Gramofonová Deska", "item.additionaladditions.music_disc_1507": "Gramofonová Deska", diff --git a/src/main/resources/assets/additionaladditions/lang/de_de.json b/src/main/resources/assets/additionaladditions/lang/de_de.json index 5d9b3cc..5cc8dcc 100644 --- a/src/main/resources/assets/additionaladditions/lang/de_de.json +++ b/src/main/resources/assets/additionaladditions/lang/de_de.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Schraubenschlüssel", "item.additionaladditions.fried_egg": "Spiegelei", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Schallplatte", "item.additionaladditions.music_disc_1007": "Schallplatte", diff --git a/src/main/resources/assets/additionaladditions/lang/en_us.json b/src/main/resources/assets/additionaladditions/lang/en_us.json index 44babe3..b16dc4e 100644 --- a/src/main/resources/assets/additionaladditions/lang/en_us.json +++ b/src/main/resources/assets/additionaladditions/lang/en_us.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Wrench", "item.additionaladditions.fried_egg": "Fried Egg", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Music Disc", "item.additionaladditions.music_disc_1007": "Music Disc", diff --git a/src/main/resources/assets/additionaladditions/lang/es_es.json b/src/main/resources/assets/additionaladditions/lang/es_es.json index 5306de9..a3b6d65 100644 --- a/src/main/resources/assets/additionaladditions/lang/es_es.json +++ b/src/main/resources/assets/additionaladditions/lang/es_es.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Llave de tuerca", "item.additionaladditions.fried_egg": "Huevo frito", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Disco de música", "item.additionaladditions.music_disc_1007": "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 b46aa80..199f003 100644 --- a/src/main/resources/assets/additionaladditions/lang/id_id.json +++ b/src/main/resources/assets/additionaladditions/lang/id_id.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Kunci", "item.additionaladditions.fried_egg": "Telur Mata Sapi", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Cakram Musik", "item.additionaladditions.music_disc_1007": "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 bd1f1af..89b1971 100644 --- a/src/main/resources/assets/additionaladditions/lang/ko_kr.json +++ b/src/main/resources/assets/additionaladditions/lang/ko_kr.json @@ -17,7 +17,7 @@ "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_upgrade": "로즈 골드 강화", "item.additionaladditions.wrench": "렌치", "item.additionaladditions.fried_egg": "계란 프라이", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "황금이 박힌 네더라이트 강화", "item.additionaladditions.music_disc_0308": "음반", "item.additionaladditions.music_disc_1007": "음반", diff --git a/src/main/resources/assets/additionaladditions/lang/pl_pl.json b/src/main/resources/assets/additionaladditions/lang/pl_pl.json index 711338a..ff87039 100644 --- a/src/main/resources/assets/additionaladditions/lang/pl_pl.json +++ b/src/main/resources/assets/additionaladditions/lang/pl_pl.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Klucz francuski", "item.additionaladditions.fried_egg": "Jajko sadzone", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Płyta muzyczna", "item.additionaladditions.music_disc_1007": "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 d51bf28..36274c5 100644 --- a/src/main/resources/assets/additionaladditions/lang/pt_br.json +++ b/src/main/resources/assets/additionaladditions/lang/pt_br.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Chave inglesa", "item.additionaladditions.fried_egg": "Ovo frito", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Disco musical", "item.additionaladditions.music_disc_1007": "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 89e44c0..b31047f 100644 --- a/src/main/resources/assets/additionaladditions/lang/pt_pt.json +++ b/src/main/resources/assets/additionaladditions/lang/pt_pt.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Chave inglesa", "item.additionaladditions.fried_egg": "Ovo frito", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Disco musical", "item.additionaladditions.music_disc_1007": "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 813b5d3..051073e 100644 --- a/src/main/resources/assets/additionaladditions/lang/ro_ro.json +++ b/src/main/resources/assets/additionaladditions/lang/ro_ro.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Cheie franceză", "item.additionaladditions.fried_egg": "Ou prăjit", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Disc muzical", "item.additionaladditions.music_disc_1007": "Disc muzical", diff --git a/src/main/resources/assets/additionaladditions/lang/ru_ru.json b/src/main/resources/assets/additionaladditions/lang/ru_ru.json index e32f093..56d81ed 100644 --- a/src/main/resources/assets/additionaladditions/lang/ru_ru.json +++ b/src/main/resources/assets/additionaladditions/lang/ru_ru.json @@ -9,7 +9,7 @@ "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_upgrade": "Улучшение в розовое золото", "item.additionaladditions.rose_gold_pickaxe": "Кирка из розового золота", "item.additionaladditions.rose_gold_shovel": "Лопата из розового золота", @@ -39,7 +39,7 @@ "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.gilded_netherite_upgrade": "Улучшение в позолоченный незерит", "item.additionaladditions.music_disc_0308": "Пластинка", "item.additionaladditions.music_disc_1007": "Пластинка", @@ -57,7 +57,7 @@ "block.additionaladditions.rope": "Верёвка", "block.additionaladditions.amethyst_lamp": "Аметистовый фонарь", "block.additionaladditions.patina_block": "Блок медной патины", - "enchantment.additionaladditions.precision": "Улучшенный прицел", + "enchantment.additionaladditions.precision": "Меткость", "enchantment.additionaladditions.precision.desc": "Уменьшает разброс арбалета.", "enchantment.additionaladditions.speed": "Скорость", "enchantment.additionaladditions.speed.desc": "Увеличивает скорость перемещения.", @@ -100,5 +100,5 @@ "additionaladditions.advancements.use_watering_can.desc": "Используйте лейку, чтобы удобрить посевы", "additionaladditions.gui.config.restart": "Перезапустите игру, чтобы применить изменения", - "additionaladditions.gui.pocket_jukebox.tooltip": "Дважды кликните пластинкой, чтобы играть её" + "additionaladditions.gui.pocket_jukebox.tooltip": "Вторичный клик пластинкой, чтобы играть" } \ No newline at end of file diff --git a/src/main/resources/assets/additionaladditions/lang/uk_ua.json b/src/main/resources/assets/additionaladditions/lang/uk_ua.json index 4ca8adf..7195fa3 100644 --- a/src/main/resources/assets/additionaladditions/lang/uk_ua.json +++ b/src/main/resources/assets/additionaladditions/lang/uk_ua.json @@ -7,7 +7,7 @@ "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_upgrade": "Покращення з рожевого золота", "item.additionaladditions.rose_gold_sword": "Меч з рожевого золота", "item.additionaladditions.rose_gold_axe": "Сокира з рожевого золота", @@ -39,7 +39,7 @@ "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.gilded_netherite_upgrade": "Позолочене покращення", "item.additionaladditions.music_disc_0308": "Платівка", "item.additionaladditions.music_disc_1007": "Платівка", diff --git a/src/main/resources/assets/additionaladditions/lang/vi_vn.json b/src/main/resources/assets/additionaladditions/lang/vi_vn.json index 8c10b09..614701b 100644 --- a/src/main/resources/assets/additionaladditions/lang/vi_vn.json +++ b/src/main/resources/assets/additionaladditions/lang/vi_vn.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "Cờ lê", "item.additionaladditions.fried_egg": "Trứng chiên", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "Đĩa nhạc", "item.additionaladditions.music_disc_1007": "Đĩ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 718731d..5968024 100644 --- a/src/main/resources/assets/additionaladditions/lang/zh_cn.json +++ b/src/main/resources/assets/additionaladditions/lang/zh_cn.json @@ -17,7 +17,7 @@ "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_upgrade": "Rose Gold Upgrade", "item.additionaladditions.wrench": "扳手", "item.additionaladditions.fried_egg": "煎鸡蛋", @@ -40,7 +40,7 @@ "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.gilded_netherite_upgrade": "Gilded Netherite Upgrade", "item.additionaladditions.music_disc_0308": "音乐唱片", "item.additionaladditions.music_disc_1007": "音乐唱片", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b728ca8..246dcd5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -37,7 +37,7 @@ ], "depends": { "fabricloader": ">=0.14.4", - "minecraft": ">=1.19.1", + "minecraft": ">=1.20.3", "fabric-api": "*", "java": ">=17" },