Merge branch 'master' of https://github.com/TechReborn/TechReborn

build.gradle

@@ -61,9 +61,9 @@ repositories {
 
 def ENV = System.getenv()
 if (ENV.BUILD_NUMBER) {
-    version = "0.3.1." + "${System.getenv().BUILD_NUMBER}"
+    version = "0.3.2." + "${System.getenv().BUILD_NUMBER}"
 } else {
-    version = "0.3.1.BUILD"
+    version = "0.3.2.BUILD"
 }
 
 minecraft {

src/main/java/techreborn/compat/recipes/RecipesBiomesOPlenty.java

@@ -15,6 +15,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import techreborn.api.recipe.RecipeHandler;
 import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
 import techreborn.compat.ICompatModule;
+import techreborn.config.ConfigTechReborn;
 
 public class RecipesBiomesOPlenty implements ICompatModule {
     @Override
@@ -24,6 +25,7 @@ public class RecipesBiomesOPlenty implements ICompatModule {
 
     @Override
     public void init(FMLInitializationEvent event) {
+    	if (ConfigTechReborn.AllowBOPRecipes){
 	        ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0);
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPCBlocks.logs1, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(BOPCBlocks.planks, 6, 0), pulpStack, null, 200, 30, false));
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPCBlocks.logs1, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(BOPCBlocks.planks, 6, 0), pulpStack, IC2Items.getItem("cell"), 200, 30, false));
@@ -81,6 +83,7 @@ public class RecipesBiomesOPlenty implements ICompatModule {
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPCBlocks.logs4, 1, 3), IC2Items.getItem("waterCell"), null, new ItemStack(BOPCBlocks.planks, 6, 14), pulpStack, IC2Items.getItem("cell"), 200, 30, false));
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(BOPCBlocks.logs4, 1, 3), new ItemStack(Items.water_bucket), null, new ItemStack(BOPCBlocks.planks, 6, 14), pulpStack, new ItemStack(Items.bucket), 200, 30, false));
     	}
+    }
 
     @Override
     public void postInit(FMLPostInitializationEvent event) {

src/main/java/techreborn/compat/recipes/RecipesForestry.java

@@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import techreborn.api.recipe.RecipeHandler;
 import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
 import techreborn.compat.ICompatModule;
+import techreborn.config.ConfigTechReborn;
 
 public class RecipesForestry implements ICompatModule {
     @Override
@@ -24,6 +25,7 @@ public class RecipesForestry implements ICompatModule {
 
     @Override
     public void init(FMLInitializationEvent event) {
+    	if (ConfigTechReborn.AllowForestryRecipes) {
 	        ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0);
 	
 	        //Regular wood
@@ -260,6 +262,7 @@ public class RecipesForestry implements ICompatModule {
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ForestryBlock.fireproofLog8.getItemStack(1, 0), IC2Items.getItem("waterCell"), null, ForestryBlock.fireproofPlanks2.getItemStack(6, 12), pulpStack, IC2Items.getItem("cell"), 200, 30, false));
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(ForestryBlock.fireproofLog8.getItemStack(1, 0), new ItemStack(Items.water_bucket), null, ForestryBlock.fireproofPlanks2.getItemStack(6, 12), pulpStack, new ItemStack(Items.bucket), 200, 30, false));
     	}
+    }
 
     @Override
     public void postInit(FMLPostInitializationEvent event) {

src/main/java/techreborn/compat/recipes/RecipesNatura.java

@@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import techreborn.api.recipe.RecipeHandler;
 import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
 import techreborn.compat.ICompatModule;
+import techreborn.config.ConfigTechReborn;
 
 public class RecipesNatura implements ICompatModule {
     @Override
@@ -24,6 +25,7 @@ public class RecipesNatura implements ICompatModule {
 
     @Override
     public void init(FMLInitializationEvent event) {
+    	if (ConfigTechReborn.AllowNaturaRecipes) {
 	        ItemStack pulpStack = OreDictionary.getOres("pulpWood").get(0);
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 0), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(NContent.planks, 6, 0), pulpStack, null, 200, 30, false));
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.tree, 1, 0), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 0), pulpStack, IC2Items.getItem("cell"), 200, 30, false));
@@ -73,6 +75,7 @@ public class RecipesNatura implements ICompatModule {
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 1), IC2Items.getItem("waterCell"), null, new ItemStack(NContent.planks, 6, 12), pulpStack, IC2Items.getItem("cell"), 200, 30, false));
 	        RecipeHandler.addRecipe(new IndustrialSawmillRecipe(new ItemStack(NContent.darkTree, 1, 1), new ItemStack(Items.water_bucket), null, new ItemStack(NContent.planks, 6, 12), pulpStack, new ItemStack(Items.bucket), 200, 30, false));
     	}
