MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.15: Fixed client setup dist marker (issue #73). Forge version updates. Tree Cutter opt-out config ported.

Browse source
This commit is contained in:
stfwi 2019-12-29 00:07:33 +01:00
parent 16ac3b3a70
commit 70ea5c81db
14 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java
View file

@ -213,6 +213,11 @@ public class ModConfig
@Config.RequiresMcRestart
public boolean without_mineral_smelter = false;
@Config.Comment({"Disable the Small Tree Cutter."})
@Config.Name("Without tree cutter")
@Config.RequiresMcRestart
public boolean without_treecutter = false;
@Config.Comment({"Disable the Small Mikling Machine."})
@Config.Name("Without milking machine")
@Config.RequiresMcRestart
@ -534,6 +539,7 @@ public class ModConfig
if(block instanceof BlockDecorMineralSmelter) return optout.without_mineral_smelter;
if(block instanceof BlockDecorMilker) return optout.without_milker;
if(block instanceof BlockDecorPipeValve) return optout.without_valves;
if(block instanceof BlockDecorTreeCutter) return optout.without_treecutter;
// Type based evaluation where later filters may match, too
if(optout.without_slabs && (block instanceof BlockDecorSlab)) return true;

2
1.12/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java
View file

@ -73,7 +73,7 @@ public class RecipeCondModSpecific implements IConditionFactory
return RECIPE_INCLUDE; // no missing given, means include if result and required are all there.
}
} catch(Throwable ex) {
ModEngineersDecor.logger.error("rsgauges::ResultRegisteredCondition failed: " + ex.toString());
ModEngineersDecor.logger.error("ResultRegisteredCondition failed: " + ex.toString());
}
return exclude(); // skip on exception.
}