Skip to content

Commit

Permalink
Add enableStationVanillaCrafting config setting
Browse files Browse the repository at this point in the history
- Update mod version
- Update InvTweaks version (1.58 not available)
  • Loading branch information
copygirl committed Mar 23, 2017
1 parent bf02173 commit f48dcb1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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)");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/betterstorage/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f48dcb1

Please sign in to comment.