diff --git a/build.gradle b/build.gradle index 95b8715..5eb55ca 100644 --- a/build.gradle +++ b/build.gradle @@ -141,7 +141,7 @@ dependencies { runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}") implementation("com.tterrag.registrate:Registrate:${registrate_version}") - //implementation("plus.dragons.createdragonsplus:create-dragons-plus-${minecraft_version}:${create_dragons_plus_version}") + implementation("plus.dragons.createdragonsplus:create-dragons-plus-${minecraft_version}:${create_dragons_plus_version}") implementation("curse.maven:createdconnected-947914:7593837") implementation("maven.modrinth:6e2SlzR4:2.1.9+1.21.1-neoforged") diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_black_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_black_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_black_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_black_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_blue_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_blue_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_blue_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_blue_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_brown_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_brown_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_brown_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_brown_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_cyan_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_cyan_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_cyan_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_cyan_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_gray_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_gray_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_gray_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_gray_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_green_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_green_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_green_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_green_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_blue_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_blue_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_blue_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_blue_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_gray_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_gray_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_gray_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_light_gray_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_lime_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_lime_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_lime_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_lime_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_magenta_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_magenta_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_magenta_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_magenta_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_orange_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_orange_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_orange_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_orange_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_pink_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_pink_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_pink_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_pink_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_purple_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_purple_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_purple_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_purple_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_rainbow_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_rainbow_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_rainbow_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_rainbow_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_red_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_red_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_red_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_red_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_white_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_white_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_white_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_white_catalyst.json diff --git a/src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_yellow_catalyst.json b/src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_yellow_catalyst.json similarity index 100% rename from src/main/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_yellow_catalyst.json rename to src/generated/resources/data/colorful_catalysts/loot_table/blocks/fan_dyeing_yellow_catalyst.json diff --git a/src/main/resources/data/create/tags/block/fan_transparent.json b/src/generated/resources/data/create/tags/block/fan_transparent.json similarity index 100% rename from src/main/resources/data/create/tags/block/fan_transparent.json rename to src/generated/resources/data/create/tags/block/fan_transparent.json diff --git a/src/generated/resources/data/create_dragons_plus/data_maps/block/fan_processing_catalysts/coloring.json b/src/generated/resources/data/create_dragons_plus/data_maps/block/fan_processing_catalysts/coloring.json new file mode 100644 index 0000000..d1a7988 --- /dev/null +++ b/src/generated/resources/data/create_dragons_plus/data_maps/block/fan_processing_catalysts/coloring.json @@ -0,0 +1,148 @@ +{ + "values": { + "colorful_catalysts:fan_dyeing_black_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "black" + }, + "colorful_catalysts:fan_dyeing_blue_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "blue" + }, + "colorful_catalysts:fan_dyeing_brown_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "brown" + }, + "colorful_catalysts:fan_dyeing_cyan_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "cyan" + }, + "colorful_catalysts:fan_dyeing_gray_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "gray" + }, + "colorful_catalysts:fan_dyeing_green_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "green" + }, + "colorful_catalysts:fan_dyeing_light_blue_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "light_blue" + }, + "colorful_catalysts:fan_dyeing_light_gray_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "light_gray" + }, + "colorful_catalysts:fan_dyeing_lime_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "lime" + }, + "colorful_catalysts:fan_dyeing_magenta_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "magenta" + }, + "colorful_catalysts:fan_dyeing_orange_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "orange" + }, + "colorful_catalysts:fan_dyeing_pink_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "pink" + }, + "colorful_catalysts:fan_dyeing_purple_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "purple" + }, + "colorful_catalysts:fan_dyeing_red_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "red" + }, + "colorful_catalysts:fan_dyeing_white_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "white" + }, + "colorful_catalysts:fan_dyeing_yellow_catalyst": { + "neoforge:conditions": [ + { + "type": "neoforge:mod_loaded", + "modid": "create_dragons_plus" + } + ], + "neoforge:value": "yellow" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 97% rename from src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 3034136..c289e05 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "colorful_catalysts:fan_dyeing_white_catalyst", "colorful_catalysts:fan_dyeing_light_gray_catalyst", diff --git a/src/main/java/net/doppelr/colorful_catalysts/CreateColorfulCatalysts.java b/src/main/java/net/doppelr/colorful_catalysts/CreateColorfulCatalysts.java index 9945eba..ad8f2a7 100644 --- a/src/main/java/net/doppelr/colorful_catalysts/CreateColorfulCatalysts.java +++ b/src/main/java/net/doppelr/colorful_catalysts/CreateColorfulCatalysts.java @@ -4,6 +4,7 @@ import com.simibubi.create.foundation.item.ItemDescription; import com.simibubi.create.foundation.item.KineticStats; import com.simibubi.create.foundation.item.TooltipModifier; +import com.tterrag.registrate.providers.ProviderType; import net.createmod.catnip.lang.FontHelper; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -38,13 +39,13 @@ public class CreateColorfulCatalysts { public CreateColorfulCatalysts(IEventBus eventBus, ModContainer modContainer) { modEventBus = eventBus; modEventBus.addListener(this::checkDependencies); + REGISTRATE.addDataGenerator(ProviderType.DATA_MAP, new ModDataMaps()); REGISTRATE.registerEventListeners(modEventBus); REGISTRATE.setCreativeTab(AllCreativeModeTabs.MAIN); ModBlocks.register(); AllCreativeModeTabs.register(modEventBus); - } private void checkDependencies(final FMLConstructModEvent event) { diff --git a/src/main/java/net/doppelr/colorful_catalysts/ModDataMaps.java b/src/main/java/net/doppelr/colorful_catalysts/ModDataMaps.java new file mode 100644 index 0000000..098ebab --- /dev/null +++ b/src/main/java/net/doppelr/colorful_catalysts/ModDataMaps.java @@ -0,0 +1,18 @@ +package net.doppelr.colorful_catalysts; + +import com.tterrag.registrate.providers.RegistrateDataMapProvider; +import com.tterrag.registrate.util.nullness.NonNullConsumer; +import net.neoforged.neoforge.common.conditions.ModLoadedCondition; +import plus.dragons.createdragonsplus.common.fluids.dye.DyeColors; +import plus.dragons.createdragonsplus.common.registry.CDPDataMaps; + +public class ModDataMaps implements NonNullConsumer { + @Override + public void accept(RegistrateDataMapProvider provider) { + var fanColoringCatalystFluids = provider.builder(CDPDataMaps.BLOCK_FAN_COLORING_CATALYSTS); + var dragonsPlusLoaded = new ModLoadedCondition("create_dragons_plus"); + for (var color : DyeColors.ALL) { + fanColoringCatalystFluids.add(CreateColorfulCatalysts.rl("fan_dyeing_" + color.getSerializedName() + "_catalyst"), color, false, dragonsPlusLoaded); + } + } +} diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index 5ca64cb..42a2f94 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -99,9 +99,8 @@ Bridging Create: Connected and Create: Garnished by adding catalysts for bulk dy # Adding Dragons Plus [[dependencies.${mod_id}]] modId="create_dragons_plus" - type="incompatible" - versionRange="" - reason="Until the bulk coloring process is openend up to tag usage by the Dragons Plus developers, I'm unable to support the mod." + type="optional" + versionRange="[1.8.6,)" ordering="NONE" side="BOTH"