From 2be8ab17cd79c2ddfb0985a35814795839a9c1be Mon Sep 17 00:00:00 2001 From: Jacky Scrubby Date: Mon, 31 Dec 2018 02:50:58 +0800 Subject: [PATCH] 1.8.2 Update - Re-added Laser Drill integration, since Industrial Foregoing now uses JSON files for all the entries, all files are now loaded to the same directory as the default file. If you disable the integration for a mod via config, the file will be deleted on load as well - Added NuclearCraft integration, closes #38 --- build.gradle | 2 +- gradle.properties | 2 +- .../integration/Integrations.java | 156 +++-- .../laserdrill/LaserDrillHandlerAE2.java | 3 +- .../LaserDrillHandlerActuallyAdditions.java | 2 +- .../LaserDrillHandlerAstralSorcery.java | 4 +- .../laserdrill/LaserDrillHandlerBiomesOP.java | 10 +- .../LaserDrillHandlerEvilCraft.java | 2 +- .../laserdrill/LaserDrillHandlerForestry.java | 2 +- .../LaserDrillHandlerMatterOverdrive.java | 3 +- .../LaserDrillHandlerMysticalAgriculture.java | 3 +- .../LaserDrillHandlerNuclearCraft.java | 12 + .../laserdrill/LaserDrillHandlerRFTools.java | 4 +- .../LaserDrillHandlerSilentsGems.java | 51 +- .../LaserDrillHandlerThermalFoundation.java | 7 +- .../proxy/CommonProxy.java | 2 +- .../integrationforegoing/util/ModConfig.java | 1 + .../integrationforegoing/util/ModNames.java | 1 + .../integrationforegoing/util/ModUtils.java | 22 +- .../integrationforegoing/util/Reference.java | 2 +- .../actuallyadditions_ores.json | 15 + .../appliedenergistics2_ores.json | 28 + .../astralsorcery_ores.json | 41 ++ .../biomesoplenty_ores.json | 119 ++++ .../integrationforegoing/evilcraft_ores.json | 15 + .../integrationforegoing/forestry_ores.json | 15 + .../matteroverdrive_ores.json | 28 + .../mysticalagriculture_ores.json | 80 +++ .../nuclearcraft_ores.json | 54 ++ .../integrationforegoing/rftools_ores.json | 41 ++ .../integrationforegoing/silentgems_ores.json | 626 ++++++++++++++++++ .../thermalfoundation_ores.json | 93 +++ src/main/resources/mcmod.info | 2 +- 33 files changed, 1295 insertions(+), 153 deletions(-) create mode 100644 src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerNuclearCraft.java create mode 100644 src/main/resources/assets/integrationforegoing/actuallyadditions_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/appliedenergistics2_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/astralsorcery_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/biomesoplenty_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/evilcraft_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/forestry_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/matteroverdrive_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/mysticalagriculture_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/nuclearcraft_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/rftools_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/silentgems_ores.json create mode 100644 src/main/resources/assets/integrationforegoing/thermalfoundation_ores.json diff --git a/build.gradle b/build.gradle index 0d8f6a8..7f560c8 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { deobfCompile("mcjty.theoneprobe:TheOneProbe-1.12:+") { transitive = false } - deobfCompile("industrial-foregoing:industrialforegoing-1.12.2:1.12.2:226") { + deobfCompile("industrial-foregoing:industrialforegoing-1.12.2:1.12.3:227") { transitive = false } deobfCompile("slimeknights:TConstruct:1.12.2-2.+") { diff --git a/gradle.properties b/gradle.properties index 128e415..055294a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx4G mc_version=1.12.2 forge_version=1.12.2-14.23.5.2796 -mod_version=1.8.1 +mod_version=1.8.2 mappings_version=stable_39 diff --git a/src/main/java/jackyy/integrationforegoing/integration/Integrations.java b/src/main/java/jackyy/integrationforegoing/integration/Integrations.java index 953fa5c..59bbf66 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/Integrations.java +++ b/src/main/java/jackyy/integrationforegoing/integration/Integrations.java @@ -17,16 +17,23 @@ import jackyy.integrationforegoing.util.ModUtils; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class Integrations { - public static void preInit() { + public static void preInit(FMLPreInitializationEvent event) { if (ModConfig.integrations.thermalFoundation && Loader.isModLoaded(ModNames.TF)) { ModUtils.logIntegration(0, EnumIntegrations.STRAW, ModNames.TF); MinecraftForge.EVENT_BUS.register(new StrawRegistryThermalFoundation()); ModUtils.logIntegration(1, EnumIntegrations.STRAW, ModNames.TF); + + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.TF); + LaserDrillHandlerThermalFoundation.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.TF); + } else if (!ModConfig.integrations.thermalFoundation) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.TF); } if (ModConfig.integrations.immersiveEngineering && Loader.isModLoaded(ModNames.IE)) { ModUtils.logIntegration(0, EnumIntegrations.STRAW, ModNames.IE); @@ -46,11 +53,53 @@ public static void preInit() { MinecraftForge.EVENT_BUS.register(new StrawRegistryTConstruct()); ModUtils.logIntegration(1, EnumIntegrations.STRAW, ModNames.TCON); } + if (ModConfig.integrations.mysticalAgriculture && Loader.isModLoaded(ModNames.MAG)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.MAG); + LaserDrillHandlerMysticalAgriculture.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.MAG); + } else if (!ModConfig.integrations.mysticalAgriculture) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.MAG); + } if (ModConfig.integrations.oreberries && Loader.isModLoaded(ModNames.OREBERRIES)) { ModUtils.logIntegration(0, EnumIntegrations.PLANT, ModNames.OREBERRIES); MinecraftForge.EVENT_BUS.register(new PlantRecollectableOreberries()); ModUtils.logIntegration(1, EnumIntegrations.PLANT, ModNames.OREBERRIES); } + if (ModConfig.integrations.ae2 && Loader.isModLoaded(ModNames.AE2)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.AE2); + LaserDrillHandlerAE2.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.AE2); + } else if (!ModConfig.integrations.ae2) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.AE2); + } + if (ModConfig.integrations.rftools && Loader.isModLoaded(ModNames.RFTOOLS)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.RFTOOLS); + LaserDrillHandlerRFTools.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.RFTOOLS); + } else if (!ModConfig.integrations.rftools) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.RFTOOLS); + } + if (ModConfig.integrations.evilcraft && Loader.isModLoaded(ModNames.EVILCRAFT)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.EVILCRAFT); + LaserDrillHandlerEvilCraft.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.EVILCRAFT); + } else if (!ModConfig.integrations.evilcraft) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.EVILCRAFT); + } + if (ModConfig.integrations.actuallyAdditions && Loader.isModLoaded(ModNames.AA)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.AA); + LaserDrillHandlerActuallyAdditions.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.AA); + } else if (!ModConfig.integrations.actuallyAdditions) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.AA); + } + if (ModConfig.integrations.forestry && Loader.isModLoaded(ModNames.FORESTRY)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.FORESTRY); + LaserDrillHandlerForestry.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.FORESTRY); + } else if (!ModConfig.integrations.forestry) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.FORESTRY); + } if (ModConfig.integrations.extraUtils2 && Loader.isModLoaded(ModNames.XU2)) { ModUtils.logIntegration(0, EnumIntegrations.PLANT, ModNames.XU2); MinecraftForge.EVENT_BUS.register(new PlantRecollectableExtraUtilities2()); @@ -80,11 +129,25 @@ public static void preInit() { MinecraftForge.EVENT_BUS.register(new PlantRecollectableRustic()); ModUtils.logIntegration(1, EnumIntegrations.PLANT, ModNames.RUSTIC); } + if (ModConfig.integrations.matterOverdrive && Loader.isModLoaded(ModNames.MATTEROVERDRIVE)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.MATTEROVERDRIVE); + LaserDrillHandlerMatterOverdrive.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.MATTEROVERDRIVE); + } else if (!ModConfig.integrations.matterOverdrive) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.MATTEROVERDRIVE); + } if (ModConfig.integrations.agriCraft && Loader.isModLoaded(ModNames.AGRICRAFT)) { ModUtils.logIntegration(0, EnumIntegrations.PLANT, ModNames.AGRICRAFT); MinecraftForge.EVENT_BUS.register(new PlantRecollectableAgriCraft()); ModUtils.logIntegration(1, EnumIntegrations.PLANT, ModNames.AGRICRAFT); } + if (ModConfig.integrations.silentsGems && Loader.isModLoaded(ModNames.SILENTSGEMS)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.SILENTSGEMS); + LaserDrillHandlerSilentsGems.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.SILENTSGEMS); + } else if (!ModConfig.integrations.silentsGems) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.SILENTSGEMS); + } if (ModConfig.integrations.enderIO && Loader.isModLoaded(ModNames.ENDERIO)) { ModUtils.logIntegration(0, EnumIntegrations.STRAW, ModNames.ENDERIO); MinecraftForge.EVENT_BUS.register(new StrawRegistryEnderIO()); @@ -99,50 +162,50 @@ public static void preInit() { ModUtils.logIntegration(0, EnumIntegrations.STRAW, ModNames.BIOMESOP); MinecraftForge.EVENT_BUS.register(new StrawRegistryBiomesOP()); ModUtils.logIntegration(1, EnumIntegrations.STRAW, ModNames.BIOMESOP); + + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.BIOMESOP); + LaserDrillHandlerBiomesOP.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.BIOMESOP); + } else if (!ModConfig.integrations.biomesoPlenty) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.BIOMESOP); } if (ModConfig.integrations.astralSorcery && Loader.isModLoaded(ModNames.AS)) { ModUtils.logIntegration(0, EnumIntegrations.STRAW, ModNames.AS); MinecraftForge.EVENT_BUS.register(new StrawRegistryAstralSorcery()); ModUtils.logIntegration(1, EnumIntegrations.STRAW, ModNames.AS); + + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.AS); + LaserDrillHandlerAstralSorcery.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.AS); + } else if (!ModConfig.integrations.astralSorcery) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.AS); } if (ModConfig.integrations.botania && Loader.isModLoaded(ModNames.BOTANIA)) { ModUtils.logIntegration(0, EnumIntegrations.PLANT, ModNames.BOTANIA); MinecraftForge.EVENT_BUS.register(new PlantRecollectableBotania()); ModUtils.logIntegration(1, EnumIntegrations.PLANT, ModNames.BOTANIA); } + if (ModConfig.integrations.nuclearCraft && Loader.isModLoaded(ModNames.NUCLEARCRAFT)) { + ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.NUCLEARCRAFT); + LaserDrillHandlerNuclearCraft.init(); + ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.NUCLEARCRAFT); + } else if (!ModConfig.integrations.nuclearCraft) { + ModUtils.deleteExistingLaserDrillFile(event.getModConfigurationDirectory(), ModNames.NUCLEARCRAFT); + } } public static void init() { IntegrationForegoing.logger.info("Registering Guide Book entries..."); IFBookCompat.init(); IntegrationForegoing.logger.info("Registered Guide Book entries"); - if (ModConfig.integrations.thermalFoundation && Loader.isModLoaded(ModNames.TF)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.TF); - LaserDrillHandlerThermalFoundation.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.TF); - } if (ModConfig.integrations.immersiveEngineering && Loader.isModLoaded(ModNames.IE)) { - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.IE); - BioReactorHandlerIE.init(); - ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.IE); - IntegrationForegoing.logger.info("Initialising Garden Cloche integration for Immersive Engineering..."); IEGardenClocheCompat.init(); IntegrationForegoing.logger.info("Initialised Garden Cloche integration for Immersive Engineering"); - } - if (ModConfig.integrations.mysticalAgriculture && Loader.isModLoaded(ModNames.MAG)) { - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.MAG); - BioReactorHandlerMysticalAgriculture.init(); - ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.MAG); - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.MAG); - LaserDrillHandlerMysticalAgriculture.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.MAG); - } - if (ModConfig.integrations.mysticalAgradditions && Loader.isModLoaded(ModNames.MAD)) { - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.MAD); - BioReactorHandlerMysticalAgradditions.init(); - ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.MAD); + ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.IE); + BioReactorHandlerIE.init(); + ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.IE); } if (ModConfig.integrations.tconstruct && Loader.isModLoaded(ModNames.TCON)) { IntegrationForegoing.logger.info("Initialising integration for Tinkers' Construct..."); @@ -153,39 +216,26 @@ public static void init() { BioReactorHandlerTConstruct.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.TCON); } - if (ModConfig.integrations.ae2 && Loader.isModLoaded(ModNames.AE2)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.AE2); - LaserDrillHandlerAE2.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.AE2); + if (ModConfig.integrations.mysticalAgriculture && Loader.isModLoaded(ModNames.MAG)) { + ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.MAG); + BioReactorHandlerMysticalAgriculture.init(); + ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.MAG); } - if (ModConfig.integrations.rftools && Loader.isModLoaded(ModNames.RFTOOLS)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.RFTOOLS); - LaserDrillHandlerRFTools.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.RFTOOLS); + if (ModConfig.integrations.mysticalAgradditions && Loader.isModLoaded(ModNames.MAD)) { + ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.MAD); + BioReactorHandlerMysticalAgradditions.init(); + ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.MAD); } if (ModConfig.integrations.evilcraft && Loader.isModLoaded(ModNames.EVILCRAFT)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.EVILCRAFT); - LaserDrillHandlerEvilCraft.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.EVILCRAFT); - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.EVILCRAFT); BioReactorHandlerEvilCraft.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.EVILCRAFT); } if (ModConfig.integrations.actuallyAdditions && Loader.isModLoaded(ModNames.AA)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.AA); - LaserDrillHandlerActuallyAdditions.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.AA); - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.AA); BioReactorHandlerActuallyAdditions.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.AA); } - if (ModConfig.integrations.forestry && Loader.isModLoaded(ModNames.FORESTRY)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.FORESTRY); - LaserDrillHandlerForestry.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.FORESTRY); - } if (ModConfig.integrations.harvestCraft && Loader.isModLoaded(ModNames.HARVESTCRAFT)) { ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.HARVESTCRAFT); BioReactorHandlerHarvestCraft.init(); @@ -223,39 +273,21 @@ public static void init() { BioReactorHandlerRustic.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.RUSTIC); } - if (ModConfig.integrations.matterOverdrive && Loader.isModLoaded(ModNames.MATTEROVERDRIVE)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.MATTEROVERDRIVE); - LaserDrillHandlerMatterOverdrive.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.MATTEROVERDRIVE); - } if (ModConfig.integrations.agriCraft && Loader.isModLoaded(ModNames.AGRICRAFT)) { ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.AGRICRAFT); BioReactorHandlerAgriCraft.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.AGRICRAFT); } if (ModConfig.integrations.silentsGems && Loader.isModLoaded(ModNames.SILENTSGEMS)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.SILENTSGEMS); - LaserDrillHandlerSilentsGems.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.SILENTSGEMS); - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.SILENTSGEMS); BioReactorHandlerSilentsGems.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.SILENTSGEMS); } if (ModConfig.integrations.biomesoPlenty && Loader.isModLoaded(ModNames.BIOMESOP)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.BIOMESOP); - LaserDrillHandlerBiomesOP.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.BIOMESOP); - ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.BIOMESOP); BioReactorHandlerBiomesOP.init(); ModUtils.logIntegration(1, EnumIntegrations.BIOREACTOR, ModNames.BIOMESOP); } - if (ModConfig.integrations.astralSorcery && Loader.isModLoaded(ModNames.AS)) { - ModUtils.logIntegration(0, EnumIntegrations.LASERDRILL, ModNames.AS); - LaserDrillHandlerAstralSorcery.init(); - ModUtils.logIntegration(1, EnumIntegrations.LASERDRILL, ModNames.AS); - } if (ModConfig.integrations.botania && Loader.isModLoaded(ModNames.BOTANIA)) { ModUtils.logIntegration(0, EnumIntegrations.BIOREACTOR, ModNames.BOTANIA); BioReactorHandlerBotania.init(); diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAE2.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAE2.java index add7ac2..9d6eb84 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAE2.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAE2.java @@ -6,8 +6,7 @@ public class LaserDrillHandlerAE2 { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(8, ModNames.AE2, "quartz_ore", 1, 0, 2); - ModUtils.addCustomLaserDrillEntryBlock(8, ModNames.AE2, "charged_quartz_ore", 1, 0, 1); + ModUtils.loadLaserDrillFile(ModNames.AE2); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerActuallyAdditions.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerActuallyAdditions.java index 3b75ad4..d80a23e 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerActuallyAdditions.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerActuallyAdditions.java @@ -6,7 +6,7 @@ public class LaserDrillHandlerActuallyAdditions { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.AA, "block_misc", 1, 3, 6); + ModUtils.loadLaserDrillFile(ModNames.AA); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAstralSorcery.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAstralSorcery.java index a4c9e33..07d186c 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAstralSorcery.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerAstralSorcery.java @@ -6,9 +6,7 @@ public class LaserDrillHandlerAstralSorcery { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.AS, "blockcustomore", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(11, ModNames.AS, "blockcustomore", 1, 1, 1); - ModUtils.addCustomLaserDrillEntryBlock(3, ModNames.AS, "blockcustomsandore", 1, 0, 2); + ModUtils.loadLaserDrillFile(ModNames.AS); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerBiomesOP.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerBiomesOP.java index b8bb883..d75dc6d 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerBiomesOP.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerBiomesOP.java @@ -6,15 +6,7 @@ public class LaserDrillHandlerBiomesOP { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.BIOMESOP, "biome_block", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(2, ModNames.BIOMESOP, "gem_ore", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.BIOMESOP, "gem_ore", 1, 1, 2); - ModUtils.addCustomLaserDrillEntryBlock(5, ModNames.BIOMESOP, "gem_ore", 1, 2, 2); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.BIOMESOP, "gem_ore", 1, 3, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.BIOMESOP, "gem_ore", 1, 4, 1); - ModUtils.addCustomLaserDrillEntryBlock(9, ModNames.BIOMESOP, "gem_ore", 1, 5, 1); - ModUtils.addCustomLaserDrillEntryBlock(11, ModNames.BIOMESOP, "gem_ore", 1, 6, 2); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.BIOMESOP, "gem_ore", 1, 7, 1); + ModUtils.loadLaserDrillFile(ModNames.BIOMESOP); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerEvilCraft.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerEvilCraft.java index 7ba75a9..cf86f97 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerEvilCraft.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerEvilCraft.java @@ -6,7 +6,7 @@ public class LaserDrillHandlerEvilCraft { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.EVILCRAFT, "dark_ore", 1, 0, 2); + ModUtils.loadLaserDrillFile(ModNames.EVILCRAFT); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerForestry.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerForestry.java index 9963c44..e4eeeea 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerForestry.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerForestry.java @@ -6,7 +6,7 @@ public class LaserDrillHandlerForestry { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(3, ModNames.FORESTRY, "resources", 1, 0, 6); + ModUtils.loadLaserDrillFile(ModNames.FORESTRY); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMatterOverdrive.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMatterOverdrive.java index 87c315d..dafda2b 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMatterOverdrive.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMatterOverdrive.java @@ -6,8 +6,7 @@ public class LaserDrillHandlerMatterOverdrive { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(3, ModNames.MATTEROVERDRIVE, "dilithium_ore", 1, 0, 2); - ModUtils.addCustomLaserDrillEntryBlock(7, ModNames.MATTEROVERDRIVE, "tritanium_ore", 1, 0, 2); + ModUtils.loadLaserDrillFile(ModNames.MATTEROVERDRIVE); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMysticalAgriculture.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMysticalAgriculture.java index 69425ea..7ba31e6 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMysticalAgriculture.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerMysticalAgriculture.java @@ -6,8 +6,7 @@ public class LaserDrillHandlerMysticalAgriculture { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(4, ModNames.MAG, "inferium_ore", 1, 0, 4); - ModUtils.addCustomLaserDrillEntryBlock(3, ModNames.MAG, "prosperity_ore", 1, 0, 4); + ModUtils.loadLaserDrillFile(ModNames.MAG); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerNuclearCraft.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerNuclearCraft.java new file mode 100644 index 0000000..f79238d --- /dev/null +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerNuclearCraft.java @@ -0,0 +1,12 @@ +package jackyy.integrationforegoing.integration.laserdrill; + +import jackyy.integrationforegoing.util.ModNames; +import jackyy.integrationforegoing.util.ModUtils; + +public class LaserDrillHandlerNuclearCraft { + + public static void init() { + ModUtils.loadLaserDrillFile(ModNames.NUCLEARCRAFT); + } + +} diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerRFTools.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerRFTools.java index c68b69e..987da67 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerRFTools.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerRFTools.java @@ -6,9 +6,7 @@ public class LaserDrillHandlerRFTools { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.RFTOOLS, "dimensional_shard_ore", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.RFTOOLS, "dimensional_shard_ore", 1, 1, 1); - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.RFTOOLS, "dimensional_shard_ore", 1, 2, 1); + ModUtils.loadLaserDrillFile(ModNames.RFTOOLS); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerSilentsGems.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerSilentsGems.java index 32ce763..b45d0bb 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerSilentsGems.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerSilentsGems.java @@ -6,56 +6,7 @@ public class LaserDrillHandlerSilentsGems { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.SILENTSGEMS, "gemore", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.SILENTSGEMS, "gemore", 1, 1, 1); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.SILENTSGEMS, "gemore", 1, 2, 1); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.SILENTSGEMS, "gemore", 1, 3, 1); - ModUtils.addCustomLaserDrillEntryBlock(4, ModNames.SILENTSGEMS, "gemore", 1, 4, 1); - ModUtils.addCustomLaserDrillEntryBlock(5, ModNames.SILENTSGEMS, "gemore", 1, 5, 1); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "gemore", 1, 6, 1); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "gemore", 1, 7, 1); - ModUtils.addCustomLaserDrillEntryBlock(9, ModNames.SILENTSGEMS, "gemore", 1, 8, 1); - ModUtils.addCustomLaserDrillEntryBlock(11, ModNames.SILENTSGEMS, "gemore", 1, 9, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.SILENTSGEMS, "gemore", 1, 10, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.SILENTSGEMS, "gemore", 1, 11, 1); - ModUtils.addCustomLaserDrillEntryBlock(2, ModNames.SILENTSGEMS, "gemore", 1, 12, 1); - ModUtils.addCustomLaserDrillEntryBlock(6, ModNames.SILENTSGEMS, "gemore", 1, 13, 1); - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.SILENTSGEMS, "gemore", 1, 14, 1); - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.SILENTSGEMS, "gemore", 1, 15, 1); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.SILENTSGEMS, "gemoredark", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.SILENTSGEMS, "gemoredark", 1, 1, 1); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.SILENTSGEMS, "gemoredark", 1, 2, 1); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.SILENTSGEMS, "gemoredark", 1, 3, 1); - ModUtils.addCustomLaserDrillEntryBlock(4, ModNames.SILENTSGEMS, "gemoredark", 1, 4, 1); - ModUtils.addCustomLaserDrillEntryBlock(5, ModNames.SILENTSGEMS, "gemoredark", 1, 5, 1); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "gemoredark", 1, 6, 1); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "gemoredark", 1, 7, 1); - ModUtils.addCustomLaserDrillEntryBlock(9, ModNames.SILENTSGEMS, "gemoredark", 1, 8, 1); - ModUtils.addCustomLaserDrillEntryBlock(11, ModNames.SILENTSGEMS, "gemoredark", 1, 9, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.SILENTSGEMS, "gemoredark", 1, 10, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.SILENTSGEMS, "gemoredark", 1, 11, 1); - ModUtils.addCustomLaserDrillEntryBlock(2, ModNames.SILENTSGEMS, "gemoredark", 1, 12, 1); - ModUtils.addCustomLaserDrillEntryBlock(6, ModNames.SILENTSGEMS, "gemoredark", 1, 13, 1); - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.SILENTSGEMS, "gemoredark", 1, 14, 1); - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.SILENTSGEMS, "gemoredark", 1, 15, 1); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.SILENTSGEMS, "gemorelight", 1, 0, 1); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.SILENTSGEMS, "gemorelight", 1, 1, 1); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.SILENTSGEMS, "gemorelight", 1, 2, 1); - ModUtils.addCustomLaserDrillEntryBlock(1, ModNames.SILENTSGEMS, "gemorelight", 1, 3, 1); - ModUtils.addCustomLaserDrillEntryBlock(4, ModNames.SILENTSGEMS, "gemorelight", 1, 4, 1); - ModUtils.addCustomLaserDrillEntryBlock(5, ModNames.SILENTSGEMS, "gemorelight", 1, 5, 1); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "gemorelight", 1, 6, 1); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "gemorelight", 1, 7, 1); - ModUtils.addCustomLaserDrillEntryBlock(9, ModNames.SILENTSGEMS, "gemorelight", 1, 8, 1); - ModUtils.addCustomLaserDrillEntryBlock(11, ModNames.SILENTSGEMS, "gemorelight", 1, 9, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.SILENTSGEMS, "gemorelight", 1, 10, 1); - ModUtils.addCustomLaserDrillEntryBlock(10, ModNames.SILENTSGEMS, "gemorelight", 1, 11, 1); - ModUtils.addCustomLaserDrillEntryBlock(2, ModNames.SILENTSGEMS, "gemorelight", 1, 12, 1); - ModUtils.addCustomLaserDrillEntryBlock(6, ModNames.SILENTSGEMS, "gemorelight", 1, 13, 1); - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.SILENTSGEMS, "gemorelight", 1, 14, 1); - ModUtils.addCustomLaserDrillEntryBlock(0, ModNames.SILENTSGEMS, "gemorelight", 1, 15, 1); - ModUtils.addCustomLaserDrillEntryBlock(8, ModNames.SILENTSGEMS, "essenceore", 1, 0, 2); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.SILENTSGEMS, "essenceore", 1, 1, 2); + ModUtils.loadLaserDrillFile(ModNames.SILENTSGEMS); } } diff --git a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerThermalFoundation.java b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerThermalFoundation.java index af19991..1af6554 100644 --- a/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerThermalFoundation.java +++ b/src/main/java/jackyy/integrationforegoing/integration/laserdrill/LaserDrillHandlerThermalFoundation.java @@ -6,12 +6,7 @@ public class LaserDrillHandlerThermalFoundation { public static void init() { - ModUtils.addCustomLaserDrillEntryBlock(3, ModNames.TF, "ore", 1, 8, 1); - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.TF, "ore_fluid", 1, 0, 2); - ModUtils.addCustomLaserDrillEntryBlock(15, ModNames.TF, "ore_fluid", 1, 1, 2); - ModUtils.addCustomLaserDrillEntryBlock(14, ModNames.TF, "ore_fluid", 1, 2, 3); - ModUtils.addCustomLaserDrillEntryBlock(4, ModNames.TF, "ore_fluid", 1, 3, 2); - ModUtils.addCustomLaserDrillEntryBlock(13, ModNames.TF, "ore_fluid", 1, 4, 1); + ModUtils.loadLaserDrillFile(ModNames.TF); } } diff --git a/src/main/java/jackyy/integrationforegoing/proxy/CommonProxy.java b/src/main/java/jackyy/integrationforegoing/proxy/CommonProxy.java index 98ca2e4..dd50006 100644 --- a/src/main/java/jackyy/integrationforegoing/proxy/CommonProxy.java +++ b/src/main/java/jackyy/integrationforegoing/proxy/CommonProxy.java @@ -8,7 +8,7 @@ public class CommonProxy { public void preInit(FMLPreInitializationEvent event) { - Integrations.preInit(); + Integrations.preInit(event); } public void init(FMLInitializationEvent event) { diff --git a/src/main/java/jackyy/integrationforegoing/util/ModConfig.java b/src/main/java/jackyy/integrationforegoing/util/ModConfig.java index 6454b7f..0a55f1e 100644 --- a/src/main/java/jackyy/integrationforegoing/util/ModConfig.java +++ b/src/main/java/jackyy/integrationforegoing/util/ModConfig.java @@ -39,6 +39,7 @@ public static class Integrations { public boolean biomesoPlenty = true; public boolean astralSorcery = true; public boolean botania = true; + public boolean nuclearCraft = true; } public static class Misc { diff --git a/src/main/java/jackyy/integrationforegoing/util/ModNames.java b/src/main/java/jackyy/integrationforegoing/util/ModNames.java index 0f198fa..d3ec05d 100644 --- a/src/main/java/jackyy/integrationforegoing/util/ModNames.java +++ b/src/main/java/jackyy/integrationforegoing/util/ModNames.java @@ -29,5 +29,6 @@ public final class ModNames { public static final String BIOMESOP = "biomesoplenty"; public static final String AS = "astralsorcery"; public static final String BOTANIA = "botania"; + public static final String NUCLEARCRAFT = "nuclearcraft"; } diff --git a/src/main/java/jackyy/integrationforegoing/util/ModUtils.java b/src/main/java/jackyy/integrationforegoing/util/ModUtils.java index 320ca0e..49ddbac 100644 --- a/src/main/java/jackyy/integrationforegoing/util/ModUtils.java +++ b/src/main/java/jackyy/integrationforegoing/util/ModUtils.java @@ -2,6 +2,7 @@ import com.buuz135.industrial.api.IndustrialForegoingHelper; import com.buuz135.industrial.api.recipe.BioReactorEntry; +import com.buuz135.industrial.api.recipe.LaserDrillEntry; import com.buuz135.industrial.api.recipe.ProteinReactorEntry; import jackyy.integrationforegoing.IntegrationForegoing; import net.minecraft.block.Block; @@ -14,6 +15,9 @@ import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Map; public class ModUtils { @@ -102,13 +106,19 @@ public static void addCustomProteinReactorEntryItem(String modid, String name, i } } - //TODO Generate JSON files for the entries - public static void addCustomLaserDrillEntryBlock(int laserMeta, String modid, String name, int amount, int meta, int weight) { - /* - if (ForgeRegistries.BLOCKS.getValue(new ResourceLocation(modid, name)) != null) { - IndustrialForegoingHelper.addLaserDrillEntry(new LaserDrillEntry(laserMeta, getBlockStackByName(modid, name, amount, meta), weight)); + public static void loadLaserDrillFile(String fileName) { + LaserDrillEntry.addOreFile(new ResourceLocation(Reference.MODID, fileName + "_ores.json")); + } + + public static void deleteExistingLaserDrillFile(File dir, String fileName) { + Path path = dir.toPath().resolve("laser_drill_ores"); + if (Files.exists(path)) { + File file = new File(path.toFile(), fileName + "_ores.json"); + if (!file.exists()) + return; + if (file.delete()) + IntegrationForegoing.logger.info("Deleted existing Laser Drill config file " + file.getName()); } - */ } } diff --git a/src/main/java/jackyy/integrationforegoing/util/Reference.java b/src/main/java/jackyy/integrationforegoing/util/Reference.java index c7795bb..64404b9 100644 --- a/src/main/java/jackyy/integrationforegoing/util/Reference.java +++ b/src/main/java/jackyy/integrationforegoing/util/Reference.java @@ -11,7 +11,7 @@ public final class Reference { public static final String MODID = "integrationforegoing"; public static final String MODNAME = "Integration Foregoing"; - public static final String VERSION = "1.12.2-1.8.1"; + public static final String VERSION = "1.12.2-1.8.2"; public static final String MCVERSION = "[1.12,1.13)"; public static final String DEPENDS = "required-after:" + IF + "@[1.12.0,);" diff --git a/src/main/resources/assets/integrationforegoing/actuallyadditions_ores.json b/src/main/resources/assets/integrationforegoing/actuallyadditions_ores.json new file mode 100644 index 0000000..4682bbf --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/actuallyadditions_ores.json @@ -0,0 +1,15 @@ +[ + { + "item" : "actuallyadditions:block_misc:3", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 6 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/appliedenergistics2_ores.json b/src/main/resources/assets/integrationforegoing/appliedenergistics2_ores.json new file mode 100644 index 0000000..0c2a9ad --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/appliedenergistics2_ores.json @@ -0,0 +1,28 @@ +[ + { + "item" : "appliedenergistics2:quartz_ore:0", + "color" : 8, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "appliedenergistics2:charged_quartz_ore:0", + "color" : 8, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/astralsorcery_ores.json b/src/main/resources/assets/integrationforegoing/astralsorcery_ores.json new file mode 100644 index 0000000..2d97e01 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/astralsorcery_ores.json @@ -0,0 +1,41 @@ +[ + { + "item" : "astralsorcery:blockcustomore:0", + "color" : 0, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "astralsorcery:blockcustomore:1", + "color" : 11, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "astralsorcery:blockcustomsandore:0", + "color" : 3, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/biomesoplenty_ores.json b/src/main/resources/assets/integrationforegoing/biomesoplenty_ores.json new file mode 100644 index 0000000..a69cfcb --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/biomesoplenty_ores.json @@ -0,0 +1,119 @@ +[ + { + "item" : "biomesoplenty:biome_block:0", + "color" : 0, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:0", + "color" : 2, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:1", + "color" : 14, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:2", + "color" : 5, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:3", + "color" : 1, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:4", + "color" : 10, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:5", + "color" : 9, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:6", + "color" : 11, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "biomesoplenty:gem_ore:7", + "color" : 1, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/evilcraft_ores.json b/src/main/resources/assets/integrationforegoing/evilcraft_ores.json new file mode 100644 index 0000000..0f54b25 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/evilcraft_ores.json @@ -0,0 +1,15 @@ +[ + { + "item" : "evilcraft:dark_ore:0", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/forestry_ores.json b/src/main/resources/assets/integrationforegoing/forestry_ores.json new file mode 100644 index 0000000..842a5ac --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/forestry_ores.json @@ -0,0 +1,15 @@ +[ + { + "item" : "forestry:resources:0", + "color" : 3, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 6 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/matteroverdrive_ores.json b/src/main/resources/assets/integrationforegoing/matteroverdrive_ores.json new file mode 100644 index 0000000..22f6811 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/matteroverdrive_ores.json @@ -0,0 +1,28 @@ +[ + { + "item" : "matteroverdrive:dilithium_ore:0", + "color" : 3, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "matteroverdrive:tritanium_ore:0", + "color" : 7, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/mysticalagriculture_ores.json b/src/main/resources/assets/integrationforegoing/mysticalagriculture_ores.json new file mode 100644 index 0000000..c929943 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/mysticalagriculture_ores.json @@ -0,0 +1,80 @@ +[ + { + "item" : "mysticalagriculture:inferium_ore:0", + "color" : 4, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 4 + } + ] + }, + { + "item" : "mysticalagriculture:prosperity_ore:0", + "color" : 3, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 4 + } + ] + }, + { + "item" : "mysticalagriculture:nether_inferium_ore:0", + "color" : 4, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 4 + } + ] + }, + { + "item" : "mysticalagriculture:nether_prosperity_ore:0", + "color" : 3, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 4 + } + ] + }, + { + "item" : "mysticalagriculture:end_inferium_ore:0", + "color" : 4, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 4 + } + ] + }, + { + "item" : "mysticalagriculture:end_prosperity_ore:0", + "color" : 3, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 4 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/nuclearcraft_ores.json b/src/main/resources/assets/integrationforegoing/nuclearcraft_ores.json new file mode 100644 index 0000000..2509d55 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/nuclearcraft_ores.json @@ -0,0 +1,54 @@ +[ + { + "item" : "nuclearcraft:ore:3", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 5 + } + ] + }, + { + "item" : "nuclearcraft:ore:5", + "color" : 7, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 5 + } + ] + }, + { + "item" : "nuclearcraft:ore:6", + "color" : 0, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 5 + } + ] + }, + { + "item" : "nuclearcraft:ore:7", + "color" : 6, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 5 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/rftools_ores.json b/src/main/resources/assets/integrationforegoing/rftools_ores.json new file mode 100644 index 0000000..790e845 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/rftools_ores.json @@ -0,0 +1,41 @@ +[ + { + "item" : "rftools:dimensional_shard_ore:0", + "color" : 0, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "rftools:dimensional_shard_ore:1", + "color" : 0, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "rftools:dimensional_shard_ore:2", + "color" : 0, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/silentgems_ores.json b/src/main/resources/assets/integrationforegoing/silentgems_ores.json new file mode 100644 index 0000000..8e68fe9 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/silentgems_ores.json @@ -0,0 +1,626 @@ +[ + { + "item" : "silentgems:gemore:0", + "color" : 14, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:1", + "color" : 14, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:2", + "color" : 1, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:3", + "color" : 1, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:4", + "color" : 4, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:5", + "color" : 5, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:6", + "color" : 13, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:7", + "color" : 13, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:8", + "color" : 9, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:9", + "color" : 11, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:10", + "color" : 10, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:11", + "color" : 10, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:12", + "color" : 2, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:13", + "color" : 6, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:14", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemore:15", + "color" : 0, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:0", + "color" : 14, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:1", + "color" : 14, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:2", + "color" : 1, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:3", + "color" : 1, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:4", + "color" : 4, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:5", + "color" : 5, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:6", + "color" : 13, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:7", + "color" : 13, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:8", + "color" : 9, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:9", + "color" : 11, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:10", + "color" : 10, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:11", + "color" : 10, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:12", + "color" : 2, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:13", + "color" : 6, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:14", + "color" : 15, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemoredark:15", + "color" : 0, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:0", + "color" : 14, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:1", + "color" : 14, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:2", + "color" : 1, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:3", + "color" : 1, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:4", + "color" : 4, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:5", + "color" : 5, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:6", + "color" : 13, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:7", + "color" : 13, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:8", + "color" : 9, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:9", + "color" : 11, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:10", + "color" : 10, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:11", + "color" : 10, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:12", + "color" : 2, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:13", + "color" : 6, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:14", + "color" : 15, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "silentgems:gemorelight:15", + "color" : 0, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + } +] diff --git a/src/main/resources/assets/integrationforegoing/thermalfoundation_ores.json b/src/main/resources/assets/integrationforegoing/thermalfoundation_ores.json new file mode 100644 index 0000000..d4ea020 --- /dev/null +++ b/src/main/resources/assets/integrationforegoing/thermalfoundation_ores.json @@ -0,0 +1,93 @@ +[ + { + "item" : "thermalfoundation:ore:8", + "color" : 3, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "thermalfoundation:ore_fluid:0", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "thermalfoundation:ore_fluid:1", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "thermalfoundation:ore_fluid:2", + "color" : 14, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 3 + } + ] + }, + { + "item" : "thermalfoundation:ore_fluid:3", + "color" : 4, + "rarity" : [ + { + "whitelist": "minecraft:hell", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 2 + } + ] + }, + { + "item" : "thermalfoundation:ore_fluid:4", + "color" : 13, + "rarity" : [ + { + "whitelist": "minecraft:sky", + "blacklist": "", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + }, + { + "item" : "thermalfoundation:ore_fluid:5", + "color" : 15, + "rarity" : [ + { + "whitelist": "", + "blacklist": "minecraft:hell, minecraft:sky", + "depth_min": 0, + "depth_max": 255, + "weight": 1 + } + ] + } +] diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 7daa090..77fdfe5 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "integrationforegoing", "name": "Integration Foregoing", "description": "An addon mod for Industrial Foregoing!", - "version": "1.12.2-1.8.1", + "version": "1.12.2-1.8.2", "mcversion": "1.12", "url": "https://github.com/JackyyTV/IntegrationForegoing", "updateUrl": "",