mirror of
https://github.com/GTNewHorizons/BloodMagic.git
synced 2026-11-17 10:55:10 +00:00
Merge branch 'master' into meteor-nei
This commit is contained in:
3 files changed
+10
No files matched your search
@@ -493,6 +493,7 @@ public class AlchemicalWizardry {
|
||||
public static boolean causeHungerWithRegen;
|
||||
public static boolean causeHungerChatMessage = true;
|
||||
public static boolean disableBoundToolsRightClick;
|
||||
public static boolean allowPotionRepair;
|
||||
|
||||
public static BlockStack[] secondTierRunes = new BlockStack[10];
|
||||
public static BlockStack[] thirdTierRunes = new BlockStack[10];
|
||||
|
||||
@@ -131,6 +131,7 @@ public class BloodMagicConfiguration {
|
||||
.getBoolean();
|
||||
AlchemicalWizardry.causeHungerChatMessage = config.get("WimpySettings", "causeHungerChatMessage", true)
|
||||
.getBoolean();
|
||||
AlchemicalWizardry.allowPotionRepair = config.get("WimpySettings", "allowPotionRepair", true).getBoolean();
|
||||
// AlchemicalWizardry.lockdownAltar = config.get("WimpySettings", "LockdownAltarWithRegen", true).getBoolean();
|
||||
AlchemicalWizardry.lockdownAltar = false;
|
||||
AlchemicalWizardry.disableBoundToolsRightClick = config
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package WayofTime.alchemicalWizardry.common.items.potion;
|
||||
|
||||
import static WayofTime.alchemicalWizardry.AlchemicalWizardry.allowPotionRepair;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
@@ -347,4 +349,10 @@ public class AlchemyFlask extends Item {
|
||||
potionStack.getTagCompound().setTag("CustomPotionEffects", nbttaglist);
|
||||
return new EntityPotion(worldObj, entityLivingBase, potionStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRepairable() {
|
||||
if (allowPotionRepair) return super.isRepairable();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user