diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 50658b421..3eb204d53 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -117,8 +117,8 @@ public class MiscellaneousIcons { corporeaIconStar = IconHelper.forName(evt.getMap(), "spark_corporea_star", "items"); sparkWorldIcon = IconHelper.forName(evt.getMap(), "spark", "items"); - sparkUpgradeIcons = new TextureAtlasSprite[ItemSparkUpgrade.VARIANTS]; - for(int i = 0; i < ItemSparkUpgrade.VARIANTS; i++) { + sparkUpgradeIcons = new TextureAtlasSprite[4]; + for(int i = 0; i < 4; i++) { sparkUpgradeIcons[i] = IconHelper.forName(evt.getMap(), "spark_upgrade_rune_" + i, "items"); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index c4bbc0682..0358150e4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -32,6 +32,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -111,7 +112,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { changer.markDirty(); ItemHandlerHelper.giveItemToPlayer(player, cstack); return true; - } else if(!pstack.isEmpty() && pstack.getItem() == ModItems.sparkUpgrade) { + } else if(!pstack.isEmpty() && pstack.getItem() instanceof ItemSparkUpgrade) { changer.getItemHandler().setStackInSlot(0, pstack.splitStack(1)); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index a6528f6b0..4e1698c11 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -26,10 +26,10 @@ public final class ModBanners { addPattern(clazz, "sapling", "spl", new ItemStack(ModItems.dreamwoodTwig)); addPattern(clazz, "tiny_potato", "tpt", new ItemStack(ModBlocks.tinyPotato)); - addPattern(clazz, "spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgrade, 1, 0)); - addPattern(clazz, "spark_dominant", "sdm", new ItemStack(ModItems.sparkUpgrade, 1, 1)); - addPattern(clazz, "spark_recessive", "src", new ItemStack(ModItems.sparkUpgrade, 1, 2)); - addPattern(clazz, "spark_isolated", "sis", new ItemStack(ModItems.sparkUpgrade, 1, 3)); + addPattern(clazz, "spark_dispersive", "sds", new ItemStack(ModItems.sparkUpgradeDispersive)); + addPattern(clazz, "spark_dominant", "sdm", new ItemStack(ModItems.sparkUpgradeDominant)); + addPattern(clazz, "spark_recessive", "src", new ItemStack(ModItems.sparkUpgradeRecessive)); + addPattern(clazz, "spark_isolated", "sis", new ItemStack(ModItems.sparkUpgradeIsolated)); addPattern(clazz, "fish", "fis", new ItemStack(Items.FISH)); addPattern(clazz, "axe", "axe", new ItemStack(Items.IRON_AXE)); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index f85202c76..80de4b72b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -17,6 +17,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkUpgradeType; +import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; @@ -39,7 +40,7 @@ public class TileSparkChanger extends TileSimpleInventory { ISparkEntity spark = attach.getAttachedSpark(); if(spark != null) { SparkUpgradeType upg = spark.getUpgrade(); - SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; + SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : ((ItemSparkUpgrade) changeStack.getItem()).type; if(upg != newUpg) attachables.add(attach); } @@ -50,8 +51,8 @@ public class TileSparkChanger extends TileSimpleInventory { ISparkAttachable attach = attachables.get(world.rand.nextInt(attachables.size())); ISparkEntity spark = attach.getAttachedSpark(); SparkUpgradeType upg = spark.getUpgrade(); - ItemStack sparkStack = upg == SparkUpgradeType.NONE ? ItemStack.EMPTY : new ItemStack(ModItems.sparkUpgrade, 1, upg.ordinal() - 1); - SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; + ItemStack sparkStack = ItemSparkUpgrade.getByType(upg); + SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : ((ItemSparkUpgrade) changeStack.getItem()).type; spark.setUpgrade(newUpg); Collection transfers = spark.getTransfers(); if(transfers != null) @@ -78,7 +79,7 @@ public class TileSparkChanger extends TileSimpleInventory { @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if(!stack.isEmpty() && stack.getItem() == ModItems.sparkUpgrade) + if(!stack.isEmpty() && stack.getItem() instanceof ItemSparkUpgrade) return super.insertItem(slot, stack, simulate); else return stack; } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index a62221f9b..a0dd858f8 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -334,7 +334,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manaGun); addItem(ModItems.clip); addItem(ModItems.spark); - addItem(ModItems.sparkUpgrade); + addItem(ModItems.sparkUpgradeDispersive); + addItem(ModItems.sparkUpgradeDominant); + addItem(ModItems.sparkUpgradeRecessive); + addItem(ModItems.sparkUpgradeIsolated); addBlock(ModBlocks.sparkChanger); addItem(ModItems.corporeaSpark); addBlock(ModBlocks.corporeaIndex); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 75c8af5cd..b69f2a84d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -33,6 +33,7 @@ import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.api.mana.spark.SparkUpgradeType; +import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -227,7 +228,7 @@ public class EntitySpark extends Entity implements ISparkEntity { SparkUpgradeType upgrade = getUpgrade(); entityDropItem(new ItemStack(ModItems.spark), 0F); if(upgrade != SparkUpgradeType.NONE) - entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); + entityDropItem(ItemSparkUpgrade.getByType(upgrade), 0F); setDead(); } @@ -241,7 +242,7 @@ public class EntitySpark extends Entity implements ISparkEntity { ItemStack stack = player.getHeldItem(hand); if(!isDead && !stack.isEmpty()) { if(world.isRemote) { - boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade + boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemSparkUpgrade || stack.getItem() == ModItems.phantomInk; if(valid) player.swingArm(hand); @@ -252,7 +253,7 @@ public class EntitySpark extends Entity implements ISparkEntity { if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { if(upgrade != SparkUpgradeType.NONE) { - entityDropItem(new ItemStack(ModItems.sparkUpgrade, 1, upgrade.ordinal() - 1), 0F); + entityDropItem(ItemSparkUpgrade.getByType(upgrade), 0F); setUpgrade(SparkUpgradeType.NONE); transfers.clear(); @@ -264,9 +265,8 @@ public class EntitySpark extends Entity implements ISparkEntity { particleBeam(player, this, (Entity) spark); return true; } - } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == SparkUpgradeType.NONE) { - int newUpgrade = stack.getItemDamage() + 1; - setUpgrade(SparkUpgradeType.values()[newUpgrade]); + } else if(stack.getItem() instanceof ItemSparkUpgrade && upgrade == SparkUpgradeType.NONE) { + setUpgrade(((ItemSparkUpgrade) stack.getItem()).type); stack.shrink(1); return true; } else if (stack.getItem() == ModItems.phantomInk) { diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 3d073ca8f..f631b19d0 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -79,8 +79,17 @@ public class FlattenItems implements IFixableData { case 8: return ModItems.mutatedSeeds.getRegistryName().toString(); } }); - // Just remove the meta (moved to NBT, defaults back to inactive) + // Just remove the meta (moved to NBT, defaults back to inactive) TODO is this really needed in 1.13, the meta might just disappear by itself LOOKUP.put("botania:temperancestone", i -> ModItems.temperanceStone.getRegistryName().toString()); + LOOKUP.put("botania:sparkupgrade", i -> { + switch(i) { + default: + case 0: return ModItems.sparkUpgradeDispersive.getRegistryName().toString(); + case 1: return ModItems.sparkUpgradeDominant.getRegistryName().toString(); + case 2: return ModItems.sparkUpgradeRecessive.getRegistryName().toString(); + case 3: return ModItems.sparkUpgradeIsolated.getRegistryName().toString(); + } + }); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 719d58816..34d310cca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -10,46 +10,29 @@ */ package vazkii.botania.common.item; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.lib.LibItemNames; -import javax.annotation.Nonnull; +import java.util.Locale; public class ItemSparkUpgrade extends ItemMod { + public final SparkUpgradeType type; - public static final int VARIANTS = 4; - - public ItemSparkUpgrade() { - super(LibItemNames.SPARK_UPGRADE); - setHasSubtypes(true); + public ItemSparkUpgrade(SparkUpgradeType type) { + super(LibItemNames.SPARK_UPGRADE + "_" + type.name().toLowerCase(Locale.ROOT)); + this.type = type; } - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < VARIANTS; i++) - list.add(new ItemStack(this, 1, i)); + public static ItemStack getByType(SparkUpgradeType type) { + switch(type) { + case DOMINANT: return new ItemStack(ModItems.sparkUpgradeDominant); + case RECESSIVE: return new ItemStack(ModItems.sparkUpgradeRecessive); + case DISPERSIVE: return new ItemStack(ModItems.sparkUpgradeDispersive); + case ISOLATED: return new ItemStack(ModItems.sparkUpgradeIsolated); + default: return ItemStack.EMPTY; } } - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 4, LibItemNames.SPARK_UPGRADE); - } - - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); - } } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 5347f4e24..7a8fbe1f7 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -22,6 +22,7 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IFloatingFlower; +import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.brew.ItemBrewFlask; import vazkii.botania.common.item.brew.ItemBrewVial; import vazkii.botania.common.item.brew.ItemIncenseStick; @@ -258,7 +259,10 @@ public final class ModItems { public static final Item enderHand = new ItemEnderHand(); public static final Item glassPick = new ItemGlassPick(); public static final Item spark = new ItemSpark(); - public static final Item sparkUpgrade = new ItemSparkUpgrade(); + public static final Item sparkUpgradeDispersive = new ItemSparkUpgrade(SparkUpgradeType.DISPERSIVE); + public static final Item sparkUpgradeDominant = new ItemSparkUpgrade(SparkUpgradeType.DOMINANT); + public static final Item sparkUpgradeRecessive = new ItemSparkUpgrade(SparkUpgradeType.RECESSIVE); + public static final Item sparkUpgradeIsolated = new ItemSparkUpgrade(SparkUpgradeType.ISOLATED); public static final Item diviningRod = new ItemDiviningRod(); public static final Item gravityRod = new ItemGravityRod(); public static final Item manaInkwell = new ItemManaInkwell(); @@ -479,7 +483,10 @@ public final class ModItems { r.register(enderHand); r.register(glassPick); r.register(spark); - r.register(sparkUpgrade); + r.register(sparkUpgradeDispersive); + r.register(sparkUpgradeDominant); + r.register(sparkUpgradeRecessive); + r.register(sparkUpgradeIsolated); r.register(diviningRod); r.register(gravityRod); r.register(manaInkwell); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 8aa717666..7542ee719 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -101,7 +101,7 @@ public final class LibItemNames { public static final String ENDER_HAND = "enderHand"; public static final String GLASS_PICK = "glassPick"; public static final String SPARK = "spark"; - public static final String SPARK_UPGRADE = "sparkUpgrade"; + public static final String SPARK_UPGRADE = "spark_upgrade"; public static final String DIVINING_ROD = "diviningRod"; public static final String GRAVITY_ROD = "gravityRod"; public static final String MANA_INKWELL = "manaInkwell"; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 7c666d43a..93bdc6a91 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1462,10 +1462,10 @@ item.botania:superLavaPendant.name=Crimson Pendant item.botania:enderHand.name=Hand of Ender item.botania:glassPick.name=Vitreous Pickaxe item.botania:spark.name=Spark -item.botania:sparkUpgrade0.name=Spark Augment: Dispersive -item.botania:sparkUpgrade1.name=Spark Augment: Dominant -item.botania:sparkUpgrade2.name=Spark Augment: Recessive -item.botania:sparkUpgrade3.name=Spark Augment: Isolated +item.botania:spark_upgrade_dispersive.name=Spark Augment: Dispersive +item.botania:spark_upgrade_dominant.name=Spark Augment: Dominant +item.botania:spark_upgrade_recessive.name=Spark Augment: Recessive +item.botania:spark_upgrade_isolated.name=Spark Augment: Isolated item.botania:diviningRod.name=Rod of the Plentiful Mantle item.botania:gravityRod.name=Rod of the Shaded Mesa item.botania:regenIvy.name=Timeless Ivy diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index 4cbc38522..f51228468 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1222,10 +1222,10 @@ item.botania:superLavaPendant.name=Colgante carmesí item.botania:enderHand.name=Mano del Fin item.botania:glassPick.name=Pico vítreo item.botania:spark.name=Chispa -item.botania:sparkUpgrade0.name=Aumento de chispa: Dispersiva -item.botania:sparkUpgrade1.name=Aumento de chispa: Dominante -item.botania:sparkUpgrade2.name=Aumento de chispa: Recesiva -item.botania:sparkUpgrade3.name=Aumento de chispa: Aislada +item.botania:spark_upgrade_dispersive.name=Aumento de chispa: Dispersiva +item.botania:spark_upgrade_dominant.name=Aumento de chispa: Dominante +item.botania:spark_upgrade_recessive.name=Aumento de chispa: Recesiva +item.botania:spark_upgrade_isolated.name=Aumento de chispa: Aislada item.botania:diviningRod.name=Vara de manto abundante item.botania:gravityRod.name=Vara de mesa sombría item.botania:regenIvy.name=Hiedra eterna diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index 9e3bd2594..6c271a776 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -1084,10 +1084,10 @@ item.botania:superLavaPendant.name=Pendentif Crimson item.botania:enderHand.name=Main du néant item.botania:glassPick.name=pioche vitreuse item.botania:spark.name=Étincelle -item.botania:sparkUpgrade0.name=Augmentation d'étincelle : Dispersive -item.botania:sparkUpgrade1.name=Augmentation d'étincelle : Dominante -item.botania:sparkUpgrade2.name=Augmentation d'étincelle : Récessive -item.botania:sparkUpgrade3.name=Augmentation d'étincelle : Isolée +item.botania:spark_upgrade_dispersive.name=Augmentation d'étincelle : Dispersive +item.botania:spark_upgrade_dominant.name=Augmentation d'étincelle : Dominante +item.botania:spark_upgrade_recessive.name=Augmentation d'étincelle : Récessive +item.botania:spark_upgrade_isolated.name=Augmentation d'étincelle : Isolée item.botania:diviningRod.name=Bâton du manteau abondant item.botania:gravityRod.name=Bâton de la mesa hachurée item.botania:regenIvy.name=Lierre éternel diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index 1a5693cf9..8db5b042e 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1247,10 +1247,10 @@ item.botania:superLavaPendant.name=クリムゾンペンダント item.botania:enderHand.name=エンダーの手 item.botania:glassPick.name=ガラス質のツルハシ item.botania:spark.name=スパーク -item.botania:sparkUpgrade0.name=スパーク強化:散布 -item.botania:sparkUpgrade1.name=スパーク強化:優性 -item.botania:sparkUpgrade2.name=スパーク強化:劣勢 -item.botania:sparkUpgrade3.name=スパーク強化:孤立 +item.botania:spark_upgrade_dispersive.name=スパーク強化:散布 +item.botania:spark_upgrade_dominant.name=スパーク強化:優性 +item.botania:spark_upgrade_recessive.name=スパーク強化:劣勢 +item.botania:spark_upgrade_isolated.name=スパーク強化:孤立 item.botania:diviningRod.name=豊富なマントルの杖 item.botania:gravityRod.name=暗がりのメサの杖 item.botania:regenIvy.name=永遠のツタ diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 599ec0596..9f73be9f0 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1183,10 +1183,10 @@ item.botania:superLavaPendant.name=크림슨 펜던트 item.botania:enderHand.name=엔더의 손 item.botania:glassPick.name=유리질 곡괭이 item.botania:spark.name=스파크 -item.botania:sparkUpgrade0.name=스파크 증폭: 분산 -item.botania:sparkUpgrade1.name=스파크 증폭: 증폭 -item.botania:sparkUpgrade2.name=스파크 증폭: 전송 -item.botania:sparkUpgrade3.name=스파크 증폭: 고립 +item.botania:spark_upgrade_dispersive.name=스파크 증폭: 분산 +item.botania:spark_upgrade_dominant.name=스파크 증폭: 증폭 +item.botania:spark_upgrade_recessive.name=스파크 증폭: 전송 +item.botania:spark_upgrade_isolated.name=스파크 증폭: 고립 item.botania:diviningRod.name=나눗셈의 막대 item.botania:gravityRod.name=블랙메사의 막대 item.botania:regenIvy.name=시간을 초월한 아이비 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index f12bd6312..6b63bd607 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1315,10 +1315,10 @@ item.botania:superLavaPendant.name=Crimson Hanger item.botania:enderHand.name=Hand van Ender item.botania:glassPick.name=Doorzichtige Houweel item.botania:spark.name=Vonk -item.botania:sparkUpgrade0.name=Vonk Uitbreiding: Uitstralend -item.botania:sparkUpgrade1.name=Vonk Uitbreiding: Dominant -item.botania:sparkUpgrade2.name=Vonk Uitbreiding: Verplaatsend -item.botania:sparkUpgrade3.name=Vonk Uitbreiding: Geïsoleerd +item.botania:spark_upgrade_dispersive.name=Vonk Uitbreiding: Uitstralend +item.botania:spark_upgrade_dominant.name=Vonk Uitbreiding: Dominant +item.botania:spark_upgrade_recessive.name=Vonk Uitbreiding: Verplaatsend +item.botania:spark_upgrade_isolated.name=Vonk Uitbreiding: Geïsoleerd item.botania:diviningRod.name=Wichelroede item.botania:gravityRod.name=Staf van het Schaduw Plateau item.botania:regenIvy.name=Tijdloze Klimop diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index cbb132260..d3daa5055 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1465,10 +1465,10 @@ item.botania:superLavaPendant.name=Pingente Carmesiano item.botania:enderHand.name=Mão do Fim item.botania:glassPick.name=Picareta Vítrea item.botania:spark.name=Fagulha -item.botania:sparkUpgrade0.name=Melhoria de Fagulha: Dispersiva -item.botania:sparkUpgrade1.name=Melhoria de Fagulha: Dominante -item.botania:sparkUpgrade2.name=Melhoria de Fagulha: Recessiva -item.botania:sparkUpgrade3.name=Melhoria de Fagulha: Isolada +item.botania:spark_upgrade_dispersive.name=Melhoria de Fagulha: Dispersiva +item.botania:spark_upgrade_dominant.name=Melhoria de Fagulha: Dominante +item.botania:spark_upgrade_recessive.name=Melhoria de Fagulha: Recessiva +item.botania:spark_upgrade_isolated.name=Melhoria de Fagulha: Isolada item.botania:diviningRod.name=Cajado do Manto Pleno item.botania:gravityRod.name=Cajado da Mesa Sombria item.botania:regenIvy.name=Hera Eterna diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index 93adfd7c5..c35d7e479 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -709,10 +709,10 @@ item.botania:superLavaPendant.name=Багровый кулон item.botania:enderHand.name=Рука Края item.botania:glassPick.name=Стеклянная кирка item.botania:spark.name=Искра -item.botania:sparkUpgrade0.name=Дополнитель искр: Рассеиватель -item.botania:sparkUpgrade1.name=Дополнитель искр: Доминантный -item.botania:sparkUpgrade2.name=Дополнитель искр: Подчиненный -item.botania:sparkUpgrade3.name=Дополнитель искр: Изолированый +item.botania:spark_upgrade_dispersive.name=Дополнитель искр: Рассеиватель +item.botania:spark_upgrade_dominant.name=Дополнитель искр: Доминантный +item.botania:spark_upgrade_recessive.name=Дополнитель искр: Подчиненный +item.botania:spark_upgrade_isolated.name=Дополнитель искр: Изолированый item.botania:diviningRod.name=Жезл Волхвов item.botania:gravityRod.name=Жезл Чёрной Мессы item.botania:regenIvy.name=Бессмертный плющ diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 314422f48..660e14164 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1462,10 +1462,10 @@ item.botania:superLavaPendant.name=绯红项链 item.botania:enderHand.name=末影之手 item.botania:glassPick.name=玻璃镐 item.botania:spark.name=火花 -item.botania:sparkUpgrade0.name=火花升级:弥散 -item.botania:sparkUpgrade1.name=火花升级:聚集 -item.botania:sparkUpgrade2.name=火花升级:扩散 -item.botania:sparkUpgrade3.name=火花升级:隔绝 +item.botania:spark_upgrade_dispersive.name=火花升级:弥散 +item.botania:spark_upgrade_dominant.name=火花升级:聚集 +item.botania:spark_upgrade_recessive.name=火花升级:扩散 +item.botania:spark_upgrade_isolated.name=火花升级:隔绝 item.botania:diviningRod.name=占矿法杖 item.botania:gravityRod.name=黑山法杖 item.botania:regenIvy.name=永恒常春藤 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 82d8d7063..a936b6c58 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1428,10 +1428,10 @@ item.botania:superLavaPendant.name=緋紅項鏈 item.botania:enderHand.name=終界之手 item.botania:glassPick.name=玻璃鎬 item.botania:spark.name=火花 -item.botania:sparkUpgrade0.name=火花升級:瀰散 -item.botania:sparkUpgrade1.name=火花升級:聚集 -item.botania:sparkUpgrade2.name=火花升級:擴散 -item.botania:sparkUpgrade3.name=火花升級:隔絕 +item.botania:spark_upgrade_dispersive.name=火花升級:瀰散 +item.botania:spark_upgrade_dominant.name=火花升級:聚集 +item.botania:spark_upgrade_recessive.name=火花升級:擴散 +item.botania:spark_upgrade_isolated.name=火花升級:隔絕 item.botania:diviningRod.name=占礦法杖 item.botania:gravityRod.name=黑山法杖 item.botania:regenIvy.name=永恆常春籐 diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade0.json b/src/main/resources/assets/botania/models/item/spark_upgrade_dispersive.json similarity index 100% rename from src/main/resources/assets/botania/models/item/sparkupgrade0.json rename to src/main/resources/assets/botania/models/item/spark_upgrade_dispersive.json diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade1.json b/src/main/resources/assets/botania/models/item/spark_upgrade_dominant.json similarity index 100% rename from src/main/resources/assets/botania/models/item/sparkupgrade1.json rename to src/main/resources/assets/botania/models/item/spark_upgrade_dominant.json diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade3.json b/src/main/resources/assets/botania/models/item/spark_upgrade_isolated.json similarity index 100% rename from src/main/resources/assets/botania/models/item/sparkupgrade3.json rename to src/main/resources/assets/botania/models/item/spark_upgrade_isolated.json diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade2.json b/src/main/resources/assets/botania/models/item/spark_upgrade_recessive.json similarity index 100% rename from src/main/resources/assets/botania/models/item/sparkupgrade2.json rename to src/main/resources/assets/botania/models/item/spark_upgrade_recessive.json diff --git a/src/main/resources/assets/botania/recipes/sparkupgrade_0.json b/src/main/resources/assets/botania/recipes/spark_upgrade_dispersive.json similarity index 82% rename from src/main/resources/assets/botania/recipes/sparkupgrade_0.json rename to src/main/resources/assets/botania/recipes/spark_upgrade_dispersive.json index a3659dba9..c053cb735 100644 --- a/src/main/resources/assets/botania/recipes/sparkupgrade_0.json +++ b/src/main/resources/assets/botania/recipes/spark_upgrade_dispersive.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:sparkupgrade", - "data": 0 + "item": "botania:spark_upgrade_dispersive" }, "group": "botania:spark_upgrade", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/sparkupgrade_1.json b/src/main/resources/assets/botania/recipes/spark_upgrade_dominant.json similarity index 82% rename from src/main/resources/assets/botania/recipes/sparkupgrade_1.json rename to src/main/resources/assets/botania/recipes/spark_upgrade_dominant.json index 65a2f3564..f21764613 100644 --- a/src/main/resources/assets/botania/recipes/sparkupgrade_1.json +++ b/src/main/resources/assets/botania/recipes/spark_upgrade_dominant.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:sparkupgrade", - "data": 1 + "item": "botania:spark_upgrade_dominant" }, "group": "botania:spark_upgrade", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/sparkupgrade_3.json b/src/main/resources/assets/botania/recipes/spark_upgrade_isolated.json similarity index 82% rename from src/main/resources/assets/botania/recipes/sparkupgrade_3.json rename to src/main/resources/assets/botania/recipes/spark_upgrade_isolated.json index 2f40e3388..d51640f2a 100644 --- a/src/main/resources/assets/botania/recipes/sparkupgrade_3.json +++ b/src/main/resources/assets/botania/recipes/spark_upgrade_isolated.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:sparkupgrade", - "data": 3 + "item": "botania:spark_upgrade_isolated" }, "group": "botania:spark_upgrade", "ingredients": [ diff --git a/src/main/resources/assets/botania/recipes/sparkupgrade_2.json b/src/main/resources/assets/botania/recipes/spark_upgrade_recessive.json similarity index 82% rename from src/main/resources/assets/botania/recipes/sparkupgrade_2.json rename to src/main/resources/assets/botania/recipes/spark_upgrade_recessive.json index 2df26320e..272d828a9 100644 --- a/src/main/resources/assets/botania/recipes/sparkupgrade_2.json +++ b/src/main/resources/assets/botania/recipes/spark_upgrade_recessive.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:sparkupgrade", - "data": 2 + "item": "botania:spark_upgrade_recessive" }, "group": "botania:spark_upgrade", "ingredients": [