Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"colorful_catalysts:fan_dyeing_white_catalyst",
"colorful_catalysts:fan_dyeing_light_gray_catalyst",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/net/doppelr/colorful_catalysts/ModDataMaps.java
Original file line number Diff line number Diff line change
@@ -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<RegistrateDataMapProvider> {
@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);
}
}
}
5 changes: 2 additions & 3 deletions src/main/templates/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down