From 7e28f2e7fed2b6450364626373842dd19f0f9b2e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 12 Jul 2014 00:52:49 +0100 Subject: [PATCH] Alfhomancy rebalance: Part 1. --- .../vazkii/botania/client/lib/LibResources.java | 2 ++ .../botania/client/render/block/RenderPylon.java | 1 + .../client/render/tile/RenderTilePylon.java | 13 +++++++++++-- .../vazkii/botania/common/block/BlockPylon.java | 4 ++-- .../botania/common/block/tile/TilePylon.java | 2 +- .../common/crafting/ModCrafingRecipes.java | 7 +------ .../botania/common/lexicon/LexiconData.java | 6 +++--- resources/assets/botania/lang/en_US.lang | 13 ++++++------- .../assets/botania/textures/model/pylon2.png | Bin 0 -> 5943 bytes .../assets/botania/textures/model/pylonOld2.png | Bin 0 -> 4464 bytes 10 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 resources/assets/botania/textures/model/pylon2.png create mode 100644 resources/assets/botania/textures/model/pylonOld2.png diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index b8e3eb26f..490fe5996 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -64,6 +64,8 @@ public final class LibResources { public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png"; public static final String MODEL_PYLON_GREEN_OLD = PREFIX_MODEL + "pylonOld1.png"; public static final String MODEL_PYLON_GREEN = PREFIX_MODEL + "pylon1.png"; + public static final String MODEL_PYLON_PINK_OLD = PREFIX_MODEL + "pylonOld2.png"; + public static final String MODEL_PYLON_PINK = PREFIX_MODEL + "pylon2.png"; public static final String MODEL_LEXICA = PREFIX_MODEL + "lexica.png"; public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel0.png"; public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.png"; diff --git a/MODSRC/vazkii/botania/client/render/block/RenderPylon.java b/MODSRC/vazkii/botania/client/render/block/RenderPylon.java index eabb60240..b86807c31 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderPylon.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderPylon.java @@ -30,6 +30,7 @@ public class RenderPylon implements ISimpleBlockRenderingHandler { GL11.glPushMatrix(); GL11.glTranslatef(-0.5F, -0.7F, -0.5F); RenderTilePylon.green = metadata == 1; + RenderTilePylon.pink = metadata == 2; TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePylon(), 0.0D, 0.0D, 0.0D, 0.0F); GL11.glPopMatrix(); } diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java b/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java index 64cf44618..972030ee2 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -37,8 +37,12 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureGreenOld = new ResourceLocation(LibResources.MODEL_PYLON_GREEN_OLD); private static final ResourceLocation textureGreen = new ResourceLocation(LibResources.MODEL_PYLON_GREEN); + private static final ResourceLocation texturePinkOld = new ResourceLocation(LibResources.MODEL_PYLON_PINK_OLD); + private static final ResourceLocation texturePink = new ResourceLocation(LibResources.MODEL_PYLON_PINK); + IPylonModel model; public static boolean green = false; + public static boolean pink = false; @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) { @@ -50,10 +54,15 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 1F, 1F, 1F); - if(tileentity.getWorldObj() != null) + if(tileentity.getWorldObj() != null) { green = tileentity.getBlockMetadata() == 1; + pink = tileentity.getBlockMetadata() == 2; + } - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.oldPylonModel ? green ? textureGreenOld : textureOld : green ? textureGreen : texture); + if(ConfigHandler.oldPylonModel) + Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld); + else Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePink : green ? textureGreen : texture); + int worldTime = (int) (tileentity.getWorldObj() == null ? 0 : tileentity.getWorldObj().getTotalWorldTime()); if(tileentity != null) diff --git a/MODSRC/vazkii/botania/common/block/BlockPylon.java b/MODSRC/vazkii/botania/common/block/BlockPylon.java index 000b05379..7403125fe 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPylon.java +++ b/MODSRC/vazkii/botania/common/block/BlockPylon.java @@ -67,13 +67,13 @@ public class BlockPylon extends BlockModContainer implements ILexiconable { @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < 2; i++) + for(int i = 0; i < 3; i++) par3.add(new ItemStack(par1, 1, i)); } @Override public IIcon getIcon(int par1, int par2) { - return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, 1); + return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, par2); } @Override diff --git a/MODSRC/vazkii/botania/common/block/tile/TilePylon.java b/MODSRC/vazkii/botania/common/block/tile/TilePylon.java index d09cb4c84..507007598 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TilePylon.java +++ b/MODSRC/vazkii/botania/common/block/tile/TilePylon.java @@ -76,7 +76,7 @@ public class TilePylon extends TileEntity { } if(worldObj.rand.nextBoolean() && worldObj.isRemote) - Botania.proxy.sparkleFX(worldObj, xCoord + Math.random(), yCoord + Math.random() * 1.5, zCoord + Math.random(), 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2); + Botania.proxy.sparkleFX(worldObj, xCoord + Math.random(), yCoord + Math.random() * 1.5, zCoord + Math.random(), meta == 2 ? 1F : 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2); } private Block getBlockForMeta() { diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 58a8c6b62..8a1e545cc 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -107,7 +107,6 @@ public final class ModCrafingRecipes { public static IRecipe recipeKnocbackBelt; public static IRecipe recipeIcePendant; public static IRecipe recipeLavaPendant; - public static IRecipe recipeLifeEssence; public static IRecipe recipeGoldenLaurel; public static IRecipe recipeTinyPlanetBlock; public static IRecipe recipeAlchemyCatalyst; @@ -603,10 +602,6 @@ public final class ModCrafingRecipes { 'F', LibOreDict.RUNE[1]); recipeLavaPendant = BotaniaAPI.getLatestAddedRecipe(); - // Essence of Eternal Life Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 12, 5), LibOreDict.TERRA_STEEL, new ItemStack(Items.nether_star), new ItemStack(Items.blaze_powder)); - recipeLifeEssence = BotaniaAPI.getLatestAddedRecipe(); - // Golden Laurel Crown Recipe addOreDictRecipe(new ItemStack(ModItems.goldLaurel), "G G", "LEL", "LLL", @@ -763,7 +758,7 @@ public final class ModCrafingRecipes { recipeAlfPortal = BotaniaAPI.getLatestAddedRecipe(); // Natura Pylon Recipe - addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 1), ModBlocks.pylon, LibOreDict.LIFE_ESSENCE, LibOreDict.LIFE_ESSENCE); + addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 2), ModBlocks.pylon, LibOreDict.ELEMENTIUM, ModBlocks.pylon); recipeNaturaPylon = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Seas Recipe diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 5130a1bcd..33ce9f07d 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -195,7 +195,7 @@ public final class LexiconData { new PageRuneRecipe("13", ModRuneRecipes.recipeLustRune), new PageRuneRecipe("14", ModRuneRecipes.recipeGluttonyRune), new PageRuneRecipe("15", ModRuneRecipes.recipeGreedRune), new PageRuneRecipe("16", ModRuneRecipes.recipeSlothRune), new PageRuneRecipe("17", ModRuneRecipes.recipeWrathRune), new PageRuneRecipe("18", ModRuneRecipes.recipeEnvyRune), new PageRuneRecipe("19", ModRuneRecipes.recipePrideRune)); terrasteel = new BLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); - terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeLifeEssence)); + terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1")); // MANA ENTRIES manaIntro = new BLexiconEntry(LibLexicon.MANA_INTRO, categoryMana); @@ -465,7 +465,7 @@ public final class LexiconData { lavaPendant = new BLexiconEntry(LibLexicon.BAUBLE_LAVA_PENDANT, categoryBaubles); lavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLavaPendant)); - goldLaurel = new BLexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles); + goldLaurel = new ALexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles); goldLaurel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeGoldenLaurel)); waterRing = new BLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); @@ -477,7 +477,7 @@ public final class LexiconData { magnetRing = new BLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles); magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeMagnetRing)); - divaCharm = new BLexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles); + divaCharm = new ALexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles); divaCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeDivaCharm)); flightTiara = new ALexiconEntry(LibLexicon.BAUBLE_FLIGHT_TIARA, categoryBaubles); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index a5c2aebb8..39a9a0472 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -214,6 +214,7 @@ tile.botania:pistonRelay.name=Force Relay tile.botania:distributor.name=Mana Distributor tile.botania:pylon0.name=Mana Pylon tile.botania:pylon1.name=Natura Pylon +tile.botania:pylon2.name=Gaia Pylon tile.botania:manaBeacon0.name=White Unstable Beacon tile.botania:manaBeacon1.name=Orange Unstable Beacon tile.botania:manaBeacon2.name=Magenta Unstable Beacon @@ -545,7 +546,7 @@ item.botania:travelBelt.name=Soujourner's Sash item.botania:knockbackBelt.name=Tectonic Girdle item.botania:icePendant.name=Snowflake Pendant item.botania:lavaPendant.name=Pyroclast Pendant -item.botania:lifeEssence.name=Essence of Eternal Life +item.botania:lifeEssence.name=Gaia Sprit item.botania:goldenLaurel.name=Golden Laurel Crown item.botania:redstoneRoot.name=Redstone Root item.botania:magnetRing.name=Ring of Magnetization @@ -672,8 +673,6 @@ botania.page.runeAltar19=The &1Rune of Pride&0. botania.entry.terrasteel=Terrasteel botania.page.terrasteel0=&1Terrasteel&0 is a powerful metal infused with the magic of nature.
Creating this metal proves to not be a short order, in order to create it, toss a &1Manasteel Ingot&0, a &1Mana Pearl&0 and a &1Mana Diamond&0 on top of an &4Active &1Beacon&0. A &1Mana Pool&0 must be present nearby, being at least half full. The infusion will create a single &1Terrasteel Ingot&0. botania.page.terrasteel1=Creating &1Terrasteel&0 -botania.page.terrasteel2=By combining the &1Terrasteel&0 with a &1Nether Star&0 and &1Blaze Powder&0, it's possible to artificially create a small extract of &1Essence of Eternal Life&0, a very powerful component in the creation of magical flora and natural instruments. -botania.page.terrasteel3=These come not from Kyubey # - MANA # -- AN INTRODUCTION TO MANA @@ -1138,7 +1137,7 @@ botania.page.openBucket1=Geeks... # -- LIFE AGGREGATOR botania.entry.spawnerMover=Life Aggregator -botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Essence of Eternal Life&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
It's to note that the device will shatter after being used once. +botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.
It's to note that the device will shatter after being used once. botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet # -- ROD OF BIFROST @@ -1211,7 +1210,7 @@ botania.page.lavaPendant1=Hanako could have used one of these # -- GOLDEN LAUREL CROWN botania.entry.goldenLaurel=Golden Laurel Crown -botania.page.goldenLaurel0=One of the uses for &1Essence of Eternal Life&0 is to, of course, grant a layer of immortality to one that uses it, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. +botania.page.goldenLaurel0=One of the uses for &1Gaia Spritis&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. botania.page.goldenLaurel1=Given the theme, probably Viridi # -- RING OF CHORDATA @@ -1236,7 +1235,7 @@ botania.page.divaCharm1=You shall not disrespect Big Sister # -- FLUGEL TIARA botania.entry.flightTiara=Flügel Tiara -botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
The usage of &1Essence of Eternal Life&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. +botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.
The usage of &1Gaia Spirits&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight. botania.page.flightTiara1=Forty thousand books from another world # -- GREAT FAIRY RING @@ -1246,7 +1245,7 @@ botania.page.pixieRing1=We got square heads, big pointy caps # -- GLOBETROTTER'S SASH botania.entry.superTravelBelt=Globetrotter's Sash -botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Essence of Eternal Life&0 and some Elven resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance. +botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Gaia Spirits&0 and some Elven resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance. botania.page.superTravelBelt1=No time for guessing, follow my plan instead # - ALFHOMANCY diff --git a/resources/assets/botania/textures/model/pylon2.png b/resources/assets/botania/textures/model/pylon2.png new file mode 100644 index 0000000000000000000000000000000000000000..f1f817dec59aa42cec801d2ad7a79e39732a87fd GIT binary patch literal 5943 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 T4n|zyKNCP%UPG=*#xm@G=SMVT literal 0 HcmV?d00001 diff --git a/resources/assets/botania/textures/model/pylonOld2.png b/resources/assets/botania/textures/model/pylonOld2.png new file mode 100644 index 0000000000000000000000000000000000000000..9b240a2b3eb0bb25caf17714a8993e6d392ce99e GIT binary patch literal 4464 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