Skip to content

Commit 213556b

Browse files
committed
Add pigment mixing recipes for producing various types of green (mekanism/Mekanism-Feature-Requests#690)
1 parent 671deac commit 213556b

File tree

4 files changed

+48
-1
lines changed

4 files changed

+48
-1
lines changed

src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipe/pigment_mixing/aqua_yellow_to_lime.json

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipe/pigment_mixing/blue_yellow_to_green.json

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/main/java/mekanism/common/recipe/impl/PigmentMixingRecipeProvider.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,21 @@ public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries)
4646
addMix(consumer, EnumColor.INDIGO, 1, EnumColor.BRIGHT_GREEN, 1, EnumColor.AQUA, basePath);
4747
//light blue + red -> 2 magenta
4848
addMix(consumer, EnumColor.INDIGO, 1, EnumColor.RED, 1, EnumColor.PINK, basePath);
49+
50+
//Recipes that don't exist for vanilla dye mixing, but we add
51+
//blue + yellow -> 2 green
52+
addMix(consumer, EnumColor.DARK_BLUE, 1, EnumColor.YELLOW, 1, EnumColor.DARK_GREEN, basePath);
53+
//aqua + yellow -> 2 lime
54+
addMix(consumer, EnumColor.AQUA, 1, EnumColor.YELLOW, 1, EnumColor.BRIGHT_GREEN, basePath);
55+
//TODO: Come up with more mixtures, and figure out the numbers for them
56+
//black + 2 pink -> 3 purple
57+
/*addMix(consumer, EnumColor.BLACK, 1, EnumColor.BRIGHT_PINK, 2, EnumColor.PURPLE, basePath);
58+
//black + 4 magenta -> 5 purple
59+
addMix(consumer, EnumColor.BLACK, 1, EnumColor.PINK, 4, EnumColor.PURPLE, basePath);
60+
//gray + 2 magenta -> 3 purple
61+
addMix(consumer, EnumColor.GRAY, 1, EnumColor.PINK, 4, EnumColor.PURPLE, basePath);
62+
//gray + 2 pink -> 3 magenta
63+
addMix(consumer, EnumColor.GRAY, 1, EnumColor.BRIGHT_PINK, 4, EnumColor.PINK, basePath);*/
4964
}
5065

5166
private static void addMix(RecipeOutput consumer, EnumColor leftInput, long leftInputAmount, EnumColor rightInput, long rightInputAmount,

0 commit comments

Comments
 (0)