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

1.12/readme.md

@@ -17,8 +17,10 @@ Mod sources for Minecraft version 1.12.2.
                       * Texture and model improvements.
                       * Lang file updates.
                       * Minor bug fixes.
+                      * Config options added.
                   -------------------------------------------------------------------
                   [M] Updated zh_cn lang file (scikirbypoke).
+                  [A] Added opt-out config for the Small Tree Cutter.
 
     - v1.0.17-b3  [F] Fixed Small Block Breaker facings to the horizontal range (issue #70, thx JimMiningWorm).
 

1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java

@@ -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;

1.12/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java

@@ -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.
   }

1.14/gradle.properties

@@ -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

1.14/readme.md

@@ -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).
 

1.14/src/main/java/wile/engineersdecor/detail/ModConfig.java

@@ -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;

1.15/gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.15.1
-version_forge_minecraft=1.15.1-30.0.15
+version_forge_minecraft=1.15.1-30.0.16
 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

1.15/meta/update.json

@@ -1,10 +1,11 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.15.1": {
+    "1.0.18-b1": "[U] Updated to Forge 1.15.1-30.0.16/20190719-1.14.3.\n[F] Client setup Dist annotation fixed (issue #73, thx hitsu420).\n[F] Double newline escapes in lang files fixed (\"\\n\" in a tooltip).\n[M] Updated zh_cn lang file (scikirbypoke).\n[A] Added opt-out config for the Small Tree Cutter",
     "1.0.17-b2": "[A] Initial port."
   },
   "promos": {
     "1.15.1-recommended": "",
-    "1.15.1-latest": "1.0.17-b2"
+    "1.15.1-latest": "1.0.18-b1"
   }
 }

1.15/readme.md

@@ -11,9 +11,11 @@ Mod sources for Minecraft version 1.15.1.
 
 ## Version history
 
-    ~ v1.0.17-b3  [U] Updated to Forge 1.15.1-30.0.15/20190719-1.14.3.
+    - v1.0.18-b1  [U] Updated to Forge 1.15.1-30.0.16/20190719-1.14.3.
+                  [F] Client setup Dist annotation fixed (issue #73, thx hitsu420).
                   [F] Double newline escapes in lang files fixed ("\n" in a tooltip).
                   [M] Updated zh_cn lang file (scikirbypoke).
+                  [A] Added opt-out config for the Small Tree Cutter
 
     - v1.0.17-b2  [A] Initial port.
 

1.15/src/main/java/wile/engineersdecor/ModContent.java

@@ -873,6 +873,7 @@ public class ModContent
     //ClientRegistry.bindTileEntityRenderer(TET_TREATED_WOOD_CRAFTING_TABLE, new wile.engineersdecor.detail.ModRenderers.TesrDecorCraftingTable());
   }
 
+  @OnlyIn(Dist.CLIENT)
   public static final void processContentClientSide(final FMLClientSetupEvent event)
   {
     // Block renderer selection

1.15/src/main/java/wile/engineersdecor/detail/ModConfig.java

@@ -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;

1.15/src/main/java/wile/engineersdecor/detail/ModRenderers.java

@@ -67,9 +67,6 @@ public class ModRenderers
     {}
   }
 
-
-
-
   //--------------------------------------------------------------------------------------------------------------------
   // Crafting table
   //--------------------------------------------------------------------------------------------------------------------

1.15/src/main/resources/META-INF/mods.toml

@@ -18,7 +18,7 @@ logoFile="logo.png"
 [[dependencies.engineersdecor]]
   modId="forge"
   mandatory=true
-  versionRange="[30,)"
+  versionRange="[30.0.16,)"
   ordering="NONE"
   side="BOTH"
 

meta/update.json

@@ -6,7 +6,7 @@
     "1.14.4-recommended": "",
     "1.14.4-latest": "1.0.17-b3",
     "1.15.1-recommended": "",
-    "1.15.1-latest": "1.0.17-b2"
+    "1.15.1-latest": "1.0.18-b1"
   },
   "1.12.2": {
     "1.0.17-b3": "[F] Fixed Small Block Breaker facings to the horizontal range (issue #70, thx JimMiningWorm).",
@@ -118,6 +118,7 @@
     "1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
   },
   "1.15.1": {
+    "1.0.18-b1": "[U] Updated to Forge 1.15.1-30.0.16/20190719-1.14.3.\n[F] Client setup Dist annotation fixed (issue #73, thx hitsu420).\n[F] Double newline escapes in lang files fixed (\"\\n\" in a tooltip).\n[M] Updated zh_cn lang file (scikirbypoke).\n[A] Added opt-out config for the Small Tree Cutter",
     "1.0.17-b2": "[A] Initial port."
   }
 }