Skip to content

Commit

Permalink
move pedestal recipe colors to sub-key. Reference them by id
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaFuqs
DaFuqs committed Mar 5, 2025
1 parent b7f334b commit 6136f9d
Show file tree
Hide file tree
Showing 507 changed files with 3,537 additions and 2,527 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/dafuqs/spectrum/recipe/pedestal/ShapedPedestalRecipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public static class Serializer implements RecipeSerializer<ShapedPedestalRecipe>
Identifier.CODEC.optionalFieldOf("required_advancement").forGetter(recipe -> recipe.requiredAdvancementIdentifier),
PedestalRecipeTier.CODEC.optionalFieldOf("tier", PedestalRecipeTier.BASIC).forGetter(recipe -> recipe.tier),
RawShapedPedestalRecipe.CODEC.forGetter(recipe -> recipe.rawShapedRecipe),
CodecHelper.registryMap(SpectrumRegistries.GEMSTONE_COLOR, Codec.INT).forGetter(recipe -> recipe.powderInputs),
CodecHelper.registryMap(SpectrumRegistries.GEMSTONE_COLOR, Codec.INT).fieldOf("colors").forGetter(recipe -> recipe.powderInputs),
ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.output),
Codec.FLOAT.optionalFieldOf("experience", 0f).forGetter(recipe -> recipe.experience),
Codec.INT.optionalFieldOf("time", 200).forGetter(recipe -> recipe.craftingTime),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/dafuqs/spectrum/recipe/pedestal/ShapelessPedestalRecipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static class Serializer implements RecipeSerializer<ShapelessPedestalReci
Identifier.CODEC.optionalFieldOf("required_advancement").forGetter(recipe -> recipe.requiredAdvancementIdentifier),
PedestalRecipeTier.CODEC.optionalFieldOf("tier", PedestalRecipeTier.BASIC).forGetter(recipe -> recipe.tier),
IngredientStack.Serializer.CODEC.listOf().fieldOf("ingredients").forGetter(recipe -> recipe.inputs),
CodecHelper.registryMap(SpectrumRegistries.GEMSTONE_COLOR, Codec.INT).forGetter(recipe -> recipe.powderInputs),
CodecHelper.registryMap(SpectrumRegistries.GEMSTONE_COLOR, Codec.INT).fieldOf("colors").forGetter(recipe -> recipe.powderInputs),
ItemStack.CODEC.fieldOf("result").forGetter(recipe -> recipe.output),
Codec.FLOAT.optionalFieldOf("experience", 0f).forGetter(recipe -> recipe.experience),
Codec.INT.optionalFieldOf("time", 200).forGetter(recipe -> recipe.craftingTime),
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/arrows/amethyst.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "glass_arrows",
"time": 200,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:cyan": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 1.0,
"pattern": [
"TMT",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/arrows/citrine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "glass_arrows",
"time": 200,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:cyan": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 1.0,
"pattern": [
"TMT",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/arrows/malachite.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "glass_arrows",
"time": 200,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:cyan": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 1.0,
"pattern": [
"M",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/arrows/moonstone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "glass_arrows",
"time": 200,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:cyan": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 1.0,
"pattern": [
"TMT",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/arrows/onyx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "glass_arrows",
"time": 200,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:cyan": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 1.0,
"pattern": [
"TMT",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/arrows/topaz.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "glass_arrows",
"time": 200,
"tier": "basic",
"magenta": 0,
"yellow": 0,
"cyan": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:cyan": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 1.0,
"pattern": [
"TMT",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/bag_of_holding.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"type": "spectrum:pedestal",
"time": 240,
"tier": "basic",
"magenta": 4,
"yellow": 0,
"cyan": 4,
"black": 0,
"white": 0,
"colors": {
"spectrum:magenta": 4,
"spectrum:yellow": 0,
"spectrum:cyan": 4,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 2.0,
"pattern": [
"OOO",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/block_detector.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"type": "spectrum:pedestal",
"time": 200,
"tier": "basic",
"cyan": 2,
"magenta": 0,
"yellow": 2,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 2,
"spectrum:magenta": 0,
"spectrum:yellow": 2,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 1.0,
"pattern": [
"CCC",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/block_placer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"type": "spectrum:pedestal",
"time": 200,
"tier": "basic",
"cyan": 4,
"magenta": 0,
"yellow": 0,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 4,
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 1.0,
"pattern": [
"CCC",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/bottle_of_fading.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"type": "spectrum:pedestal",
"time": 400,
"tier": "basic",
"cyan": 0,
"magenta": 0,
"yellow": 0,
"black": 0,
"white": 0,
"colors": {
"spectrum:cyan": 0,
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:black": 0,
"spectrum:white": 0
},
"experience": 2.0,
"skip_recipe_remainders": true,
"pattern": [
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/black.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "advanced",
"cyan": 0,
"magenta": 0,
"yellow": 0,
"white": 0,
"black": 6,
"colors": {
"spectrum:cyan": 0,
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:white": 0,
"spectrum:black": 6
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/blue.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "basic",
"cyan": 3,
"magenta": 2,
"yellow": 1,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 3,
"spectrum:magenta": 2,
"spectrum:yellow": 1,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/brown.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "advanced",
"cyan": 0,
"magenta": 1,
"yellow": 2,
"white": 0,
"black": 3,
"colors": {
"spectrum:cyan": 0,
"spectrum:magenta": 1,
"spectrum:yellow": 2,
"spectrum:white": 0,
"spectrum:black": 3
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/cyan.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "basic",
"cyan": 6,
"magenta": 0,
"yellow": 0,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 6,
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/gray.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "complex",
"cyan": 0,
"magenta": 0,
"yellow": 0,
"white": 2,
"black": 4,
"colors": {
"spectrum:cyan": 0,
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:white": 2,
"spectrum:black": 4
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/green.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "basic",
"cyan": 2,
"magenta": 1,
"yellow": 3,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 2,
"spectrum:magenta": 1,
"spectrum:yellow": 3,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/light_blue.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "basic",
"cyan": 4,
"magenta": 2,
"yellow": 0,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 4,
"spectrum:magenta": 2,
"spectrum:yellow": 0,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/light_gray.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "complex",
"cyan": 0,
"magenta": 0,
"yellow": 0,
"white": 4,
"black": 2,
"colors": {
"spectrum:cyan": 0,
"spectrum:magenta": 0,
"spectrum:yellow": 0,
"spectrum:white": 4,
"spectrum:black": 2
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/lime.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "basic",
"cyan": 2,
"magenta": 0,
"yellow": 4,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 2,
"spectrum:magenta": 0,
"spectrum:yellow": 4,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/data/spectrum/recipe/pedestal/tier1/colored_lamps/magenta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
"group": "colored_lamps",
"time": 40,
"tier": "basic",
"cyan": 0,
"magenta": 6,
"yellow": 0,
"white": 0,
"black": 0,
"colors": {
"spectrum:cyan": 0,
"spectrum:magenta": 6,
"spectrum:yellow": 0,
"spectrum:white": 0,
"spectrum:black": 0
},
"experience": 0.5,
"pattern": [
"SPS",
Expand Down
Loading

0 comments on commit 6136f9d

Please sign in to comment.