Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8
This commit is contained in:
commit
df213bc22a
2 changed files with 9 additions and 2 deletions
|
@ -69,9 +69,9 @@ configurations {
|
||||||
|
|
||||||
def ENV = System.getenv()
|
def ENV = System.getenv()
|
||||||
if (ENV.BUILD_NUMBER) {
|
if (ENV.BUILD_NUMBER) {
|
||||||
version = "0.7.3." + "${System.getenv().BUILD_NUMBER}"
|
version = "0.7.4." + "${System.getenv().BUILD_NUMBER}"
|
||||||
} else {
|
} else {
|
||||||
version = "0.7.3.BUILD"
|
version = "0.7.4.BUILD"
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import net.minecraftforge.fml.common.Loader;
|
||||||
import techreborn.compat.jei.JEIPlugin;
|
import techreborn.compat.jei.JEIPlugin;
|
||||||
import techreborn.compat.recipes.RecipesStandalone;
|
import techreborn.compat.recipes.RecipesStandalone;
|
||||||
import techreborn.compat.waila.CompatModuleWaila;
|
import techreborn.compat.waila.CompatModuleWaila;
|
||||||
|
import techreborn.config.ConfigTechReborn;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
@ -36,6 +37,12 @@ public class CompatManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void registerCompact(Class<?> moduleClass, Object... objs) {
|
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;
|
||||||
|
}
|
||||||
for (Object obj : objs) {
|
for (Object obj : objs) {
|
||||||
if (obj instanceof String) {
|
if (obj instanceof String) {
|
||||||
String modid = (String) obj;
|
String modid = (String) obj;
|
||||||
|
|
Loading…
Add table
Reference in a new issue