From f48dcb1243df6f1fc2fc8c605de2493f49ef4503 Mon Sep 17 00:00:00 2001 From: copygirl Date: Thu, 23 Mar 2017 18:22:54 +0100 Subject: [PATCH] Add enableStationVanillaCrafting config setting - Update mod version - Update InvTweaks version (1.58 not available) --- gradle.properties | 4 ++-- .../net/mcft/copy/betterstorage/config/GlobalConfig.java | 5 +++++ .../betterstorage/inventory/InventoryCraftingStation.java | 2 +- src/main/resources/assets/betterstorage/lang/en_US.lang | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 48209650..ce7abf71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -mod_version = 0.13.1.127 +mod_version = 0.13.1.128 minecraft_version = 1.7.10 forge_version = 10.13.4.1492-1.7.10 -invtweaks_version = 1.58 +invtweaks_version = 1.61 aw_version = 1.7.10-0.31.2.82 nei_version = 1.7.10-1.0.3.74 ccc_version = 1.7.10-1.0.4.29 diff --git a/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java b/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java index fc27f6a4..b5f0491b 100644 --- a/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java +++ b/src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java @@ -12,6 +12,7 @@ public class GlobalConfig extends Config { public static BooleanSetting enableCrateInventoryInterfaceSetting; public static BooleanSetting enableCrateStorageInterfaceSetting; public static BooleanSetting enableStationAutoCraftingSetting; + public static BooleanSetting enableStationVanillaCraftingSetting; public static IntegerSetting stationAutocraftDelaySetting; // Tiles @@ -75,6 +76,7 @@ public class GlobalConfig extends Config { public static final String cardboardBoxShowContents = "general.cardboardBoxShowContents"; public static final String enableStationAutoCrafting = "general.enableStationAutoCrafting"; + public static final String enableStationVanillaCrafting = "general.enableStationVanillaCrafting"; public static final String stationAutocraftDelay = "general.stationAutocraftDelay"; public static final String lockBreakable = "general.lockBreakable"; @@ -168,6 +170,9 @@ public GlobalConfig(File file) { enableStationAutoCraftingSetting = new BooleanSetting(this, enableStationAutoCrafting, false).setSynced().setComment( "If enabled, automated systems can pull out of crafting stations and therefore auto-craft items."); + enableStationVanillaCraftingSetting = + new BooleanSetting(this, enableStationVanillaCrafting, true).setSynced().setComment( + "If enabled, regular vanilla crafting recipes can be made inside crafting stations."); stationAutocraftDelaySetting = new IntegerSetting(this, stationAutocraftDelay, 10).setValidRange(0, Integer.MAX_VALUE).setComment( "Delay between recipes being autocrafted in the crafting station, in ticks. (Default: 10)"); diff --git a/src/main/java/net/mcft/copy/betterstorage/inventory/InventoryCraftingStation.java b/src/main/java/net/mcft/copy/betterstorage/inventory/InventoryCraftingStation.java index abafcad4..dfed3d21 100644 --- a/src/main/java/net/mcft/copy/betterstorage/inventory/InventoryCraftingStation.java +++ b/src/main/java/net/mcft/copy/betterstorage/inventory/InventoryCraftingStation.java @@ -66,7 +66,7 @@ public void update() { public void inputChanged() { progress = 0; currentCrafting = BetterStorageCrafting.findMatchingStationCrafting(crafting); - if (currentCrafting == null) + if ((currentCrafting == null) && GlobalConfig.enableStationVanillaCraftingSetting.getValue()) currentCrafting = VanillaStationCrafting.findVanillaRecipe(this); updateGhostOutput(); } diff --git a/src/main/resources/assets/betterstorage/lang/en_US.lang b/src/main/resources/assets/betterstorage/lang/en_US.lang index 1be657fc..b081fd66 100644 --- a/src/main/resources/assets/betterstorage/lang/en_US.lang +++ b/src/main/resources/assets/betterstorage/lang/en_US.lang @@ -141,6 +141,8 @@ config.betterstorage.general.cardboardBoxShowContents=Cardboard Box Show Content config.betterstorage.general.cardboardBoxShowContents.tooltip=If disabled, doesn't show cardboard box contents in their tooltips. config.betterstorage.general.enableStationAutoCrafting=Crafting Station Auto Crafting config.betterstorage.general.enableStationAutoCrafting.tooltip=If enabled, automated systems can pull out of crafting stations and therefore auto-craft items. +config.betterstorage.general.enableStationVanillaCrafting=Crafting Station Vanilla Crafting +config.betterstorage.general.enableStationVanillaCrafting.tooltip=If enabled, regular vanilla crafting recipes can be made inside crafting stations. config.betterstorage.general.stationAutocraftDelay=Auto Crafting Delay config.betterstorage.general.stationAutocraftDelay.tooltip=Delay between recipes being autocrafted in the crafting station, in ticks. config.betterstorage.general.lockBreakable=Breakable Locks