diff --git a/build.gradle b/build.gradle index 56d7e8a..36ca962 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = "1.14.4-1.0.0" +version = "1.15.2-1.0.0" group = "network.pxl8.stonecatalysts" archivesBaseName = "stonecatalysts" @@ -75,9 +75,9 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.14.4-28.2.0' + minecraft 'net.minecraftforge:forge:1.15.2-31.1.12' - compileOnly "quark:Quark:r2.0:210" + //compileOnly "quark:Quark:r2.0:210" } jar { diff --git a/src/main/java/network/pxl8/stonecatalysts/StoneCatalysts.java b/src/main/java/network/pxl8/stonecatalysts/StoneCatalysts.java index abc5830..10a8d91 100644 --- a/src/main/java/network/pxl8/stonecatalysts/StoneCatalysts.java +++ b/src/main/java/network/pxl8/stonecatalysts/StoneCatalysts.java @@ -21,7 +21,5 @@ public StoneCatalysts() { Configuration.loadConfig(Configuration.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("stonecatalysts-common.toml")); } - private void setup(final FMLCommonSetupEvent event) { - LibMeta.LOG.debug("StoneCatalysts"); - } + private void setup(final FMLCommonSetupEvent event) { } } diff --git a/src/main/java/network/pxl8/stonecatalysts/config/Configuration.java b/src/main/java/network/pxl8/stonecatalysts/config/Configuration.java index 410f159..51c9eea 100644 --- a/src/main/java/network/pxl8/stonecatalysts/config/Configuration.java +++ b/src/main/java/network/pxl8/stonecatalysts/config/Configuration.java @@ -35,8 +35,8 @@ private static void setupBaseConfig() { } private static void setupCompatConfig() { - ENABLE_QUARK_COMPAT = COMMON_BUILDER.comment("Adds quark stones (Basalt, Marble, Limestone, Slate, Jasper) as catalysts") - .define("ENABLE_QUARK_COMPAT", true); + //ENABLE_QUARK_COMPAT = COMMON_BUILDER.comment("Adds quark stones (Basalt, Marble, Limestone, Slate, Jasper) as catalysts") + // .define("ENABLE_QUARK_COMPAT", true); COMMON_BUILDER.pop(); } diff --git a/src/main/java/network/pxl8/stonecatalysts/event/StoneGen.java b/src/main/java/network/pxl8/stonecatalysts/event/StoneGen.java index 28f7ef0..4a34bb7 100644 --- a/src/main/java/network/pxl8/stonecatalysts/event/StoneGen.java +++ b/src/main/java/network/pxl8/stonecatalysts/event/StoneGen.java @@ -7,11 +7,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; import network.pxl8.stonecatalysts.config.Configuration; -import network.pxl8.stonecatalysts.lib.LibMeta; -import vazkii.quark.world.module.NewStoneTypesModule; +//import vazkii.quark.world.module.NewStoneTypesModule; @Mod.EventBusSubscriber @@ -43,12 +41,12 @@ private static void doReplacements(BlockEvent.FluidPlaceBlockEvent event, BlockS replaceBlock(event, catalyst, Blocks.DIORITE.getDefaultState()); replaceBlock(event, catalyst, Blocks.ANDESITE.getDefaultState()); - if(ModList.get().isLoaded("quark") && Configuration.ENABLE_QUARK_COMPAT.get()) { - replaceBlock(event, catalyst, NewStoneTypesModule.marbleBlock.getDefaultState()); - replaceBlock(event, catalyst, NewStoneTypesModule.limestoneBlock.getDefaultState()); - replaceBlock(event, catalyst, NewStoneTypesModule.jasperBlock.getDefaultState()); - replaceBlock(event, catalyst, NewStoneTypesModule.slateBlock.getDefaultState()); - replaceBlock(event, catalyst, NewStoneTypesModule.basaltBlock.getDefaultState()); - } + //if(ModList.get().isLoaded("quark") && Configuration.ENABLE_QUARK_COMPAT.get()) { + // replaceBlock(event, catalyst, NewStoneTypesModule.marbleBlock.getDefaultState()); + // replaceBlock(event, catalyst, NewStoneTypesModule.limestoneBlock.getDefaultState()); + // replaceBlock(event, catalyst, NewStoneTypesModule.jasperBlock.getDefaultState()); + // replaceBlock(event, catalyst, NewStoneTypesModule.slateBlock.getDefaultState()); + // replaceBlock(event, catalyst, NewStoneTypesModule.basaltBlock.getDefaultState()); + //} } }