mirror of
https://github.com/GTNewHorizons/BloodMagic.git
synced 2026-11-20 20:12:17 +00:00
Merge branch 'master' into item-refactor
This commit is contained in:
4 files changed
+12
-2
No files matched your search
+2
-2
@@ -24,9 +24,9 @@
|
||||
|
||||
dependencies {
|
||||
api("com.github.GTNewHorizons:waila:1.8.4:dev")
|
||||
api("com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev")
|
||||
api("com.github.GTNewHorizons:NotEnoughItems:2.7.40-GTNH:dev")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.240:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.254:dev") {transitive = false }
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:Botania:1.12.6-GTNH:api") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.7:api") {transitive = false }
|
||||
|
||||
@@ -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