+    }
 
     @Override
     public void postInit(FMLPostInitializationEvent event) {

src/main/java/techreborn/config/ConfigTechReborn.java

@@ -13,6 +13,8 @@ public class ConfigTechReborn {
     public static String CATEGORY_CRAFTING = "crafting";
     public static String CATEGORY_UU = "uu";
     public static String CATEGORY_EMC = "emc";
+    public static String CATEGORY_INTEGRATION = "Integration";
+
 
     // WORLDGEN
     public static boolean GalenaOreTrue;
@@ -109,7 +111,6 @@ public class ConfigTechReborn {
     public static boolean ExpensiveDrill;
     public static boolean ExpensiveDiamondDrill;
     public static boolean ExpensiveSolar;
-
     // UU
     public static boolean HideUuRecipes;
     public static boolean UUrecipesIridiamOre;
@@ -151,7 +152,10 @@ public class ConfigTechReborn {
     public static boolean UUrecipesTungstenDust;
     public static boolean UUrecipesTitaniumDust;
     public static boolean UUrecipesAluminumDust;
-
+    // Integration
+    public static boolean AllowForestryRecipes;
+    public static boolean AllowBOPRecipes;
+    public static boolean AllowNaturaRecipes;
     // EMC
 
     // Client
@@ -648,14 +652,20 @@ public class ConfigTechReborn {
                         StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTitaniumDust.tooltip"))
                 .getBoolean(true);
 
-        UUrecipesAluminumDust = config
+        UUrecipesAluminumDust = config.get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesAluminumDust"),
-                .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesAluminumDust"), true,
+        		true, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesAluminumDust.tooltip")).getBoolean(true);
-                        StatCollector.translateToLocal("config.techreborn.allow.UUrecipesAluminumDust.tooltip"))
-                .getBoolean(true);
 
         ShowChargeHud = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.showChargehud"),
                 true, StatCollector.translateToLocal("config.techreborn.showChargehud.tooltip")).getBoolean(true);
         
+        //Integration
+        AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, StatCollector.translateToLocal("config.techreborn.allowBopRecipes"),
+                true, StatCollector.translateToLocal("config.techreborn.allowBopRecipes.tooltip")).getBoolean(true);
+        AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, StatCollector.translateToLocal("config.techreborn.allowForestryRecipes"),
+                true, StatCollector.translateToLocal("config.techreborn.allowForestryRecipes.tooltip")).getBoolean(true);
+        AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, StatCollector.translateToLocal("config.techreborn.allowNaturaRecipes"),
+                true, StatCollector.translateToLocal("config.techreborn.allowNaturaRecipes.tooltip")).getBoolean(true);
+
         if (config.hasChanged())
             config.save();
     }

src/main/java/techreborn/config/TechRebornConfigGui.java

@@ -39,6 +39,9 @@ public class TechRebornConfigGui extends GuiConfig {
         list.add(new DummyConfigElement.DummyCategoryElement(StatCollector
                 .translateToLocal("config.techreborn.category.emc"),
                 "tr.configgui.category.tremc", TREMC.class));
+        list.add(new DummyConfigElement.DummyCategoryElement(StatCollector
+                .translateToLocal("config.techreborn.category.integration"),
+                "tr.configgui.category.treinter", TRINT.class));
 
         return list;
     }
@@ -179,4 +182,26 @@ public class TechRebornConfigGui extends GuiConfig {
                             .toString()));
         }
     }
+    
+    //Mod Integration
+    public static class TRINT extends CategoryEntry {
+        public TRINT(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {
+            super(owningScreen, owningEntryList, configElement);
+        }
+
+        @Override
+        protected GuiScreen buildChildScreen() {
+            return new GuiConfig(this.owningScreen,
+                    (new ConfigElement(ConfigTechReborn.config
+                            .getCategory(ConfigTechReborn.CATEGORY_INTEGRATION)))
+                            .getChildElements(), this.owningScreen.modID,
+                    Configuration.CATEGORY_GENERAL,
+                    this.configElement.requiresWorldRestart()
+                            || this.owningScreen.allRequireWorldRestart,
+                    this.configElement.requiresMcRestart()
+                            || this.owningScreen.allRequireMcRestart,
+                    GuiConfig.getAbridgedConfigPath(ConfigTechReborn.config
+                            .toString()));
+        }
+    }
 }