upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1012 from Vazkii/revert-994-master

Browse Source 
Revert "Added a config option for configuring the mana cost of Flugel…
This commit is contained in:
Lizbeth Rika committed 2015-05-23 23:18:01 +01:00
2 parents 3ef9e751d9 608fc09c76
commit aedbe5fb5c
3 files changed
+2 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java
-4
View File
@@ -60,7 +60,6 @@ public final class ConfigHandler {
public static boolean relicsEnabled = true;
public static boolean stones18Enabled = true;
public static boolean ringOfOdinFireResist = true;
public static int flightTiaraManaCost = 35;
public static int flowerQuantity = 2;
public static int flowerDensity = 16;
@@ -180,9 +179,6 @@ public final class ConfigHandler {
desc = "Set this to false to make the Ring of Odin not apply fire resistance. Mostly for people who use Witchery transformations.";
ringOfOdinFireResist = loadPropBool("ringOfOdin.fireResist", desc, ringOfOdinFireResist);
desc = "The mana cost of Flugel tiara. Default: 35.";
flightTiaraManaCost = loadPropInt("flightTiara.manaCost", desc, flightTiaraManaCost);
desc = "The quantity of Botania flower patches to generate in the world, defaults to 2, the lower the number the less patches generate.";
flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, flowerQuantity);
src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java
+2 -2
View File
@@ -47,7 +47,6 @@ import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.achievement.ICraftAchievement;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.lib.LibItemNames;
@@ -64,6 +63,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
private static ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO);
public static List<String> playersWithFlight = new ArrayList();
private static final int COST = 35;
public static IIcon[] wingIcons;
private static final int SUBTYPES = 8;
@@ -153,7 +153,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
player.capabilities.allowFlying = true;
if(player.capabilities.isFlying) {
if(!player.worldObj.isRemote)
ManaItemHandler.requestManaExact(tiara, player, ConfigHandler.flightTiaraManaCost, true);
ManaItemHandler.requestManaExact(tiara, player, COST, true);
else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) {
double x = event.entityLiving.posX - 0.5;
double y = event.entityLiving.posY - 1.7;
src/main/resources/assets/botania/lang/en_US.lang
-1
View File
@@ -251,7 +251,6 @@ manaFluxfield.enabled=Enable Mana Fluxfield
relics.enabled=Enable Relics
18stones.enabled=Enable 1.8 Stones
ringOfOdin.fireResist=Enable Ring of Odin Fire Resist
flightTiara.manaCost=Flügel Tiara Mana Cost
flower.forceCheck=Flower Force Checking
enderPickpocket.enabled=Enable Ender Pickpocketing
thermalily.obsidian=Thermalily Needs Obsidian