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

4
1.14/gradle.properties
View file

@ -2,7 +2,7 @@
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx8G
version_minecraft=1.14.4
version_forge_minecraft=1.14.4-28.1.104
version_forge_minecraft=1.14.4-28.1.109
version_fml_mappings=20190719-1.14.3
version_jei=1.14.4:6.0.0.10
version_engineersdecor=1.0.17-b3
version_engineersdecor=1.0.18-b1

3
1.14/readme.md
View file

@ -11,6 +11,9 @@ Mod sources for Minecraft version 1.14.4.
## Version history
~ v1.0.18-b1 [U] Updated to Forge 1.14.4-28.1.109/20190719-1.14.3.
[A] Added opt-out config for the Small Tree Cutter.
- v1.0.17-b3 [F] Double newline escapes in lang files fixed ("\n" in a tooltip).
[M] Updated zh_cn lang file (scikirbypoke).

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

@ -122,6 +122,7 @@ public class ModConfig
public final ForgeConfigSpec.BooleanValue without_fluid_funnel;
public final ForgeConfigSpec.BooleanValue without_mineral_smelter;
public final ForgeConfigSpec.BooleanValue without_milking_machine;
public final ForgeConfigSpec.BooleanValue without_tree_cutter;
public final ForgeConfigSpec.BooleanValue without_chair_sitting;
public final ForgeConfigSpec.BooleanValue without_mob_chair_sitting;
public final ForgeConfigSpec.BooleanValue without_ladder_speed_boost;
@ -301,6 +302,10 @@ public class ModConfig
.translation(ModEngineersDecor.MODID + ".config.without_milking_machine")
.comment("Disable the small milking machine.")
.define("without_milking_machine", false);
without_tree_cutter = builder
.translation(ModEngineersDecor.MODID + ".config.without_tree_cutter")
.comment("Disable the small tree cutter.")
.define("without_tree_cutter", false);
without_slabs = builder
.translation(ModEngineersDecor.MODID + ".config.without_slabs")
.comment("Disable horizontal half-block slab.")
@ -533,6 +538,7 @@ public class ModConfig
if(block instanceof BlockDecorSolarPanel) return COMMON.without_solar_panel.get();
if(block instanceof BlockDecorMineralSmelter) return COMMON.without_mineral_smelter.get();
if(block instanceof BlockDecorMilker) return COMMON.without_milking_machine.get();
if(block instanceof BlockDecorTreeCutter) return COMMON.without_tree_cutter.get();
// Type based evaluation where later filters may match, too
if(COMMON.without_slabs.get() && (block instanceof BlockDecorSlab)) return true;
if(COMMON.without_stairs.get() && (block instanceof BlockDecorStairs)) return true;