diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index c63873df0..fef38d451 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -5,9 +5,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.client.renderer.color.IBlockColor; +import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -33,6 +35,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.lens.ItemLens; +import vazkii.botania.common.lib.LibMisc; import java.awt.Color; import java.util.Map; @@ -155,7 +158,13 @@ public final class ColorHandler { items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick); - items.registerItemColorHandler((s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1, ModItems.lens); + // todo 1.13 use tags instead of looping registry + IItemColor handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1; + for (Item i : Item.REGISTRY) { + if(i instanceof ItemLens && i.getRegistryName().getResourceDomain().equals(LibMisc.MOD_ID)) { + items.registerItemColorHandler(handler, i); + } + } } private ColorHandler() {} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index e82e63330..4e3360596 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -298,7 +298,30 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.spreader); addBlock(ModBlocks.turntable); addBlock(ModBlocks.prism); - addItem(ModItems.lens); + addItem(ModItems.lensNormal); + addItem(ModItems.lensSpeed); + addItem(ModItems.lensPower); + addItem(ModItems.lensTime); + addItem(ModItems.lensEfficiency); + addItem(ModItems.lensBounce); + addItem(ModItems.lensGravity); + addItem(ModItems.lensMine); + addItem(ModItems.lensDamage); + addItem(ModItems.lensPhantom); + addItem(ModItems.lensMagnet); + addItem(ModItems.lensExplosive); + addItem(ModItems.lensInfluence); + addItem(ModItems.lensWeight); + addItem(ModItems.lensPaint); + addItem(ModItems.lensFire); + addItem(ModItems.lensPiston); + addItem(ModItems.lensLight); + addItem(ModItems.lensWarp); + addItem(ModItems.lensRedirect); + addItem(ModItems.lensFirework); + addItem(ModItems.lensFlare); + addItem(ModItems.lensMessenger); + addItem(ModItems.lensTripwire); addItem(ModItems.manaGun); addItem(ModItems.clip); addItem(ModItems.spark); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ffb5bccb8..99ad36f70 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -445,30 +445,32 @@ public final class ModCraftingRecipes { recipesSparkUpgrades = allOfGroup("spark_upgrade"); recipeRFGenerator = ModBlocks.rfGenerator.getRegistryName(); - recipesManaLens = ImmutableList.of(path("lens_0_glass_block"), path("lens_0_glass_pane")); - recipeLensVelocity = path("lens_1"); - recipeLensPotency = path("lens_2"); - recipeLensResistance = path("lens_3"); - recipeLensEfficiency = path("lens_4"); - recipeLensBounce = path("lens_5"); - recipeLensGravity = path("lens_6"); - recipeLensBore = path("lens_7"); - recipeLensDamaging = path("lens_8"); - recipeLensPhantom = path("lens_9"); - recipeLensMagnet = path("lens_10"); - recipeLensExplosive = path("lens_11"); - recipeLensInfluence = path("lens_12"); - recipeLensWeight = path("lens_13"); - recipeLensPaint = path("lens_14"); - recipeLensFire = path("lens_15"); - recipeLensPiston = path("lens_16"); - recipesLensFlash = ImmutableList.of(path("lens_17"), path("lens_17_alt")); - recipeLensWarp = path("lens_18"); - recipeLensRedirect = path("lens_19"); - recipeLensFirework = path("lens_20"); - recipeLensFlare = path("lens_21"); - recipeLensMessenger = path("lens_22"); - recipeLensTripwire = path("lens_23"); + ResourceLocation name = ModItems.lensNormal.getRegistryName(); + recipesManaLens = ImmutableList.of(path(name.getResourcePath() + "_glass_block"), path(name.getResourcePath() + "_glass_pane")); + recipeLensVelocity = ModItems.lensSpeed.getRegistryName(); + recipeLensPotency = ModItems.lensPower.getRegistryName(); + recipeLensResistance = ModItems.lensTime.getRegistryName(); + recipeLensEfficiency = ModItems.lensEfficiency.getRegistryName(); + recipeLensBounce = ModItems.lensBounce.getRegistryName(); + recipeLensGravity = ModItems.lensGravity.getRegistryName(); + recipeLensBore = ModItems.lensMine.getRegistryName(); + recipeLensDamaging = ModItems.lensDamage.getRegistryName(); + recipeLensPhantom = ModItems.lensPhantom.getRegistryName(); + recipeLensMagnet = ModItems.lensMagnet.getRegistryName(); + recipeLensExplosive = ModItems.lensExplosive.getRegistryName(); + recipeLensInfluence = ModItems.lensInfluence.getRegistryName(); + recipeLensWeight = ModItems.lensWeight.getRegistryName(); + recipeLensPaint = ModItems.lensPaint.getRegistryName(); + recipeLensFire = ModItems.lensFire.getRegistryName(); + recipeLensPiston = ModItems.lensPiston.getRegistryName(); + name = ModItems.lensLight.getRegistryName(); + recipesLensFlash = ImmutableList.of(name, path(name.getResourcePath() + "_alt")); + recipeLensWarp = ModItems.lensWarp.getRegistryName(); + recipeLensRedirect = ModItems.lensRedirect.getRegistryName(); + recipeLensFirework = ModItems.lensFirework.getRegistryName(); + recipeLensFlare = ModItems.lensFlare.getRegistryName(); + recipeLensMessenger = ModItems.lensMessenger.getRegistryName(); + recipeLensTripwire = ModItems.lensTripwire.getRegistryName(); recipeDistributor = ModBlocks.distributor.getRegistryName(); recipeManaVoid = ModBlocks.manaVoid.getRegistryName(); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 8ac0061c9..86a53eb7e 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -75,7 +75,7 @@ public class CompositeLensRecipe extends IForgeRegistryEntry.Impl imple return ItemStack.EMPTY; ItemStack lensCopy = lens.copy(); - ((ItemLens) ModItems.lens).setCompositeLens(lensCopy, secondLens); + ((ItemLens) lens.getItem()).setCompositeLens(lensCopy, secondLens); return lensCopy; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 00c61a12c..127557d91 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -73,8 +73,7 @@ public class EntityManaStorm extends Entity { burst.setManaLossPerTick(1F); burst.setGravity(0F); - ItemStack lens = new ItemStack(ModItems.lens, 1, ItemLens.STORM); - burst.setSourceLens(lens); + burst.setSourceLens(new ItemStack(ModItems.lensStorm)); Vector3 motion = new Vector3(Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5).normalize().multiply(motionModifier); burst.setMotion(motion.x, motion.y, motion.z); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java index 378bd5ede..2a947a7dc 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -47,6 +47,7 @@ public class FlattenItems implements IFixableData { case 2: return LibMisc.MOD_ID + ":" + LibItemNames.SNOW_HORN; } }); + LOOKUP.put("botania:lens", i -> LibMisc.MOD_ID + ":" + LibItemNames.LENS_NAMES[i % LibItemNames.LENS_NAMES.length]); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index f4fb61195..c23777fec 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -64,7 +64,7 @@ import vazkii.botania.common.item.interaction.thaumcraft.ItemElementiumHelmRevea import vazkii.botania.common.item.interaction.thaumcraft.ItemManaInkwell; import vazkii.botania.common.item.interaction.thaumcraft.ItemManasteelHelmRevealing; import vazkii.botania.common.item.interaction.thaumcraft.ItemTerrasteelHelmRevealing; -import vazkii.botania.common.item.lens.ItemLens; +import vazkii.botania.common.item.lens.*; import vazkii.botania.common.item.material.ItemDye; import vazkii.botania.common.item.material.ItemManaResource; import vazkii.botania.common.item.material.ItemPestleAndMortar; @@ -128,7 +128,32 @@ public final class ModItems { public static final Item manaweaveCloth = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[22]); public static final Item manaPowder = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[23]); - public static final Item lens = new ItemLens(); + public static final Item lensNormal = new ItemLens(LibItemNames.LENS_NAMES[0], new Lens(), ItemLens.PROP_NONE); + public static final Item lensSpeed = new ItemLens(LibItemNames.LENS_NAMES[1], new LensSpeed(), ItemLens.PROP_NONE); + public static final Item lensPower = new ItemLens(LibItemNames.LENS_NAMES[2], new LensPower(), ItemLens.PROP_POWER); + public static final Item lensTime = new ItemLens(LibItemNames.LENS_NAMES[3], new LensTime(), ItemLens.PROP_NONE); + public static final Item lensEfficiency = new ItemLens(LibItemNames.LENS_NAMES[4], new LensEfficiency(), ItemLens.PROP_NONE); + public static final Item lensBounce = new ItemLens(LibItemNames.LENS_NAMES[5], new LensBounce(), ItemLens.PROP_TOUCH); + public static final Item lensGravity = new ItemLens(LibItemNames.LENS_NAMES[6], new LensGravity(), ItemLens.PROP_ORIENTATION); + public static final Item lensMine = new ItemLens(LibItemNames.LENS_NAMES[7], new LensMine(), ItemLens.PROP_TOUCH | ItemLens.PROP_ORIENTATION); + public static final Item lensDamage = new ItemLens(LibItemNames.LENS_NAMES[8], new LensDamage(), ItemLens.PROP_DAMAGE); + public static final Item lensPhantom = new ItemLens(LibItemNames.LENS_NAMES[9], new LensPhantom(), ItemLens.PROP_TOUCH); + public static final Item lensMagnet = new ItemLens(LibItemNames.LENS_NAMES[10], new LensMagnet(), ItemLens.PROP_ORIENTATION); + public static final Item lensExplosive = new ItemLens(LibItemNames.LENS_NAMES[11], new LensExplosive(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensInfluence = new ItemLens(LibItemNames.LENS_NAMES[12], new LensInfluence(), ItemLens.PROP_NONE); + public static final Item lensWeight = new ItemLens(LibItemNames.LENS_NAMES[13], new LensWeight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensPaint = new ItemLens(LibItemNames.LENS_NAMES[14], new LensPaint(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensFire = new ItemLens(LibItemNames.LENS_NAMES[15], new LensFire(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensPiston = new ItemLens(LibItemNames.LENS_NAMES[16], new LensPiston(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensLight = new ItemLens(LibItemNames.LENS_NAMES[17], new LensLight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensWarp = new ItemLens(LibItemNames.LENS_NAMES[18], new LensWarp(), ItemLens.PROP_NONE); + public static final Item lensRedirect = new ItemLens(LibItemNames.LENS_NAMES[19], new LensRedirect(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION); + public static final Item lensFirework = new ItemLens(LibItemNames.LENS_NAMES[20], new LensFirework(), ItemLens.PROP_TOUCH); + public static final Item lensFlare = new ItemLens(LibItemNames.LENS_NAMES[21], new LensFlare(), ItemLens.PROP_CONTROL); + public static final Item lensMessenger = new ItemLens(LibItemNames.LENS_NAMES[22], new LensMessenger(), ItemLens.PROP_POWER); + public static final Item lensTripwire = new ItemLens(LibItemNames.LENS_NAMES[23], new LensTripwire(), ItemLens.PROP_CONTROL); + public static final Item lensStorm = new ItemLens(LibItemNames.LENS_NAMES[24], new LensStorm(), ItemLens.PROP_NONE); + public static final Item rune = new ItemRune(); public static final Item manaTablet = new ItemManaTablet(); public static final Item manaGun = new ItemManaGun(); @@ -316,7 +341,31 @@ public final class ModItems { r.register(pebble); r.register(manaweaveCloth); r.register(manaPowder); - r.register(lens); + r.register(lensNormal); + r.register(lensSpeed); + r.register(lensPower); + r.register(lensTime); + r.register(lensEfficiency); + r.register(lensBounce); + r.register(lensGravity); + r.register(lensMine); + r.register(lensDamage); + r.register(lensPhantom); + r.register(lensMagnet); + r.register(lensExplosive); + r.register(lensInfluence); + r.register(lensWeight); + r.register(lensPaint); + r.register(lensFire); + r.register(lensPiston); + r.register(lensLight); + r.register(lensWarp); + r.register(lensRedirect); + r.register(lensFirework); + r.register(lensFlare); + r.register(lensMessenger); + r.register(lensTripwire); + r.register(lensStorm); r.register(rune); r.register(manaTablet); r.register(manaGun); diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index a666f369d..bc9f248b6 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -34,6 +34,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; @@ -41,37 +42,7 @@ import java.awt.Color; import java.util.List; public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { - - public static final int SUBTYPES = 24; - - public static final int NORMAL = 0, - SPEED = 1, - POWER = 2, - TIME = 3, - EFFICIENCY = 4, - BOUNCE = 5, - GRAVITY = 6, - MINE = 7, - DAMAGE = 8, - PHANTOM = 9, - MAGNET = 10, - EXPLOSIVE = 11, - INFLUENCE = 12, - WEIGHT = 13, - PAINT = 14, - FIRE = 15, - PISTON = 16, - LIGHT = 17, - WARP = 18, - REDIRECT = 19, - FIREWORK = 20, - FLARE = 21, - MESSENGER = 22, - TRIPWIRE = 23; - - public static final int STORM = 5000; - - private static final int PROP_NONE = 0, + public static final int PROP_NONE = 0, PROP_POWER = 1, PROP_ORIENTATION = 1 << 1, PROP_TOUCH = 1 << 2, @@ -79,84 +50,17 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens PROP_DAMAGE = 1 << 4, PROP_CONTROL = 1 << 5; - private static final int[] props = new int[SUBTYPES]; - private static final Lens[] lenses = new Lens[SUBTYPES]; - private static final Lens fallbackLens = new Lens(); - private static final Lens stormLens = new LensStorm(); - - static { - setProps(NORMAL, PROP_NONE); - setProps(SPEED, PROP_NONE); - setProps(POWER, PROP_POWER); - setProps(TIME, PROP_NONE); - setProps(EFFICIENCY, PROP_NONE); - setProps(BOUNCE, PROP_TOUCH); - setProps(GRAVITY, PROP_ORIENTATION); - setProps(MINE, PROP_TOUCH | PROP_INTERACTION); - setProps(DAMAGE, PROP_DAMAGE); - setProps(PHANTOM, PROP_TOUCH); - setProps(MAGNET, PROP_ORIENTATION); - setProps(EXPLOSIVE, PROP_DAMAGE | PROP_TOUCH | PROP_INTERACTION); - setProps(INFLUENCE, PROP_NONE); - setProps(WEIGHT, PROP_TOUCH | PROP_INTERACTION); - setProps(PAINT, PROP_TOUCH | PROP_INTERACTION); - setProps(FIRE, PROP_DAMAGE | PROP_TOUCH | PROP_INTERACTION); - setProps(PISTON, PROP_TOUCH | PROP_INTERACTION); - setProps(LIGHT, PROP_TOUCH | PROP_INTERACTION); - setProps(WARP, PROP_NONE); - setProps(REDIRECT, PROP_TOUCH | PROP_INTERACTION); - setProps(FIREWORK, PROP_TOUCH); - setProps(FLARE, PROP_CONTROL); - setProps(MESSENGER, PROP_POWER); - setProps(TRIPWIRE, PROP_CONTROL); - - setLens(NORMAL, fallbackLens); - setLens(SPEED, new LensSpeed()); - setLens(POWER, new LensPower()); - setLens(TIME, new LensTime()); - setLens(EFFICIENCY, new LensEfficiency()); - setLens(BOUNCE, new LensBounce()); - setLens(GRAVITY, new LensGravity()); - setLens(MINE, new LensMine()); - setLens(DAMAGE, new LensDamage()); - setLens(PHANTOM, new LensPhantom()); - setLens(MAGNET, new LensMagnet()); - setLens(EXPLOSIVE, new LensExplosive()); - setLens(INFLUENCE, new LensInfluence()); - setLens(WEIGHT, new LensWeight()); - setLens(PAINT, new LensPaint()); - setLens(FIRE, new LensFire()); - setLens(PISTON, new LensPiston()); - setLens(LIGHT, new LensLight()); - setLens(WARP, new LensWarp()); - setLens(REDIRECT, new LensRedirect()); - setLens(FIREWORK, new LensFirework()); - setLens(FLARE, new LensFlare()); - setLens(MESSENGER, new LensMessenger()); - setLens(TRIPWIRE, new LensTripwire()); - } - private static final String TAG_COLOR = "color"; private static final String TAG_COMPOSITE_LENS = "compositeLens"; - public ItemLens() { - super(LibItemNames.LENS); + private final Lens lens; + private final int props; + + public ItemLens(String name, Lens lens, int props) { + super(name); setMaxStackSize(1); - setHasSubtypes(true); - } - - @Override - public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - if(isInCreativeTab(tab)) { - for(int i = 0; i < SUBTYPES; i++) - stacks.add(new ItemStack(this, 1, i)); - } - } - - @Nonnull - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; + this.lens = lens; + this.props = props; } @SideOnly(Side.CLIENT) @@ -187,7 +91,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens if(storedColor != -1) props.color = getLensColor(stack); - getLens(stack.getItemDamage()).apply(stack, props); + getLens(stack).apply(stack, props); ItemStack compositeLens = getCompositeLens(stack); if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens) @@ -198,7 +102,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; - dead = getLens(stack.getItemDamage()).collideBurst(burst, entity, pos, isManaBlock, dead, stack); + dead = getLens(stack).collideBurst(burst, entity, pos, isManaBlock, dead, stack); ItemStack compositeLens = getCompositeLens(stack); if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens) @@ -215,7 +119,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens if(storedColor == 16 && entity.world.isRemote) burst.setColor(getLensColor(stack)); - getLens(stack.getItemDamage()).updateBurst(burst, entity, stack); + getLens(stack).updateBurst(burst, entity, stack); ItemStack compositeLens = getCompositeLens(stack); if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens) @@ -248,29 +152,16 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens return true; } - public static void setProps(int lens, int props_) { - props[lens] = props_; - } - - public static void setLens(int index, Lens lens) { - lenses[index] = lens; - } - public static boolean isBlacklisted(ItemStack lens1, ItemStack lens2) { ICompositableLens item1 = (ICompositableLens) lens1.getItem(); ICompositableLens item2 = (ICompositableLens) lens2.getItem(); return (item1.getProps(lens1) & item2.getProps(lens2)) != 0; } - public static Lens getLens(int index) { - if(index == STORM) - return stormLens; - - if(index < 0 || index >= lenses.length) - return fallbackLens; - - Lens lens = lenses[index]; - return lens == null ? fallbackLens : lens; + public static Lens getLens(ItemStack stack) { + if(stack.getItem() instanceof ItemLens) + return ((ItemLens) stack.getItem()).lens; + else return new Lens(); } @Override @@ -308,12 +199,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override public int getManaToTransfer(IManaBurst burst, EntityThrowable entity, ItemStack stack, IManaReceiver receiver) { - return getLens(stack.getItemDamage()).getManaToTransfer(burst, entity, stack, receiver); + return getLens(stack).getManaToTransfer(burst, entity, stack, receiver); } @Override public boolean shouldPull(ItemStack stack) { - return stack.getItemDamage() != STORM; + return stack.getItem() != ModItems.lensStorm; } @Override @@ -323,33 +214,27 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) { - return getLens(stack.getItemDamage()).allowBurstShooting(stack, spreader, redstone); + return getLens(stack).allowBurstShooting(stack, spreader, redstone); } @Override public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) { - getLens(stack.getItemDamage()).onControlledSpreaderTick(stack, spreader, redstone); + getLens(stack).onControlledSpreaderTick(stack, spreader, redstone); } @Override public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) { - getLens(stack.getItemDamage()).onControlledSpreaderPulse(stack, spreader, redstone); + getLens(stack).onControlledSpreaderPulse(stack, spreader, redstone); } @Override public int getProps(ItemStack stack) { - return props[stack.getItemDamage()]; + return props; } @Override public boolean isCombinable(ItemStack stack) { - return stack.getItemDamage() != NORMAL; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemMetas(this, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]); + return stack.getItem() != ModItems.lensNormal; } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 7a7f988bf..fc3d16aca 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -43,7 +43,7 @@ public class LensInfluence extends Lens { if(movable instanceof IManaBurst) { IManaBurst otherBurst = (IManaBurst) movable; ItemStack lens = otherBurst.getSourceLens(); - if(lens != null && lens.getItem() == ModItems.lens && lens.getItemDamage() == ItemLens.INFLUENCE) + if(!lens.isEmpty() && lens.getItem() == ModItems.lensInfluence) continue; ((IManaBurst) movable).setMotion(entity.motionX, entity.motionY, entity.motionZ); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 304fa5b9f..49617a2b2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -42,8 +42,8 @@ public class LensMine extends Lens { Block block = world.getBlockState(pos_).getBlock(); - ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack); - boolean warp = composite != null && composite.getItem() == ModItems.lens && composite.getItemDamage() == ItemLens.WARP; + ItemStack composite = ((ItemLens) stack.getItem()).getCompositeLens(stack); + boolean warp = !composite.isEmpty() && composite.getItem() == ModItems.lensWarp; if(warp && (block == ModBlocks.pistonRelay || block == Blocks.PISTON || block == Blocks.PISTON_EXTENSION || block == Blocks.PISTON_HEAD)) return false; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 1e6b10343..c5ef6e5f7 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -17,7 +17,6 @@ public final class LibItemNames { public static final String DYE = "dye"; public static final String PESTLE_AND_MORTAR = "pestleAndMortar"; public static final String TWIG_WAND = "twigWand"; - public static final String LENS = "lens"; public static final String RUNE = "rune"; public static final String MANA_TABLET = "manaTablet"; public static final String MANA_GUN = "manaGun"; @@ -176,30 +175,31 @@ public final class LibItemNames { public static final String GODDESS_CHARM = "goddessCharm"; public static final String[] LENS_NAMES = new String[] { - "lensNormal", - "lensSpeed", - "lensPower", - "lensTime", - "lensEfficiency", - "lensBounce", - "lensGravity", - "lensMine", - "lensDamage", - "lensPhantom", - "lensMagnet", - "lensExplosive", - "lensInfluence", - "lensWeight", - "lensPaint", - "lensFire", - "lensPiston", - "lensLight", - "lensWarp", - "lensRedirect", - "lensFirework", - "lensFlare", - "lensMessenger", - "lensTripwire" + "lens_normal", + "lens_speed", + "lens_power", + "lens_time", + "lens_efficiency", + "lens_bounce", + "lens_gravity", + "lens_mine", + "lens_damage", + "lens_phantom", + "lens_magnet", + "lens_explosive", + "lens_influence", + "lens_weight", + "lens_paint", + "lens_fire", + "lens_piston", + "lens_light", + "lens_warp", + "lens_redirect", + "lens_firework", + "lens_flare", + "lens_messenger", + "lens_tripwire", + "lens_storm" }; public static final String[] MANA_RESOURCE_NAMES = new String[] { diff --git a/src/main/resources/assets/botania/lang/de_de.lang b/src/main/resources/assets/botania/lang/de_de.lang index 66af235e7..1c5001b94 100644 --- a/src/main/resources/assets/botania/lang/de_de.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -290,29 +290,29 @@ item.botania:twigWand.name=Stab des Waldes item.botania:manasteel_ingot.name=Manastahlbarren item.botania:mana_pearl.name=Manaperle item.botania:mana_diamond.name=Manadiamant -item.botania:lensNormal.name=Manalinse -item.botania:lensSpeed.name=Manalinse: Geschwindigkeit -item.botania:lensSpeed.short=Geschwindigkeit -item.botania:lensPower.name=Manalinse: Macht -item.botania:lensPower.short=Macht -item.botania:lensTime.name=Manalinse: Resistenz -item.botania:lensTime.short=Resistenz -item.botania:lensEfficiency.name=Manalinse: Effizienz -item.botania:lensEfficiency.short=Effizienz -item.botania:lensBounce.name=Manalinse: Abprall -item.botania:lensBounce.short=Abprall -item.botania:lensGravity.name=Manalinse: Schwerkraft -item.botania:lensGravity.short=Schwerkraft -item.botania:lensMine.name=Manalinse: Bohren -item.botania:lensMine.short=Bohren -item.botania:lensDamage.name=Manalinse: Schädigung -item.botania:lensDamage.short=Schädigung -item.botania:lensPhantom.name=Manalinse: Phantom -item.botania:lensPhantom.short=Phantom -item.botania:lensMagnet.name=Manalinse: Magnetisierung -item.botania:lensMagnet.short=MMagnetisierung -item.botania:lensExplosive.name=Manalinse: Chaos -item.botania:lensExplosive.short=Chaos +item.botania:lens_normal.name=Manalinse +item.botania:lens_speed.name=Manalinse: Geschwindigkeit +item.botania:lens_speed.short=Geschwindigkeit +item.botania:lens_power.name=Manalinse: Macht +item.botania:lens_power.short=Macht +item.botania:lens_time.name=Manalinse: Resistenz +item.botania:lens_time.short=Resistenz +item.botania:lens_efficiency.name=Manalinse: Effizienz +item.botania:lens_efficiency.short=Effizienz +item.botania:lens_bounce.name=Manalinse: Abprall +item.botania:lens_bounce.short=Abprall +item.botania:lens_gravity.name=Manalinse: Schwerkraft +item.botania:lens_gravity.short=Schwerkraft +item.botania:lens_mine.name=Manalinse: Bohren +item.botania:lens_mine.short=Bohren +item.botania:lens_damage.name=Manalinse: Schädigung +item.botania:lens_damage.short=Schädigung +item.botania:lens_phantom.name=Manalinse: Phantom +item.botania:lens_phantom.short=Phantom +item.botania:lens_magnet.name=Manalinse: Magnetisierung +item.botania:lens_magnet.short=MMagnetisierung +item.botania:lens_explosive.name=Manalinse: Chaos +item.botania:lens_explosive.short=Chaos item.botania:manaPetal0.name=Weißes Manablättchen item.botania:manaPetal1.name=Oranges Manablättchen item.botania:manaPetal2.name=Magentafarbenes Manablättchen diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 5a56d8439..6cbaf8c20 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -1300,53 +1300,53 @@ item.botania:twigWand.name=Wand of the Forest item.botania:manasteel_ingot.name=Manasteel Ingot item.botania:mana_pearl.name=Mana Pearl item.botania:mana_diamond.name=Mana Diamond -item.botania:lensNormal.name=Mana Lens -item.botania:lensSpeed.name=Mana Lens: Velocity -item.botania:lensSpeed.short=Velocity -item.botania:lensPower.name=Mana Lens: Potency -item.botania:lensPower.short=Potency -item.botania:lensTime.name=Mana Lens: Resistance -item.botania:lensTime.short=Resistance -item.botania:lensEfficiency.name=Mana Lens: Efficiency -item.botania:lensEfficiency.short=Efficiency -item.botania:lensBounce.name=Mana Lens: Bounce -item.botania:lensBounce.short=Bounce -item.botania:lensGravity.name=Mana Lens: Gravity -item.botania:lensGravity.short=Gravity -item.botania:lensMine.name=Mana Lens: Bore -item.botania:lensMine.short=Bore -item.botania:lensDamage.name=Mana Lens: Damaging -item.botania:lensDamage.short=Damaging -item.botania:lensPhantom.name=Mana Lens: Phantom -item.botania:lensPhantom.short=Phantom -item.botania:lensMagnet.name=Mana Lens: Magnetizing -item.botania:lensMagnet.short=Magnetizing -item.botania:lensExplosive.name=Mana Lens: Entropic -item.botania:lensExplosive.short=Entropic -item.botania:lensInfluence.name=Mana Lens: Influence -item.botania:lensInfluence.short=Influence -item.botania:lensWeight.name=Mana Lens: Weight -item.botania:lensWeight.short=Weight -item.botania:lensPaint.name=Mana Lens: Paintslinger -item.botania:lensPaint.short=Paintslinger -item.botania:lensFire.name=Mana Lens: Kindle -item.botania:lensFire.short=Kindle -item.botania:lensPiston.name=Mana Lens: Force -item.botania:lensPiston.short=Force -item.botania:lensLight.name=Mana Lens: Flash -item.botania:lensLight.short=Flash -item.botania:lensWarp.name=Mana Lens: Warp -item.botania:lensWarp.short=Warp -item.botania:lensRedirect.name=Mana Lens: Redirective -item.botania:lensRedirect.short=Redirective -item.botania:lensFirework.name=Mana Lens: Celebratory -item.botania:lensFirework.short=Celebratory -item.botania:lensFlare.name=Mana Lens: Flare -item.botania:lensFlare.short=Flare -item.botania:lensMessenger.name=Mana Lens: Messenger -item.botania:lensMessenger.short=Messenger -item.botania:lensTripwire.name=Mana Lens: Tripwire -item.botania:lensTripwire.short=Tripwire +item.botania:lens_normal.name=Mana Lens +item.botania:lens_speed.name=Mana Lens: Velocity +item.botania:lens_speed.short=Velocity +item.botania:lens_power.name=Mana Lens: Potency +item.botania:lens_power.short=Potency +item.botania:lens_time.name=Mana Lens: Resistance +item.botania:lens_time.short=Resistance +item.botania:lens_efficiency.name=Mana Lens: Efficiency +item.botania:lens_efficiency.short=Efficiency +item.botania:lens_bounce.name=Mana Lens: Bounce +item.botania:lens_bounce.short=Bounce +item.botania:lens_gravity.name=Mana Lens: Gravity +item.botania:lens_gravity.short=Gravity +item.botania:lens_mine.name=Mana Lens: Bore +item.botania:lens_mine.short=Bore +item.botania:lens_damage.name=Mana Lens: Damaging +item.botania:lens_damage.short=Damaging +item.botania:lens_phantom.name=Mana Lens: Phantom +item.botania:lens_phantom.short=Phantom +item.botania:lens_magnet.name=Mana Lens: Magnetizing +item.botania:lens_magnet.short=Magnetizing +item.botania:lens_explosive.name=Mana Lens: Entropic +item.botania:lens_explosive.short=Entropic +item.botania:lens_influence.name=Mana Lens: Influence +item.botania:lens_influence.short=Influence +item.botania:lens_weight.name=Mana Lens: Weight +item.botania:lens_weight.short=Weight +item.botania:lens_paint.name=Mana Lens: Paintslinger +item.botania:lens_paint.short=Paintslinger +item.botania:lens_fire.name=Mana Lens: Kindle +item.botania:lens_fire.short=Kindle +item.botania:lens_piston.name=Mana Lens: Force +item.botania:lens_piston.short=Force +item.botania:lens_light.name=Mana Lens: Flash +item.botania:lens_light.short=Flash +item.botania:lens_warp.name=Mana Lens: Warp +item.botania:lens_warp.short=Warp +item.botania:lens_redirect.name=Mana Lens: Redirective +item.botania:lens_redirect.short=Redirective +item.botania:lens_firework.name=Mana Lens: Celebratory +item.botania:lens_firework.short=Celebratory +item.botania:lens_flare.name=Mana Lens: Flare +item.botania:lens_flare.short=Flare +item.botania:lens_messenger.name=Mana Lens: Messenger +item.botania:lens_messenger.short=Messenger +item.botania:lens_tripwire.name=Mana Lens: Tripwire +item.botania:lens_tripwire.short=Tripwire item.botania:rune0.name=Rune of Water item.botania:rune1.name=Rune of Fire item.botania:rune2.name=Rune of Earth diff --git a/src/main/resources/assets/botania/lang/es_es.lang b/src/main/resources/assets/botania/lang/es_es.lang index d38d71524..c776f3f4c 100644 --- a/src/main/resources/assets/botania/lang/es_es.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -1060,43 +1060,43 @@ item.botania:twigWand.name=Varita del bosque item.botania:manasteel_ingot.name=Lingote de manacero item.botania:mana_pearl.name=Perla de maná item.botania:mana_diamond.name=Diamante de maná -item.botania:lensNormal.name=Lente de maná -item.botania:lensSpeed.name=Lente de maná: Velocidad -item.botania:lensSpeed.short=Velocidad -item.botania:lensPower.name=Lente de maná: Potencia -item.botania:lensPower.short=Potencia -item.botania:lensTime.name=Lente de maná: Resistencia -item.botania:lensTime.short=Resistencia -item.botania:lensEfficiency.name=Lente de maná: Eficiencia -item.botania:lensEfficiency.short=Eficiencia -item.botania:lensBounce.name=Lente de maná: Rebote -item.botania:lensBounce.short=Rebote -item.botania:lensGravity.name=Lente de maná: Gravedad -item.botania:lensGravity.short=Gravedad -item.botania:lensMine.name=Lente de maná: Perforación -item.botania:lensMine.short=Perforación -item.botania:lensDamage.name=Lente de maná: Daño -item.botania:lensDamage.short=Daño -item.botania:lensPhantom.name=Lente de maná: Fantasma -item.botania:lensPhantom.short=Fantasma -item.botania:lensMagnet.name=Lente de maná: Magnetizante -item.botania:lensMagnet.short=Magnetizante -item.botania:lensExplosive.name=Lente de maná: Entrópica -item.botania:lensExplosive.short=Entrópica -item.botania:lensInfluence.name=Lente de maná: Influencia -item.botania:lensInfluence.short=Influencia -item.botania:lensWeight.name=Lente de maná: Peso -item.botania:lensWeight.short=Peso -item.botania:lensPaint.name=Lente de maná: Coloreante -item.botania:lensPaint.short=Coloreante -item.botania:lensFire.name=Lente de maná: Encendido -item.botania:lensFire.short=Encendido -item.botania:lensPiston.name=Lente de maná: Fuerza -item.botania:lensPiston.short=Fuerza -item.botania:lensLight.name=Lente de maná: Destello -item.botania:lensLight.short=Destello -item.botania:lensWarp.name=Lente de maná: Distorsión -item.botania:lensWarp.short=Distorsión +item.botania:lens_normal.name=Lente de maná +item.botania:lens_speed.name=Lente de maná: Velocidad +item.botania:lens_speed.short=Velocidad +item.botania:lens_power.name=Lente de maná: Potencia +item.botania:lens_power.short=Potencia +item.botania:lens_time.name=Lente de maná: Resistencia +item.botania:lens_time.short=Resistencia +item.botania:lens_efficiency.name=Lente de maná: Eficiencia +item.botania:lens_efficiency.short=Eficiencia +item.botania:lens_bounce.name=Lente de maná: Rebote +item.botania:lens_bounce.short=Rebote +item.botania:lens_gravity.name=Lente de maná: Gravedad +item.botania:lens_gravity.short=Gravedad +item.botania:lens_mine.name=Lente de maná: Perforación +item.botania:lens_mine.short=Perforación +item.botania:lens_damage.name=Lente de maná: Daño +item.botania:lens_damage.short=Daño +item.botania:lens_phantom.name=Lente de maná: Fantasma +item.botania:lens_phantom.short=Fantasma +item.botania:lens_magnet.name=Lente de maná: Magnetizante +item.botania:lens_magnet.short=Magnetizante +item.botania:lens_explosive.name=Lente de maná: Entrópica +item.botania:lens_explosive.short=Entrópica +item.botania:lens_influence.name=Lente de maná: Influencia +item.botania:lens_influence.short=Influencia +item.botania:lens_weight.name=Lente de maná: Peso +item.botania:lens_weight.short=Peso +item.botania:lens_paint.name=Lente de maná: Coloreante +item.botania:lens_paint.short=Coloreante +item.botania:lens_fire.name=Lente de maná: Encendido +item.botania:lens_fire.short=Encendido +item.botania:lens_piston.name=Lente de maná: Fuerza +item.botania:lens_piston.short=Fuerza +item.botania:lens_light.name=Lente de maná: Destello +item.botania:lens_light.short=Destello +item.botania:lens_warp.name=Lente de maná: Distorsión +item.botania:lens_warp.short=Distorsión item.botania:manaPetal0.name=Pétalo de maná blanco item.botania:manaPetal1.name=Pétalo de maná naranja item.botania:manaPetal2.name=Pétalo de maná magenta diff --git a/src/main/resources/assets/botania/lang/fr_fr.lang b/src/main/resources/assets/botania/lang/fr_fr.lang index a2a0aa91a..f2001ac48 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -922,43 +922,43 @@ item.botania:twigWand.name=Baguette de la forêt item.botania:manasteel_ingot.name=Lingot de manacier item.botania:mana_pearl.name=Perle de mana item.botania:mana_diamond.name=Diamant de mana -item.botania:lensNormal.name=Lentilles de mana -item.botania:lensSpeed.name=Lentilles de mana: Vélocité -item.botania:lensSpeed.short=Vélocité -item.botania:lensPower.name=Lentilles de mana: Puissance -item.botania:lensPower.short=Puissance -item.botania:lensTime.name=Lentilles de mana: Résistance -item.botania:lensTime.short=Résistance -item.botania:lensEfficiency.name=Lentilles de mana: Efficacité -item.botania:lensEfficiency.short=Efficacité -item.botania:lensBounce.name=Lentilles de mana: Rebond -item.botania:lensBounce.short=Rebond -item.botania:lensGravity.name=Lentilles de mana: Gravité -item.botania:lensGravity.short=Gravité -item.botania:lensMine.name=Lentilles de mana: Ennui -item.botania:lensMine.short=Ennui -item.botania:lensDamage.name=Lentilles de mana: Endommagement -item.botania:lensDamage.short=Endommagement -item.botania:lensPhantom.name=Lentilles de mana: Fantôme -item.botania:lensPhantom.short=Fantôme -item.botania:lensMagnet.name=Lentilles de mana: Magnétisation -item.botania:lensMagnet.short=Magnétisation -item.botania:lensExplosive.name=Lentilles de mana: Entropique -item.botania:lensExplosive.short=Entropique -item.botania:lensInfluence.name=Lentilles de mana: Influence -item.botania:lensInfluence.short=Influence -item.botania:lensWeight.name=Lentilles de mana: Poids -item.botania:lensWeight.short=Poids -item.botania:lensPaint.name=Lentilles de mana: Frondeur -item.botania:lensPaint.short=Frondeur -item.botania:lensFire.name=Lentilles de mana: Allumer -item.botania:lensFire.short=Allumer -item.botania:lensPiston.name=Lentilles de mana: Force -item.botania:lensPiston.short=Force -item.botania:lensLight.name=Lentilles de mana: Flash -item.botania:lensLight.short=Flash -item.botania:lensWarp.name=Lentilles de mana: Déformation -item.botania:lensWarp.short=Déformation +item.botania:lens_normal.name=Lentilles de mana +item.botania:lens_speed.name=Lentilles de mana: Vélocité +item.botania:lens_speed.short=Vélocité +item.botania:lens_power.name=Lentilles de mana: Puissance +item.botania:lens_power.short=Puissance +item.botania:lens_time.name=Lentilles de mana: Résistance +item.botania:lens_time.short=Résistance +item.botania:lens_efficiency.name=Lentilles de mana: Efficacité +item.botania:lens_efficiency.short=Efficacité +item.botania:lens_bounce.name=Lentilles de mana: Rebond +item.botania:lens_bounce.short=Rebond +item.botania:lens_gravity.name=Lentilles de mana: Gravité +item.botania:lens_gravity.short=Gravité +item.botania:lens_mine.name=Lentilles de mana: Ennui +item.botania:lens_mine.short=Ennui +item.botania:lens_damage.name=Lentilles de mana: Endommagement +item.botania:lens_damage.short=Endommagement +item.botania:lens_phantom.name=Lentilles de mana: Fantôme +item.botania:lens_phantom.short=Fantôme +item.botania:lens_magnet.name=Lentilles de mana: Magnétisation +item.botania:lens_magnet.short=Magnétisation +item.botania:lens_explosive.name=Lentilles de mana: Entropique +item.botania:lens_explosive.short=Entropique +item.botania:lens_influence.name=Lentilles de mana: Influence +item.botania:lens_influence.short=Influence +item.botania:lens_weight.name=Lentilles de mana: Poids +item.botania:lens_weight.short=Poids +item.botania:lens_paint.name=Lentilles de mana: Frondeur +item.botania:lens_paint.short=Frondeur +item.botania:lens_fire.name=Lentilles de mana: Allumer +item.botania:lens_fire.short=Allumer +item.botania:lens_piston.name=Lentilles de mana: Force +item.botania:lens_piston.short=Force +item.botania:lens_light.name=Lentilles de mana: Flash +item.botania:lens_light.short=Flash +item.botania:lens_warp.name=Lentilles de mana: Déformation +item.botania:lens_warp.short=Déformation item.botania:manaPetal0.name=Pétale de mana blanche item.botania:manaPetal1.name=Pétale de mana orange item.botania:manaPetal2.name=Pétale de mana magenta diff --git a/src/main/resources/assets/botania/lang/ja_jp.lang b/src/main/resources/assets/botania/lang/ja_jp.lang index a0ec5841e..3a8839041 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -1085,53 +1085,53 @@ item.botania:twigWand.name=森の杖 item.botania:manasteel_ingot.name=マナスチールインゴット item.botania:mana_pearl.name=マナパール item.botania:mana_diamond.name=マナダイヤモンド -item.botania:lensNormal.name=マナレンズ -item.botania:lensSpeed.name=マナレンズ: 速度 -item.botania:lensSpeed.short=速度 -item.botania:lensPower.name=マナレンズ: 強度 -item.botania:lensPower.short=強度 -item.botania:lensTime.name=マナレンズ: 耐性 -item.botania:lensTime.short=耐性 -item.botania:lensEfficiency.name=マナレンズ: 効率 -item.botania:lensEfficiency.short=効率 -item.botania:lensBounce.name=マナレンズ: 反射 -item.botania:lensBounce.short=反射 -item.botania:lensGravity.name=マナレンズ: 重力 -item.botania:lensGravity.short=重力 -item.botania:lensMine.name=マナレンズ: 採掘 -item.botania:lensMine.short=採掘 -item.botania:lensDamage.name=マナレンズ: 攻撃 -item.botania:lensDamage.short=攻撃 -item.botania:lensPhantom.name=マナレンズ: 幻影 -item.botania:lensPhantom.short=幻影 -item.botania:lensMagnet.name=マナレンズ: 磁力 -item.botania:lensMagnet.short=磁力 -item.botania:lensExplosive.name=マナレンズ: 爆発 -item.botania:lensExplosive.short=爆発 -item.botania:lensInfluence.name=マナレンズ: 移動 -item.botania:lensInfluence.short=移動 -item.botania:lensWeight.name=マナレンズ: 重量 -item.botania:lensWeight.short=重量 -item.botania:lensPaint.name=マナレンズ: 着色 -item.botania:lensPaint.short=着色 -item.botania:lensFire.name=マナレンズ: 着火 -item.botania:lensFire.short=着火 -item.botania:lensPiston.name=マナレンズ: 力 -item.botania:lensPiston.short=力 -item.botania:lensLight.name=マナレンズ: 閃光 -item.botania:lensLight.short=閃光 -item.botania:lensWarp.name=マナレンズ: ワープ -item.botania:lensWarp.short=ワープ -item.botania:lensRedirect.name=マナレンズ: 方向転換 -item.botania:lensRedirect.short=方向転換 -item.botania:lensFirework.name=マナレンズ: 祝福 -item.botania:lensFirework.short=祝福 -item.botania:lensFlare.name=マナレンズ: フレア -item.botania:lensFlare.short=フレア -item.botania:lensMessenger.name=マナレンズ: 通信 -item.botania:lensMessenger.short=通信 -item.botania:lensTripwire.name=マナレンズ: トリップワイヤー -item.botania:lensTripwire.short=トリップワイヤー +item.botania:lens_normal.name=マナレンズ +item.botania:lens_speed.name=マナレンズ: 速度 +item.botania:lens_speed.short=速度 +item.botania:lens_power.name=マナレンズ: 強度 +item.botania:lens_power.short=強度 +item.botania:lens_time.name=マナレンズ: 耐性 +item.botania:lens_time.short=耐性 +item.botania:lens_efficiency.name=マナレンズ: 効率 +item.botania:lens_efficiency.short=効率 +item.botania:lens_bounce.name=マナレンズ: 反射 +item.botania:lens_bounce.short=反射 +item.botania:lens_gravity.name=マナレンズ: 重力 +item.botania:lens_gravity.short=重力 +item.botania:lens_mine.name=マナレンズ: 採掘 +item.botania:lens_mine.short=採掘 +item.botania:lens_damage.name=マナレンズ: 攻撃 +item.botania:lens_damage.short=攻撃 +item.botania:lens_phantom.name=マナレンズ: 幻影 +item.botania:lens_phantom.short=幻影 +item.botania:lens_magnet.name=マナレンズ: 磁力 +item.botania:lens_magnet.short=磁力 +item.botania:lens_explosive.name=マナレンズ: 爆発 +item.botania:lens_explosive.short=爆発 +item.botania:lens_influence.name=マナレンズ: 移動 +item.botania:lens_influence.short=移動 +item.botania:lens_weight.name=マナレンズ: 重量 +item.botania:lens_weight.short=重量 +item.botania:lens_paint.name=マナレンズ: 着色 +item.botania:lens_paint.short=着色 +item.botania:lens_fire.name=マナレンズ: 着火 +item.botania:lens_fire.short=着火 +item.botania:lens_piston.name=マナレンズ: 力 +item.botania:lens_piston.short=力 +item.botania:lens_light.name=マナレンズ: 閃光 +item.botania:lens_light.short=閃光 +item.botania:lens_warp.name=マナレンズ: ワープ +item.botania:lens_warp.short=ワープ +item.botania:lens_redirect.name=マナレンズ: 方向転換 +item.botania:lens_redirect.short=方向転換 +item.botania:lens_firework.name=マナレンズ: 祝福 +item.botania:lens_firework.short=祝福 +item.botania:lens_flare.name=マナレンズ: フレア +item.botania:lens_flare.short=フレア +item.botania:lens_messenger.name=マナレンズ: 通信 +item.botania:lens_messenger.short=通信 +item.botania:lens_tripwire.name=マナレンズ: トリップワイヤー +item.botania:lens_tripwire.short=トリップワイヤー item.botania:rune0.name=水のルーン item.botania:rune1.name=火のルーン item.botania:rune2.name=土のルーン diff --git a/src/main/resources/assets/botania/lang/ko_kr.lang b/src/main/resources/assets/botania/lang/ko_kr.lang index 682b8db8e..dcc144329 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -1021,43 +1021,43 @@ item.botania:twigWand.name=숲의 지팡이 item.botania:manasteel_ingot.name=마나합금 주괴 item.botania:mana_pearl.name=마나 진주 item.botania:mana_diamond.name=마나 다이아몬드 -item.botania:lensNormal.name=마나렌즈 -item.botania:lensSpeed.name=마나렌즈: 속도 -item.botania:lensSpeed.short=속도 -item.botania:lensPower.name=마나렌즈: 힘 -item.botania:lensPower.short=힘 -item.botania:lensTime.name=마나렌즈: 저항 -item.botania:lensTime.short=저항 -item.botania:lensEfficiency.name=마나렌즈: 효율 -item.botania:lensEfficiency.short=효율 -item.botania:lensBounce.name=마나렌즈: 산란 -item.botania:lensBounce.short=산란 -item.botania:lensGravity.name=마나렌즈: 중력 -item.botania:lensGravity.short=중력 -item.botania:lensMine.name=마나렌즈: 채굴 -item.botania:lensMine.short=채굴 -item.botania:lensDamage.name=마나렌즈: 데미지 -item.botania:lensDamage.short=데미지 -item.botania:lensPhantom.name=마나 렌즈: 관통 -item.botania:lensPhantom.short=관통 -item.botania:lensMagnet.name=마나렌즈: 자기력 -item.botania:lensMagnet.short=자기력 -item.botania:lensExplosive.name=마나렌즈: 엔트로피 -item.botania:lensExplosive.short=엔트로피 -item.botania:lensInfluence.name=마나렌즈: 영향 -item.botania:lensInfluence.short=영향 -item.botania:lensWeight.name=마나렌즈: 무게 -item.botania:lensWeight.short=무게 -item.botania:lensPaint.name=마나렌즈: 페인트 -item.botania:lensPaint.short=페인트 -item.botania:lensFire.name=마나렌즈: 발화 -item.botania:lensFire.short=발화 -item.botania:lensPiston.name=마나렌즈: 강제 -item.botania:lensPiston.short=강제 -item.botania:lensLight.name=마나렌즈: 광원 -item.botania:lensLight.short=광원 -item.botania:lensWarp.name=마나렌즈: 뒤틀림 -item.botania:lensWarp.short=뒤틀림 +item.botania:lens_normal.name=마나렌즈 +item.botania:lens_speed.name=마나렌즈: 속도 +item.botania:lens_speed.short=속도 +item.botania:lens_power.name=마나렌즈: 힘 +item.botania:lens_power.short=힘 +item.botania:lens_time.name=마나렌즈: 저항 +item.botania:lens_time.short=저항 +item.botania:lens_efficiency.name=마나렌즈: 효율 +item.botania:lens_efficiency.short=효율 +item.botania:lens_bounce.name=마나렌즈: 산란 +item.botania:lens_bounce.short=산란 +item.botania:lens_gravity.name=마나렌즈: 중력 +item.botania:lens_gravity.short=중력 +item.botania:lens_mine.name=마나렌즈: 채굴 +item.botania:lens_mine.short=채굴 +item.botania:lens_damage.name=마나렌즈: 데미지 +item.botania:lens_damage.short=데미지 +item.botania:lens_phantom.name=마나 렌즈: 관통 +item.botania:lens_phantom.short=관통 +item.botania:lens_magnet.name=마나렌즈: 자기력 +item.botania:lens_magnet.short=자기력 +item.botania:lens_explosive.name=마나렌즈: 엔트로피 +item.botania:lens_explosive.short=엔트로피 +item.botania:lens_influence.name=마나렌즈: 영향 +item.botania:lens_influence.short=영향 +item.botania:lens_weight.name=마나렌즈: 무게 +item.botania:lens_weight.short=무게 +item.botania:lens_paint.name=마나렌즈: 페인트 +item.botania:lens_paint.short=페인트 +item.botania:lens_fire.name=마나렌즈: 발화 +item.botania:lens_fire.short=발화 +item.botania:lens_piston.name=마나렌즈: 강제 +item.botania:lens_piston.short=강제 +item.botania:lens_light.name=마나렌즈: 광원 +item.botania:lens_light.short=광원 +item.botania:lens_warp.name=마나렌즈: 뒤틀림 +item.botania:lens_warp.short=뒤틀림 item.botania:manaPetal0.name=하얀색 마나 꽃잎 item.botania:manaPetal1.name=주황색 마나 꽃잎 item.botania:manaPetal2.name=자홍색 마나 꽃잎 diff --git a/src/main/resources/assets/botania/lang/nl_nl.lang b/src/main/resources/assets/botania/lang/nl_nl.lang index 014596d1e..cb0966671 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -1153,43 +1153,43 @@ item.botania:twigWand.name=Staf van het Woud item.botania:manasteel_ingot.name=Staaf Manastaal item.botania:mana_pearl.name=Mana Parel item.botania:mana_diamond.name=Mana Diamant -item.botania:lensNormal.name=Mana Lens -item.botania:lensSpeed.name=Mana Lens: Snelheid -item.botania:lensSpeed.short=Snelheid -item.botania:lensPower.name=Mana Lens: Sterkte -item.botania:lensPower.short=Sterkte -item.botania:lensTime.name=Mana Lens: Weerstand -item.botania:lensTime.short=Weerstand -item.botania:lensEfficiency.name=Mana Lens: Rendement -item.botania:lensEfficiency.short=Rendement -item.botania:lensBounce.name=Mana Lens: Reflectie -item.botania:lensBounce.short=Reflectie -item.botania:lensGravity.name=Mana Lens: Zwaartekracht -item.botania:lensGravity.short=Zwaartekracht -item.botania:lensMine.name=Mana Lens: Doorboren -item.botania:lensMine.short=Doorboren -item.botania:lensDamage.name=Mana Lens: Beschadiging -item.botania:lensDamage.short=Beschadiging -item.botania:lensPhantom.name=Mana Lens: Fantoom -item.botania:lensPhantom.short=Fantoom -item.botania:lensMagnet.name=Mana Lens: Magnetiserend -item.botania:lensMagnet.short=Magnetiserend -item.botania:lensExplosive.name=Mana Lens: Entropie -item.botania:lensExplosive.short=Entropie -item.botania:lensInfluence.name=Mana Lens: Invloed -item.botania:lensInfluence.short=Invloed -item.botania:lensWeight.name=Mana Lens: Gewicht -item.botania:lensWeight.short=Gewicht -item.botania:lensPaint.name=Mana Lens: Schilder -item.botania:lensPaint.short=Schilder -item.botania:lensFire.name=Mana Lens: Ontsteken -item.botania:lensFire.short=Ontsteken -item.botania:lensPiston.name=Mana Lens: Bewegings -item.botania:lensPiston.short=Bewegings -item.botania:lensLight.name=Mana Lens: Flits -item.botania:lensLight.short=Flits -item.botania:lensWarp.name=Mana Lens: Afbuiging -item.botania:lensWarp.short=Afbuiging +item.botania:lens_normal.name=Mana Lens +item.botania:lens_speed.name=Mana Lens: Snelheid +item.botania:lens_speed.short=Snelheid +item.botania:lens_power.name=Mana Lens: Sterkte +item.botania:lens_power.short=Sterkte +item.botania:lens_time.name=Mana Lens: Weerstand +item.botania:lens_time.short=Weerstand +item.botania:lens_efficiency.name=Mana Lens: Rendement +item.botania:lens_efficiency.short=Rendement +item.botania:lens_bounce.name=Mana Lens: Reflectie +item.botania:lens_bounce.short=Reflectie +item.botania:lens_gravity.name=Mana Lens: Zwaartekracht +item.botania:lens_gravity.short=Zwaartekracht +item.botania:lens_mine.name=Mana Lens: Doorboren +item.botania:lens_mine.short=Doorboren +item.botania:lens_damage.name=Mana Lens: Beschadiging +item.botania:lens_damage.short=Beschadiging +item.botania:lens_phantom.name=Mana Lens: Fantoom +item.botania:lens_phantom.short=Fantoom +item.botania:lens_magnet.name=Mana Lens: Magnetiserend +item.botania:lens_magnet.short=Magnetiserend +item.botania:lens_explosive.name=Mana Lens: Entropie +item.botania:lens_explosive.short=Entropie +item.botania:lens_influence.name=Mana Lens: Invloed +item.botania:lens_influence.short=Invloed +item.botania:lens_weight.name=Mana Lens: Gewicht +item.botania:lens_weight.short=Gewicht +item.botania:lens_paint.name=Mana Lens: Schilder +item.botania:lens_paint.short=Schilder +item.botania:lens_fire.name=Mana Lens: Ontsteken +item.botania:lens_fire.short=Ontsteken +item.botania:lens_piston.name=Mana Lens: Bewegings +item.botania:lens_piston.short=Bewegings +item.botania:lens_light.name=Mana Lens: Flits +item.botania:lens_light.short=Flits +item.botania:lens_warp.name=Mana Lens: Afbuiging +item.botania:lens_warp.short=Afbuiging item.botania:manaPetal0.name=Wit Mana Bloemblad item.botania:manaPetal1.name=Oranje Mana Bloemblad item.botania:manaPetal2.name=Magenta Mana Bloemblad diff --git a/src/main/resources/assets/botania/lang/pt_br.lang b/src/main/resources/assets/botania/lang/pt_br.lang index 8cc40b9a4..2dfa49f2f 100644 --- a/src/main/resources/assets/botania/lang/pt_br.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -1303,53 +1303,53 @@ item.botania:twigWand.name=Varinha da Floresta item.botania:manasteel_ingot.name=Barra de Manasteel item.botania:mana_pearl.name=Pérola de Mana item.botania:mana_diamond.name=Diamante de Mana -item.botania:lensNormal.name= Lentes de Mana -item.botania:lensSpeed.name=Lentes de Mana: Velocidade -item.botania:lensSpeed.short=Velocidade -item.botania:lensPower.name=Lentes de Mana: Potência -item.botania:lensPower.short=Potência -item.botania:lensTime.name=Lentes de Mana: Resistência -item.botania:lensTime.short=Resistência -item.botania:lensEfficiency.name=Lentes de Mana: Eficiência -item.botania:lensEfficiency.short=Eficiência -item.botania:lensBounce.name=Lentes de Mana: Ricochete -item.botania:lensBounce.short=Ricochete -item.botania:lensGravity.name=Lentes de Mana: Gravidade -item.botania:lensGravity.short=Gravidade -item.botania:lensMine.name=Lentes de Mana: Escavação -item.botania:lensMine.short=Escavação -item.botania:lensDamage.name=Lentes de Mana: Dano -item.botania:lensDamage.short=Dano -item.botania:lensPhantom.name=Lentes de Mana: Fantasma -item.botania:lensPhantom.short=Fantasma -item.botania:lensMagnet.name=Lentes de Mana: Magnetismo -item.botania:lensMagnet.short=Magnetismo -item.botania:lensExplosive.name=Lentes de Mana: Entropia -item.botania:lensExplosive.short=Entropia -item.botania:lensInfluence.name=Lentes de Mana: Influência -item.botania:lensInfluence.short=Influência -item.botania:lensWeight.name=Lentes de Mana: Peso -item.botania:lensWeight.short=Peso -item.botania:lensPaint.name=Lentes de Mana: Paintslinger -item.botania:lensPaint.short=Paintslinger -item.botania:lensFire.name=Lentes de Mana: Aquecer -item.botania:lensFire.short=Aquecer -item.botania:lensPiston.name=Lentes de Mana: Poder -item.botania:lensPiston.short=Poder -item.botania:lensLight.name=Lentes de Mana: Clarão -item.botania:lensLight.short=Clarão -item.botania:lensWarp.name=Lentes de Mana: Teleporte -item.botania:lensWarp.short=Teleporte -item.botania:lensRedirect.name=Lentes de Mana: Redirecional -item.botania:lensRedirect.short=Redirecional -item.botania:lensFirework.name=Lentes de Mana: Celebração -item.botania:lensFirework.short=Celebração -item.botania:lensFlare.name=Lentes de Mana: Labareda -item.botania:lensFlare.short=Labareda -item.botania:lensMessenger.name=Lentes de Mana: Mensageira -item.botania:lensMessenger.short=Mensageira -item.botania:lensTripwire.name=Lentes de Mana: Fio de armadilha -item.botania:lensTripwire.short=Fio de armadilha +item.botania:lens_normal.name= Lentes de Mana +item.botania:lens_speed.name=Lentes de Mana: Velocidade +item.botania:lens_speed.short=Velocidade +item.botania:lens_power.name=Lentes de Mana: Potência +item.botania:lens_power.short=Potência +item.botania:lens_time.name=Lentes de Mana: Resistência +item.botania:lens_time.short=Resistência +item.botania:lens_efficiency.name=Lentes de Mana: Eficiência +item.botania:lens_efficiency.short=Eficiência +item.botania:lens_bounce.name=Lentes de Mana: Ricochete +item.botania:lens_bounce.short=Ricochete +item.botania:lens_gravity.name=Lentes de Mana: Gravidade +item.botania:lens_gravity.short=Gravidade +item.botania:lens_mine.name=Lentes de Mana: Escavação +item.botania:lens_mine.short=Escavação +item.botania:lens_damage.name=Lentes de Mana: Dano +item.botania:lens_damage.short=Dano +item.botania:lens_phantom.name=Lentes de Mana: Fantasma +item.botania:lens_phantom.short=Fantasma +item.botania:lens_magnet.name=Lentes de Mana: Magnetismo +item.botania:lens_magnet.short=Magnetismo +item.botania:lens_explosive.name=Lentes de Mana: Entropia +item.botania:lens_explosive.short=Entropia +item.botania:lens_influence.name=Lentes de Mana: Influência +item.botania:lens_influence.short=Influência +item.botania:lens_weight.name=Lentes de Mana: Peso +item.botania:lens_weight.short=Peso +item.botania:lens_paint.name=Lentes de Mana: Paintslinger +item.botania:lens_paint.short=Paintslinger +item.botania:lens_fire.name=Lentes de Mana: Aquecer +item.botania:lens_fire.short=Aquecer +item.botania:lens_piston.name=Lentes de Mana: Poder +item.botania:lens_piston.short=Poder +item.botania:lens_light.name=Lentes de Mana: Clarão +item.botania:lens_light.short=Clarão +item.botania:lens_warp.name=Lentes de Mana: Teleporte +item.botania:lens_warp.short=Teleporte +item.botania:lens_redirect.name=Lentes de Mana: Redirecional +item.botania:lens_redirect.short=Redirecional +item.botania:lens_firework.name=Lentes de Mana: Celebração +item.botania:lens_firework.short=Celebração +item.botania:lens_flare.name=Lentes de Mana: Labareda +item.botania:lens_flare.short=Labareda +item.botania:lens_messenger.name=Lentes de Mana: Mensageira +item.botania:lens_messenger.short=Mensageira +item.botania:lens_tripwire.name=Lentes de Mana: Fio de armadilha +item.botania:lens_tripwire.short=Fio de armadilha item.botania:rune0.name=Runa da Água item.botania:rune1.name=Runa do Fogo item.botania:rune2.name=Runa da Terra diff --git a/src/main/resources/assets/botania/lang/ru_ru.lang b/src/main/resources/assets/botania/lang/ru_ru.lang index a6c4f4449..57ebdeb68 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -553,39 +553,39 @@ item.botania:twigWand.name=Посох леса item.botania:manasteel_ingot.name=Слиток манастали item.botania:mana_pearl.name=Жемчуг маны item.botania:mana_diamond.name=Маналмаз -item.botania:lensNormal.name=Линзы маны -item.botania:lensSpeed.name=Линзы маны: Скорость -item.botania:lensSpeed.short=Скорость -item.botania:lensPower.name=Линзы маны: Потенциал -item.botania:lensPower.short=Потенциал -item.botania:lensTime.name=Линзы маны: Сопротивление -item.botania:lensTime.short=Сопротивление -item.botania:lensEfficiency.name=Линзы маны: Эффективность -item.botania:lensEfficiency.short=Эффективность -item.botania:lensBounce.name=Линзы маны: Отскок -item.botania:lensBounce.short=Отскок -item.botania:lensGravity.name=Линзы маны: Гравитация -item.botania:lensGravity.short=Гравитация -item.botania:lensMine.name=Линзы маны: Бурение -item.botania:lensMine.short=Бурение -item.botania:lensDamage.name=Линзы маны: Повреждение -item.botania:lensDamage.short=Повреждение -item.botania:lensPhantom.name=Линзы маны: Призрачность -item.botania:lensPhantom.short=Призрачность -item.botania:lensMagnet.name=Линзы маны: Магнетизм -item.botania:lensMagnet.short=Магнетизм -item.botania:lensExplosive.name=Линзы маны: Энтропия -item.botania:lensExplosive.short=Энтропия -item.botania:lensInfluence.name=Линзы маны: Воздействие -item.botania:lensInfluence.short=Воздействие -item.botania:lensWeight.name=Линзы маны: Масса -item.botania:lensWeight.short=Масса -item.botania:lensPaint.name=Линзы маны: Отражатель краски -item.botania:lensPaint.short=Отражатель краски -item.botania:lensFire.name=Линзы маны: Поджог -item.botania:lensFire.short=Поджог -item.botania:lensPiston.name=Линзы маны: Сила -item.botania:lensPiston.short=Сила +item.botania:lens_normal.name=Линзы маны +item.botania:lens_speed.name=Линзы маны: Скорость +item.botania:lens_speed.short=Скорость +item.botania:lens_power.name=Линзы маны: Потенциал +item.botania:lens_power.short=Потенциал +item.botania:lens_time.name=Линзы маны: Сопротивление +item.botania:lens_time.short=Сопротивление +item.botania:lens_efficiency.name=Линзы маны: Эффективность +item.botania:lens_efficiency.short=Эффективность +item.botania:lens_bounce.name=Линзы маны: Отскок +item.botania:lens_bounce.short=Отскок +item.botania:lens_gravity.name=Линзы маны: Гравитация +item.botania:lens_gravity.short=Гравитация +item.botania:lens_mine.name=Линзы маны: Бурение +item.botania:lens_mine.short=Бурение +item.botania:lens_damage.name=Линзы маны: Повреждение +item.botania:lens_damage.short=Повреждение +item.botania:lens_phantom.name=Линзы маны: Призрачность +item.botania:lens_phantom.short=Призрачность +item.botania:lens_magnet.name=Линзы маны: Магнетизм +item.botania:lens_magnet.short=Магнетизм +item.botania:lens_explosive.name=Линзы маны: Энтропия +item.botania:lens_explosive.short=Энтропия +item.botania:lens_influence.name=Линзы маны: Воздействие +item.botania:lens_influence.short=Воздействие +item.botania:lens_weight.name=Линзы маны: Масса +item.botania:lens_weight.short=Масса +item.botania:lens_paint.name=Линзы маны: Отражатель краски +item.botania:lens_paint.short=Отражатель краски +item.botania:lens_fire.name=Линзы маны: Поджог +item.botania:lens_fire.short=Поджог +item.botania:lens_piston.name=Линзы маны: Сила +item.botania:lens_piston.short=Сила item.botania:manaPetal0.name=Белый лепесток маны item.botania:manaPetal1.name=Оранжевый лепесток маны item.botania:manaPetal2.name=Сиреневый лепесток маны diff --git a/src/main/resources/assets/botania/lang/zh_cn.lang b/src/main/resources/assets/botania/lang/zh_cn.lang index 47e444f06..15420f04d 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -1300,53 +1300,53 @@ item.botania:twigWand.name=森林法杖 item.botania:manasteel_ingot.name=魔力钢锭 item.botania:mana_pearl.name=魔力珍珠 item.botania:mana_diamond.name=魔力钻石 -item.botania:lensNormal.name=魔力透镜 -item.botania:lensSpeed.name=魔力透镜:速度 -item.botania:lensSpeed.short=速度 -item.botania:lensPower.name=魔力透镜:强度 -item.botania:lensPower.short=强度 -item.botania:lensTime.name=魔力透镜:阻力 -item.botania:lensTime.short=阻力 -item.botania:lensEfficiency.name=魔力透镜:效率 -item.botania:lensEfficiency.short=效率 -item.botania:lensBounce.name=魔力透镜:反射 -item.botania:lensBounce.short=反射 -item.botania:lensGravity.name=魔力透镜:引力 -item.botania:lensGravity.short=引力 -item.botania:lensMine.name=魔力透镜:挖掘 -item.botania:lensMine.short=挖掘 -item.botania:lensDamage.name=魔力透镜:伤害 -item.botania:lensDamage.short=伤害 -item.botania:lensPhantom.name=魔力透镜:虚化 -item.botania:lensPhantom.short=虚化 -item.botania:lensMagnet.name=魔力透镜:磁化 -item.botania:lensMagnet.short=磁化 -item.botania:lensExplosive.name=魔力透镜:爆炸 -item.botania:lensExplosive.short=爆炸 -item.botania:lensInfluence.name=魔力透镜:推力 -item.botania:lensInfluence.short=推力 -item.botania:lensWeight.name=魔力透镜:重力 -item.botania:lensWeight.short=重力 -item.botania:lensPaint.name=魔力透镜:涂色 -item.botania:lensPaint.short=涂色 -item.botania:lensFire.name=魔力透镜:引燃 -item.botania:lensFire.short=引燃 -item.botania:lensPiston.name=魔力透镜:力量 -item.botania:lensPiston.short=力量 -item.botania:lensLight.name=魔力透镜:闪光 -item.botania:lensLight.short=闪光 -item.botania:lensWarp.name=魔力透镜:传送 -item.botania:lensWarp.short=传送 -item.botania:lensRedirect.name=魔力透镜:变向 -item.botania:lensRedirect.short=变向 -item.botania:lensFirework.name=魔力透镜:喜庆 -item.botania:lensFirework.short=喜庆 -item.botania:lensFlare.name=魔力透镜:闪耀 -item.botania:lensFlare.short=闪耀 -item.botania:lensMessenger.name=魔力透镜:信使 -item.botania:lensMessenger.short=信使 -item.botania:lensTripwire.name=魔力透镜:绊线 -item.botania:lensTripwire.short=绊线 +item.botania:lens_normal.name=魔力透镜 +item.botania:lens_speed.name=魔力透镜:速度 +item.botania:lens_speed.short=速度 +item.botania:lens_power.name=魔力透镜:强度 +item.botania:lens_power.short=强度 +item.botania:lens_time.name=魔力透镜:阻力 +item.botania:lens_time.short=阻力 +item.botania:lens_efficiency.name=魔力透镜:效率 +item.botania:lens_efficiency.short=效率 +item.botania:lens_bounce.name=魔力透镜:反射 +item.botania:lens_bounce.short=反射 +item.botania:lens_gravity.name=魔力透镜:引力 +item.botania:lens_gravity.short=引力 +item.botania:lens_mine.name=魔力透镜:挖掘 +item.botania:lens_mine.short=挖掘 +item.botania:lens_damage.name=魔力透镜:伤害 +item.botania:lens_damage.short=伤害 +item.botania:lens_phantom.name=魔力透镜:虚化 +item.botania:lens_phantom.short=虚化 +item.botania:lens_magnet.name=魔力透镜:磁化 +item.botania:lens_magnet.short=磁化 +item.botania:lens_explosive.name=魔力透镜:爆炸 +item.botania:lens_explosive.short=爆炸 +item.botania:lens_influence.name=魔力透镜:推力 +item.botania:lens_influence.short=推力 +item.botania:lens_weight.name=魔力透镜:重力 +item.botania:lens_weight.short=重力 +item.botania:lens_paint.name=魔力透镜:涂色 +item.botania:lens_paint.short=涂色 +item.botania:lens_fire.name=魔力透镜:引燃 +item.botania:lens_fire.short=引燃 +item.botania:lens_piston.name=魔力透镜:力量 +item.botania:lens_piston.short=力量 +item.botania:lens_light.name=魔力透镜:闪光 +item.botania:lens_light.short=闪光 +item.botania:lens_warp.name=魔力透镜:传送 +item.botania:lens_warp.short=传送 +item.botania:lens_redirect.name=魔力透镜:变向 +item.botania:lens_redirect.short=变向 +item.botania:lens_firework.name=魔力透镜:喜庆 +item.botania:lens_firework.short=喜庆 +item.botania:lens_flare.name=魔力透镜:闪耀 +item.botania:lens_flare.short=闪耀 +item.botania:lens_messenger.name=魔力透镜:信使 +item.botania:lens_messenger.short=信使 +item.botania:lens_tripwire.name=魔力透镜:绊线 +item.botania:lens_tripwire.short=绊线 item.botania:rune0.name=水之符文 item.botania:rune1.name=火之符文 item.botania:rune2.name=地之符文 diff --git a/src/main/resources/assets/botania/lang/zh_tw.lang b/src/main/resources/assets/botania/lang/zh_tw.lang index 510e72179..a9b2dd30f 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -1270,49 +1270,49 @@ item.botania:twigWand.name=森林法杖 item.botania:manasteel_ingot.name=瑪那鋼錠 item.botania:mana_pearl.name=瑪那珍珠 item.botania:mana_diamond.name=瑪那鑽石 -item.botania:lensNormal.name=瑪那透鏡 -item.botania:lensSpeed.name=瑪那透鏡:速度 -item.botania:lensSpeed.short=速度 -item.botania:lensPower.name=瑪那透鏡:強度 -item.botania:lensPower.short=強度 -item.botania:lensTime.name=瑪那透鏡:阻力 -item.botania:lensTime.short=阻力 -item.botania:lensEfficiency.name=瑪那透鏡:效率 -item.botania:lensEfficiency.short=效率 -item.botania:lensBounce.name=瑪那透鏡:反射 -item.botania:lensBounce.short=反射 -item.botania:lensGravity.name=瑪那透鏡:引力 -item.botania:lensGravity.short=引力 -item.botania:lensMine.name=瑪那透鏡:挖掘 -item.botania:lensMine.short=挖掘 -item.botania:lensDamage.name=瑪那透鏡:傷害 -item.botania:lensDamage.short=傷害 -item.botania:lensPhantom.name=瑪那透鏡:虛化 -item.botania:lensPhantom.short=虛化 -item.botania:lensMagnet.name=瑪那透鏡:磁化 -item.botania:lensMagnet.short=磁化 -item.botania:lensExplosive.name=瑪那透鏡:爆炸 -item.botania:lensExplosive.short=爆炸 -item.botania:lensInfluence.name=瑪那透鏡:推力 -item.botania:lensInfluence.short=推力 -item.botania:lensWeight.name=瑪那透鏡:重力 -item.botania:lensWeight.short=重力 -item.botania:lensPaint.name=瑪那透鏡:塗色 -item.botania:lensPaint.short=塗色 -item.botania:lensFire.name=瑪那透鏡:引燃 -item.botania:lensFire.short=引燃 -item.botania:lensPiston.name=瑪那透鏡:力量 -item.botania:lensPiston.short=力量 -item.botania:lensLight.name=瑪那透鏡:閃光 -item.botania:lensLight.short=閃光 -item.botania:lensWarp.name=瑪那透鏡:傳送 -item.botania:lensWarp.short=傳送 -item.botania:lensRedirect.name=瑪那透鏡:變向 -item.botania:lensRedirect.short=變向 -item.botania:lensFirework.name=瑪那透鏡:喜慶 -item.botania:lensFirework.short=喜慶 -item.botania:lensFlare.name=瑪那透鏡:閃耀 -item.botania:lensFlare.short=閃耀 +item.botania:lens_normal.name=瑪那透鏡 +item.botania:lens_speed.name=瑪那透鏡:速度 +item.botania:lens_speed.short=速度 +item.botania:lens_power.name=瑪那透鏡:強度 +item.botania:lens_power.short=強度 +item.botania:lens_time.name=瑪那透鏡:阻力 +item.botania:lens_time.short=阻力 +item.botania:lens_efficiency.name=瑪那透鏡:效率 +item.botania:lens_efficiency.short=效率 +item.botania:lens_bounce.name=瑪那透鏡:反射 +item.botania:lens_bounce.short=反射 +item.botania:lens_gravity.name=瑪那透鏡:引力 +item.botania:lens_gravity.short=引力 +item.botania:lens_mine.name=瑪那透鏡:挖掘 +item.botania:lens_mine.short=挖掘 +item.botania:lens_damage.name=瑪那透鏡:傷害 +item.botania:lens_damage.short=傷害 +item.botania:lens_phantom.name=瑪那透鏡:虛化 +item.botania:lens_phantom.short=虛化 +item.botania:lens_magnet.name=瑪那透鏡:磁化 +item.botania:lens_magnet.short=磁化 +item.botania:lens_explosive.name=瑪那透鏡:爆炸 +item.botania:lens_explosive.short=爆炸 +item.botania:lens_influence.name=瑪那透鏡:推力 +item.botania:lens_influence.short=推力 +item.botania:lens_weight.name=瑪那透鏡:重力 +item.botania:lens_weight.short=重力 +item.botania:lens_paint.name=瑪那透鏡:塗色 +item.botania:lens_paint.short=塗色 +item.botania:lens_fire.name=瑪那透鏡:引燃 +item.botania:lens_fire.short=引燃 +item.botania:lens_piston.name=瑪那透鏡:力量 +item.botania:lens_piston.short=力量 +item.botania:lens_light.name=瑪那透鏡:閃光 +item.botania:lens_light.short=閃光 +item.botania:lens_warp.name=瑪那透鏡:傳送 +item.botania:lens_warp.short=傳送 +item.botania:lens_redirect.name=瑪那透鏡:變向 +item.botania:lens_redirect.short=變向 +item.botania:lens_firework.name=瑪那透鏡:喜慶 +item.botania:lens_firework.short=喜慶 +item.botania:lens_flare.name=瑪那透鏡:閃耀 +item.botania:lens_flare.short=閃耀 item.botania:rune0.name=水之符文 item.botania:rune1.name=火之符文 item.botania:rune2.name=地之符文 diff --git a/src/main/resources/assets/botania/models/item/lensbounce.json b/src/main/resources/assets/botania/models/item/lens_bounce.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensbounce.json rename to src/main/resources/assets/botania/models/item/lens_bounce.json diff --git a/src/main/resources/assets/botania/models/item/lensdamage.json b/src/main/resources/assets/botania/models/item/lens_damage.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensdamage.json rename to src/main/resources/assets/botania/models/item/lens_damage.json diff --git a/src/main/resources/assets/botania/models/item/lensefficiency.json b/src/main/resources/assets/botania/models/item/lens_efficiency.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensefficiency.json rename to src/main/resources/assets/botania/models/item/lens_efficiency.json diff --git a/src/main/resources/assets/botania/models/item/lensexplosive.json b/src/main/resources/assets/botania/models/item/lens_explosive.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensexplosive.json rename to src/main/resources/assets/botania/models/item/lens_explosive.json diff --git a/src/main/resources/assets/botania/models/item/lensfire.json b/src/main/resources/assets/botania/models/item/lens_fire.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensfire.json rename to src/main/resources/assets/botania/models/item/lens_fire.json diff --git a/src/main/resources/assets/botania/models/item/lensfirework.json b/src/main/resources/assets/botania/models/item/lens_firework.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensfirework.json rename to src/main/resources/assets/botania/models/item/lens_firework.json diff --git a/src/main/resources/assets/botania/models/item/lensflare.json b/src/main/resources/assets/botania/models/item/lens_flare.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensflare.json rename to src/main/resources/assets/botania/models/item/lens_flare.json diff --git a/src/main/resources/assets/botania/models/item/lensgravity.json b/src/main/resources/assets/botania/models/item/lens_gravity.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensgravity.json rename to src/main/resources/assets/botania/models/item/lens_gravity.json diff --git a/src/main/resources/assets/botania/models/item/lensinfluence.json b/src/main/resources/assets/botania/models/item/lens_influence.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensinfluence.json rename to src/main/resources/assets/botania/models/item/lens_influence.json diff --git a/src/main/resources/assets/botania/models/item/lenslight.json b/src/main/resources/assets/botania/models/item/lens_light.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenslight.json rename to src/main/resources/assets/botania/models/item/lens_light.json diff --git a/src/main/resources/assets/botania/models/item/lensmagnet.json b/src/main/resources/assets/botania/models/item/lens_magnet.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensmagnet.json rename to src/main/resources/assets/botania/models/item/lens_magnet.json diff --git a/src/main/resources/assets/botania/models/item/lensmessenger.json b/src/main/resources/assets/botania/models/item/lens_messenger.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensmessenger.json rename to src/main/resources/assets/botania/models/item/lens_messenger.json diff --git a/src/main/resources/assets/botania/models/item/lensmine.json b/src/main/resources/assets/botania/models/item/lens_mine.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensmine.json rename to src/main/resources/assets/botania/models/item/lens_mine.json diff --git a/src/main/resources/assets/botania/models/item/lensnormal.json b/src/main/resources/assets/botania/models/item/lens_normal.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensnormal.json rename to src/main/resources/assets/botania/models/item/lens_normal.json diff --git a/src/main/resources/assets/botania/models/item/lenspaint.json b/src/main/resources/assets/botania/models/item/lens_paint.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenspaint.json rename to src/main/resources/assets/botania/models/item/lens_paint.json diff --git a/src/main/resources/assets/botania/models/item/lensphantom.json b/src/main/resources/assets/botania/models/item/lens_phantom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensphantom.json rename to src/main/resources/assets/botania/models/item/lens_phantom.json diff --git a/src/main/resources/assets/botania/models/item/lenspiston.json b/src/main/resources/assets/botania/models/item/lens_piston.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenspiston.json rename to src/main/resources/assets/botania/models/item/lens_piston.json diff --git a/src/main/resources/assets/botania/models/item/lenspower.json b/src/main/resources/assets/botania/models/item/lens_power.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenspower.json rename to src/main/resources/assets/botania/models/item/lens_power.json diff --git a/src/main/resources/assets/botania/models/item/lensredirect.json b/src/main/resources/assets/botania/models/item/lens_redirect.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensredirect.json rename to src/main/resources/assets/botania/models/item/lens_redirect.json diff --git a/src/main/resources/assets/botania/models/item/lensspeed.json b/src/main/resources/assets/botania/models/item/lens_speed.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensspeed.json rename to src/main/resources/assets/botania/models/item/lens_speed.json diff --git a/src/main/resources/assets/botania/models/item/lens_storm.json b/src/main/resources/assets/botania/models/item/lens_storm.json new file mode 100644 index 000000000..f1f3682cc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lens_storm.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lens", + "layer1": "botania:items/lens_normal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstime.json b/src/main/resources/assets/botania/models/item/lens_time.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenstime.json rename to src/main/resources/assets/botania/models/item/lens_time.json diff --git a/src/main/resources/assets/botania/models/item/lenstripwire.json b/src/main/resources/assets/botania/models/item/lens_tripwire.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenstripwire.json rename to src/main/resources/assets/botania/models/item/lens_tripwire.json diff --git a/src/main/resources/assets/botania/models/item/lenswarp.json b/src/main/resources/assets/botania/models/item/lens_warp.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lenswarp.json rename to src/main/resources/assets/botania/models/item/lens_warp.json diff --git a/src/main/resources/assets/botania/models/item/lensweight.json b/src/main/resources/assets/botania/models/item/lens_weight.json similarity index 100% rename from src/main/resources/assets/botania/models/item/lensweight.json rename to src/main/resources/assets/botania/models/item/lens_weight.json diff --git a/src/main/resources/assets/botania/recipes/lens_5.json b/src/main/resources/assets/botania/recipes/lens_bounce.json similarity index 60% rename from src/main/resources/assets/botania/recipes/lens_5.json rename to src/main/resources/assets/botania/recipes/lens_bounce.json index 3b9176076..0567a1499 100644 --- a/src/main/resources/assets/botania/recipes/lens_5.json +++ b/src/main/resources/assets/botania/recipes/lens_bounce.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 5 + "item": "botania:lens_bounce" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNESUMMERB" diff --git a/src/main/resources/assets/botania/recipes/lens_8.json b/src/main/resources/assets/botania/recipes/lens_damage.json similarity index 59% rename from src/main/resources/assets/botania/recipes/lens_8.json rename to src/main/resources/assets/botania/recipes/lens_damage.json index 8fbac4f60..b7464481d 100644 --- a/src/main/resources/assets/botania/recipes/lens_8.json +++ b/src/main/resources/assets/botania/recipes/lens_damage.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 8 + "item": "botania:lens_damage" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEWRATHB" diff --git a/src/main/resources/assets/botania/recipes/lens_4.json b/src/main/resources/assets/botania/recipes/lens_efficiency.json similarity index 59% rename from src/main/resources/assets/botania/recipes/lens_4.json rename to src/main/resources/assets/botania/recipes/lens_efficiency.json index a8998539f..bc7198ebb 100644 --- a/src/main/resources/assets/botania/recipes/lens_4.json +++ b/src/main/resources/assets/botania/recipes/lens_efficiency.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 4 + "item": "botania:lens_efficiency" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEWATERB" diff --git a/src/main/resources/assets/botania/recipes/lens_11.json b/src/main/resources/assets/botania/recipes/lens_explosive.json similarity index 59% rename from src/main/resources/assets/botania/recipes/lens_11.json rename to src/main/resources/assets/botania/recipes/lens_explosive.json index 5815058b9..2365a9e52 100644 --- a/src/main/resources/assets/botania/recipes/lens_11.json +++ b/src/main/resources/assets/botania/recipes/lens_explosive.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 11 + "item": "botania:lens_explosive" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEENVYB" diff --git a/src/main/resources/assets/botania/recipes/lens_15.json b/src/main/resources/assets/botania/recipes/lens_fire.json similarity index 62% rename from src/main/resources/assets/botania/recipes/lens_15.json rename to src/main/resources/assets/botania/recipes/lens_fire.json index 7d7e4179f..351214c99 100644 --- a/src/main/resources/assets/botania/recipes/lens_15.json +++ b/src/main/resources/assets/botania/recipes/lens_fire.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 15 + "item": "botania:lens_fire" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "minecraft:fire_charge" diff --git a/src/main/resources/assets/botania/recipes/lens_20.json b/src/main/resources/assets/botania/recipes/lens_firework.json similarity index 68% rename from src/main/resources/assets/botania/recipes/lens_20.json rename to src/main/resources/assets/botania/recipes/lens_firework.json index e5cb8c388..9c97005ec 100644 --- a/src/main/resources/assets/botania/recipes/lens_20.json +++ b/src/main/resources/assets/botania/recipes/lens_firework.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 20 + "item": "botania:lens_firework" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "minecraft:fireworks" diff --git a/src/main/resources/assets/botania/recipes/lens_21.json b/src/main/resources/assets/botania/recipes/lens_flare.json similarity index 67% rename from src/main/resources/assets/botania/recipes/lens_21.json rename to src/main/resources/assets/botania/recipes/lens_flare.json index 6dd5749d9..4e929632a 100644 --- a/src/main/resources/assets/botania/recipes/lens_21.json +++ b/src/main/resources/assets/botania/recipes/lens_flare.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 21 + "item": "botania:lens_flare" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "botania:elfglass" diff --git a/src/main/resources/assets/botania/recipes/lens_6.json b/src/main/resources/assets/botania/recipes/lens_gravity.json similarity index 60% rename from src/main/resources/assets/botania/recipes/lens_6.json rename to src/main/resources/assets/botania/recipes/lens_gravity.json index d4e14bd51..84d5bb7ec 100644 --- a/src/main/resources/assets/botania/recipes/lens_6.json +++ b/src/main/resources/assets/botania/recipes/lens_gravity.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 6 + "item": "botania:lens_gravity" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEWINTERB" diff --git a/src/main/resources/assets/botania/recipes/lens_12.json b/src/main/resources/assets/botania/recipes/lens_influence.json similarity index 72% rename from src/main/resources/assets/botania/recipes/lens_12.json rename to src/main/resources/assets/botania/recipes/lens_influence.json index 1cac74fdf..2113d5ade 100644 --- a/src/main/resources/assets/botania/recipes/lens_12.json +++ b/src/main/resources/assets/botania/recipes/lens_influence.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 12 + "item": "botania:lens_influence" }, "pattern": [ "PRP", @@ -17,8 +16,7 @@ "item": "#RUNEAIRB" }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/lens_17.json b/src/main/resources/assets/botania/recipes/lens_light.json similarity index 72% rename from src/main/resources/assets/botania/recipes/lens_17.json rename to src/main/resources/assets/botania/recipes/lens_light.json index b4118c58e..cc8a4f23e 100644 --- a/src/main/resources/assets/botania/recipes/lens_17.json +++ b/src/main/resources/assets/botania/recipes/lens_light.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 17 + "item": "botania:lens_light" }, "pattern": [ "GFG", @@ -17,8 +16,7 @@ "item": "#GLOWSTONE" }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/lens_17_alt.json b/src/main/resources/assets/botania/recipes/lens_light_alt.json similarity index 72% rename from src/main/resources/assets/botania/recipes/lens_17_alt.json rename to src/main/resources/assets/botania/recipes/lens_light_alt.json index 0ec1ca44c..3a1297ebb 100644 --- a/src/main/resources/assets/botania/recipes/lens_17_alt.json +++ b/src/main/resources/assets/botania/recipes/lens_light_alt.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 17 + "item": "botania:lens_light" }, "pattern": [ "FGF", @@ -17,8 +16,7 @@ "item": "#GLOWSTONE" }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/lens_10.json b/src/main/resources/assets/botania/recipes/lens_magnet.json similarity index 65% rename from src/main/resources/assets/botania/recipes/lens_10.json rename to src/main/resources/assets/botania/recipes/lens_magnet.json index 0d7f0603f..e300b737b 100644 --- a/src/main/resources/assets/botania/recipes/lens_10.json +++ b/src/main/resources/assets/botania/recipes/lens_magnet.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 10 + "item": "botania:lens_magnet" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#INGOTIRON" diff --git a/src/main/resources/assets/botania/recipes/lens_22.json b/src/main/resources/assets/botania/recipes/lens_messenger.json similarity index 68% rename from src/main/resources/assets/botania/recipes/lens_22.json rename to src/main/resources/assets/botania/recipes/lens_messenger.json index bdbc3e880..10b697e3e 100644 --- a/src/main/resources/assets/botania/recipes/lens_22.json +++ b/src/main/resources/assets/botania/recipes/lens_messenger.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 22 + "item": "botania:lens_messenger" }, "pattern": [ " P ", @@ -14,8 +13,7 @@ "item": "minecraft:paper" }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/lens_7.json b/src/main/resources/assets/botania/recipes/lens_mine.json similarity index 76% rename from src/main/resources/assets/botania/recipes/lens_7.json rename to src/main/resources/assets/botania/recipes/lens_mine.json index ac57ae13d..857018bb6 100644 --- a/src/main/resources/assets/botania/recipes/lens_7.json +++ b/src/main/resources/assets/botania/recipes/lens_mine.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 7 + "item": "botania:lens_mine" }, "pattern": [ " P ", @@ -20,8 +19,7 @@ "item": "#DUSTREDSTONE" }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/lens_0_glass_block.json b/src/main/resources/assets/botania/recipes/lens_normal_glass_block.json similarity index 84% rename from src/main/resources/assets/botania/recipes/lens_0_glass_block.json rename to src/main/resources/assets/botania/recipes/lens_normal_glass_block.json index 0d288e74a..c197569df 100644 --- a/src/main/resources/assets/botania/recipes/lens_0_glass_block.json +++ b/src/main/resources/assets/botania/recipes/lens_normal_glass_block.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, "pattern": [ " S ", diff --git a/src/main/resources/assets/botania/recipes/lens_0_glass_pane.json b/src/main/resources/assets/botania/recipes/lens_normal_glass_pane.json similarity index 84% rename from src/main/resources/assets/botania/recipes/lens_0_glass_pane.json rename to src/main/resources/assets/botania/recipes/lens_normal_glass_pane.json index 77a80809c..41b7f19bc 100644 --- a/src/main/resources/assets/botania/recipes/lens_0_glass_pane.json +++ b/src/main/resources/assets/botania/recipes/lens_normal_glass_pane.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, "pattern": [ " S ", diff --git a/src/main/resources/assets/botania/recipes/lens_14.json b/src/main/resources/assets/botania/recipes/lens_paint.json similarity index 74% rename from src/main/resources/assets/botania/recipes/lens_14.json rename to src/main/resources/assets/botania/recipes/lens_paint.json index cb347bc92..02620e92a 100644 --- a/src/main/resources/assets/botania/recipes/lens_14.json +++ b/src/main/resources/assets/botania/recipes/lens_paint.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 14 + "item": "botania:lens_paint" }, "pattern": [ " E ", @@ -18,8 +17,7 @@ "data": 32767 }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/lens_9.json b/src/main/resources/assets/botania/recipes/lens_phantom.json similarity index 64% rename from src/main/resources/assets/botania/recipes/lens_9.json rename to src/main/resources/assets/botania/recipes/lens_phantom.json index 21db6b1e8..d7f7319d3 100644 --- a/src/main/resources/assets/botania/recipes/lens_9.json +++ b/src/main/resources/assets/botania/recipes/lens_phantom.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 9 + "item": "botania:lens_phantom" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "botania:platform", diff --git a/src/main/resources/assets/botania/recipes/lens_16.json b/src/main/resources/assets/botania/recipes/lens_piston.json similarity index 62% rename from src/main/resources/assets/botania/recipes/lens_16.json rename to src/main/resources/assets/botania/recipes/lens_piston.json index 3c5026137..0c17e06ab 100644 --- a/src/main/resources/assets/botania/recipes/lens_16.json +++ b/src/main/resources/assets/botania/recipes/lens_piston.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 16 + "item": "botania:lens_piston" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "botania:pistonrelay" diff --git a/src/main/resources/assets/botania/recipes/lens_2.json b/src/main/resources/assets/botania/recipes/lens_power.json similarity index 59% rename from src/main/resources/assets/botania/recipes/lens_2.json rename to src/main/resources/assets/botania/recipes/lens_power.json index 64aa70472..5247765a8 100644 --- a/src/main/resources/assets/botania/recipes/lens_2.json +++ b/src/main/resources/assets/botania/recipes/lens_power.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 2 + "item": "botania:lens_power" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEFIREB" diff --git a/src/main/resources/assets/botania/recipes/lens_19.json b/src/main/resources/assets/botania/recipes/lens_redirect.json similarity index 67% rename from src/main/resources/assets/botania/recipes/lens_19.json rename to src/main/resources/assets/botania/recipes/lens_redirect.json index d13bd1434..36222904f 100644 --- a/src/main/resources/assets/botania/recipes/lens_19.json +++ b/src/main/resources/assets/botania/recipes/lens_redirect.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 19 + "item": "botania:lens_redirect" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#LIVINGWOOD" diff --git a/src/main/resources/assets/botania/recipes/lens_1.json b/src/main/resources/assets/botania/recipes/lens_speed.json similarity index 59% rename from src/main/resources/assets/botania/recipes/lens_1.json rename to src/main/resources/assets/botania/recipes/lens_speed.json index 9de8c737e..e9de52bac 100644 --- a/src/main/resources/assets/botania/recipes/lens_1.json +++ b/src/main/resources/assets/botania/recipes/lens_speed.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 1 + "item": "botania:lens_speed" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEAIRB" diff --git a/src/main/resources/assets/botania/recipes/lens_3.json b/src/main/resources/assets/botania/recipes/lens_time.json similarity index 59% rename from src/main/resources/assets/botania/recipes/lens_3.json rename to src/main/resources/assets/botania/recipes/lens_time.json index 7eac6f58c..752004b2e 100644 --- a/src/main/resources/assets/botania/recipes/lens_3.json +++ b/src/main/resources/assets/botania/recipes/lens_time.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 3 + "item": "botania:lens_time" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#RUNEEARTHB" diff --git a/src/main/resources/assets/botania/recipes/lens_23.json b/src/main/resources/assets/botania/recipes/lens_tripwire.json similarity index 68% rename from src/main/resources/assets/botania/recipes/lens_23.json rename to src/main/resources/assets/botania/recipes/lens_tripwire.json index e37a6ae56..2931f3480 100644 --- a/src/main/resources/assets/botania/recipes/lens_23.json +++ b/src/main/resources/assets/botania/recipes/lens_tripwire.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 23 + "item": "botania:lens_tripwire" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "minecraft:tripwire_hook" diff --git a/src/main/resources/assets/botania/recipes/lens_18.json b/src/main/resources/assets/botania/recipes/lens_warp.json similarity index 60% rename from src/main/resources/assets/botania/recipes/lens_18.json rename to src/main/resources/assets/botania/recipes/lens_warp.json index f6bf40009..70df27d14 100644 --- a/src/main/resources/assets/botania/recipes/lens_18.json +++ b/src/main/resources/assets/botania/recipes/lens_warp.json @@ -1,12 +1,10 @@ { "result": { - "item": "botania:lens", - "data": 18 + "item": "botania:lens_warp" }, "ingredients": [ { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" }, { "item": "#ELVENPIXIEDUST" diff --git a/src/main/resources/assets/botania/recipes/lens_13.json b/src/main/resources/assets/botania/recipes/lens_weight.json similarity index 72% rename from src/main/resources/assets/botania/recipes/lens_13.json rename to src/main/resources/assets/botania/recipes/lens_weight.json index 0b4cc13f2..196e41b96 100644 --- a/src/main/resources/assets/botania/recipes/lens_13.json +++ b/src/main/resources/assets/botania/recipes/lens_weight.json @@ -1,7 +1,6 @@ { "result": { - "item": "botania:lens", - "data": 13 + "item": "botania:lens_weight" }, "pattern": [ "PPP", @@ -17,8 +16,7 @@ "item": "#RUNEWATERB" }, "L": { - "item": "botania:lens", - "data": 0 + "item": "botania:lens_normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/recipes/magnetring.json b/src/main/resources/assets/botania/recipes/magnetring.json index 803fa60e8..6ecc0a516 100644 --- a/src/main/resources/assets/botania/recipes/magnetring.json +++ b/src/main/resources/assets/botania/recipes/magnetring.json @@ -10,8 +10,7 @@ "type": "forge:ore_shaped", "key": { "L": { - "item": "botania:lens", - "data": 10 + "item": "botania:lens_magnet" }, "M": { "item": "#INGOTMANASTEEL"