From fdb506ad15569dca033c536bbb87adf78c02c7a2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 8 Oct 2016 21:56:24 +0100 Subject: [PATCH] Remove some config settings that break things, fixes #732 --- build.gradle | 4 +- .../java/techreborn/compat/CompatManager.java | 47 +++++++++++-------- src/main/java/techreborn/init/ModRecipes.java | 3 +- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 14e799289..fd476828c 100644 --- a/build.gradle +++ b/build.gradle @@ -97,8 +97,8 @@ dependencies { deobfCompile 'RebornCore:RebornCore-1.10.2:+:universal' deobfCompile "mezz.jei:jei_1.10.2:+" // compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf" - deobfCompile "slimeknights.mantle:Mantle:1.9.4-0.10.1.jenkins142" - deobfCompile "slimeknights:TConstruct:1.9.4-2.3.1.jenkins229" + deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" + deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" deobfCompile "mcjty.theoneprobe:TheOneProbe:1.9.4-1.0.4-14" deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:dev' } diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 78f12385b..d7ad1b677 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -26,27 +26,29 @@ public class CompatManager { public CompatManager() { isIC2Loaded = Loader.isModLoaded("IC2"); isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage"); - registerCompact(MinetweakerCompat.class, "MineTweaker3"); - registerCompact(TechRebornParts.class, "reborncore-mcmultipart"); - registerCompact(ClientPartLoader.class, "reborncore-mcmultipart", "@client"); - registerCompact(StandalonePartCompact.class, "!reborncore-mcmultipart"); - registerCompact(WailaMcMultiPartCompact.class, "reborncore-mcmultipart", "Waila", "!IC2"); - registerCompact(CompatModuleWaila.class, "Waila"); - registerCompact(CompatModuleTinkers.class, "tconstruct"); - registerCompact(CompactTheOneProbe.class, "theoneprobe"); - //registerCompact(CompatModulePsi.class, "Psi"); - registerCompact(RecipesIC2.class, "IC2"); + register(MinetweakerCompat.class, "MineTweaker3"); + registerCompact(TechRebornParts.class, false, "reborncore-mcmultipart"); + registerCompact(ClientPartLoader.class, false, "reborncore-mcmultipart", "@client"); + registerCompact(StandalonePartCompact.class, false, "!reborncore-mcmultipart"); + registerCompact(WailaMcMultiPartCompact.class, false, "reborncore-mcmultipart", "Waila", "!IC2"); + register(CompatModuleWaila.class, "Waila"); + register(CompatModuleTinkers.class, "tconstruct"); + register(CompactTheOneProbe.class, "theoneprobe"); + //register(CompatModulePsi.class, "Psi"); + register(RecipesIC2.class, "IC2"); } - public void registerCompact(Class moduleClass, Object... objs) { - boolean shouldLoad = ConfigTechReborn.config - .get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true, - "Should the " + moduleClass.getSimpleName() + " be loaded?") - .getBoolean(true); - if (ConfigTechReborn.config.hasChanged()) - ConfigTechReborn.config.save(); - if (!shouldLoad) { - return; + public void register(Class moduleClass,Object... objs){ + registerCompact(moduleClass, true, objs); + } + + public void registerCompact(Class moduleClass, boolean config, Object... objs) { + boolean shouldLoad = true; + if(config){ + shouldLoad = ConfigTechReborn.config + .get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true, + "Should the " + moduleClass.getSimpleName() + " be loaded?") + .getBoolean(true); } for (Object obj : objs) { if (obj instanceof String) { @@ -73,6 +75,13 @@ public class CompatManager { return; } } + if(config){ + if (ConfigTechReborn.config.hasChanged()) + ConfigTechReborn.config.save(); + if (!shouldLoad) { + return; + } + } try { compatModules.add(moduleClass.newInstance()); } catch (InstantiationException e) { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index a2e54b917..b3da0f4ff 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -448,10 +448,11 @@ public class ModRecipes { boolean ore = data[0].equals("ore"); Core.logHelper.debug("Ore: " + data[1]); - ItemStack dust = getDictOreOrNull(joinDictName("dust", data[1]), ore ? 2 : 1).copy(); + ItemStack dust = getDictOreOrNull(joinDictName("dust", data[1]), ore ? 2 : 1); if (dust == null || dust.getItem() == null) { continue; } + dust = dust.copy(); dust.stackSize = 2; RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22)); }