maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some config settings that break things, fixes #732

Browse source
This commit is contained in:
modmuss50 2016-10-08 21:56:24 +01:00
parent ee9f48bc84
commit fdb506ad15
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
3 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -97,8 +97,8 @@ dependencies {
deobfCompile 'RebornCore:RebornCore-1.10.2:+:universal' deobfCompile 'RebornCore:RebornCore-1.10.2:+:universal'
deobfCompile "mezz.jei:jei_1.10.2:+" deobfCompile "mezz.jei:jei_1.10.2:+"
// compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf" // 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.10.2-2.5.3.jenkins384"
deobfCompile "slimeknights:TConstruct:1.9.4-2.3.1.jenkins229" deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.9.4-1.0.4-14" deobfCompile "mcjty.theoneprobe:TheOneProbe:1.9.4-1.0.4-14"
deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:dev' deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:dev'
} }

47
src/main/java/techreborn/compat/CompatManager.java
View file

@ -26,27 +26,29 @@ public class CompatManager {
public CompatManager() { public CompatManager() {
isIC2Loaded = Loader.isModLoaded("IC2"); isIC2Loaded = Loader.isModLoaded("IC2");
isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage"); isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage");
registerCompact(MinetweakerCompat.class, "MineTweaker3"); register(MinetweakerCompat.class, "MineTweaker3");
registerCompact(TechRebornParts.class, "reborncore-mcmultipart"); registerCompact(TechRebornParts.class, false, "reborncore-mcmultipart");
registerCompact(ClientPartLoader.class, "reborncore-mcmultipart", "@client"); registerCompact(ClientPartLoader.class, false, "reborncore-mcmultipart", "@client");
registerCompact(StandalonePartCompact.class, "!reborncore-mcmultipart"); registerCompact(StandalonePartCompact.class, false, "!reborncore-mcmultipart");
registerCompact(WailaMcMultiPartCompact.class, "reborncore-mcmultipart", "Waila", "!IC2"); registerCompact(WailaMcMultiPartCompact.class, false, "reborncore-mcmultipart", "Waila", "!IC2");
registerCompact(CompatModuleWaila.class, "Waila"); register(CompatModuleWaila.class, "Waila");
registerCompact(CompatModuleTinkers.class, "tconstruct"); register(CompatModuleTinkers.class, "tconstruct");
registerCompact(CompactTheOneProbe.class, "theoneprobe"); register(CompactTheOneProbe.class, "theoneprobe");
//registerCompact(CompatModulePsi.class, "Psi"); //register(CompatModulePsi.class, "Psi");
registerCompact(RecipesIC2.class, "IC2"); register(RecipesIC2.class, "IC2");
} }
public void registerCompact(Class<? extends ICompatModule> moduleClass, Object... objs) { public void register(Class<? extends ICompatModule> moduleClass,Object... objs){
boolean shouldLoad = ConfigTechReborn.config registerCompact(moduleClass, true, objs);
.get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true, }
"Should the " + moduleClass.getSimpleName() + " be loaded?")
.getBoolean(true); public void registerCompact(Class<? extends ICompatModule> moduleClass, boolean config, Object... objs) {
if (ConfigTechReborn.config.hasChanged()) boolean shouldLoad = true;
ConfigTechReborn.config.save(); if(config){
if (!shouldLoad) { shouldLoad = ConfigTechReborn.config
return; .get(ConfigTechReborn.CATEGORY_INTEGRATION, "Compat:" + moduleClass.getSimpleName(), true,
"Should the " + moduleClass.getSimpleName() + " be loaded?")
.getBoolean(true);
} }
for (Object obj : objs) { for (Object obj : objs) {
if (obj instanceof String) { if (obj instanceof String) {
@ -73,6 +75,13 @@ public class CompatManager {
return; return;
} }
} }
if(config){
if (ConfigTechReborn.config.hasChanged())
ConfigTechReborn.config.save();
if (!shouldLoad) {
return;
}
}
try { try {
compatModules.add(moduleClass.newInstance()); compatModules.add(moduleClass.newInstance());
} catch (InstantiationException e) { } catch (InstantiationException e) {

3
src/main/java/techreborn/init/ModRecipes.java
View file

@ -448,10 +448,11 @@ public class ModRecipes {
boolean ore = data[0].equals("ore"); boolean ore = data[0].equals("ore");
Core.logHelper.debug("Ore: " + data[1]); 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) { if (dust == null || dust.getItem() == null) {
continue; continue;
} }
dust = dust.copy();
dust.stackSize = 2; dust.stackSize = 2;
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22)); RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
} }