From 8d62396155c5f74f6f7890dd45db376b296de0c9 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Wed, 10 Aug 2022 17:33:07 -0500 Subject: [PATCH] Color changing, part 3 --- src/generated/resources/.cache/cache | 16 ++++++ .../recipes/colorchange/black_dye.json | 9 ++++ .../recipes/colorchange/blue_dye.json | 9 ++++ .../recipes/colorchange/brown_dye.json | 9 ++++ .../recipes/colorchange/cyan_dye.json | 9 ++++ .../recipes/colorchange/gray_dye.json | 9 ++++ .../recipes/colorchange/green_dye.json | 9 ++++ .../recipes/colorchange/light_blue_dye.json | 9 ++++ .../recipes/colorchange/light_gray_dye.json | 9 ++++ .../recipes/colorchange/lime_dye.json | 9 ++++ .../recipes/colorchange/magenta_dye.json | 9 ++++ .../recipes/colorchange/orange_dye.json | 9 ++++ .../recipes/colorchange/pink_dye.json | 9 ++++ .../recipes/colorchange/purple_dye.json | 9 ++++ .../recipes/colorchange/red_dye.json | 9 ++++ .../recipes/colorchange/white_dye.json | 9 ++++ .../recipes/colorchange/yellow_dye.json | 9 ++++ .../data/ColorChangeGenerator.java | 20 +++++++ .../mod/ActuallyAdditions.java | 3 -- .../mod/items/lens/LensRecipeHandler.java | 52 ------------------- .../mod/misc/apiimpl/MethodHandler.java | 2 - 21 files changed, 180 insertions(+), 57 deletions(-) create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/black_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/blue_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/brown_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/cyan_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/gray_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/green_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/light_blue_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/light_gray_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/lime_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/magenta_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/orange_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/pink_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/purple_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/red_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/white_dye.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/colorchange/yellow_dye.json delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 967396ead..5f99c218b 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -590,36 +590,42 @@ c9fc3f11f3bf5a928ea9f5900c344461d61fe9e5 data/actuallyadditions/recipes/black_qu bf1b5de98f29c2dabe25a143c8e63d2c0cd6ea72 data/actuallyadditions/recipes/chiseled_black_quartz_stair.json 9d779585266046738b4bcf7447b918ec09b65f95 data/actuallyadditions/recipes/chiseled_black_quartz_wall.json c4e98d1507f68d5524c737d4e63156aa476fd085 data/actuallyadditions/recipes/colorchange/black_carpet.json +fc68c61bed8857f42e762c750d85665b4ed88ed1 data/actuallyadditions/recipes/colorchange/black_dye.json b62468a9f5be60ae05258bc4502faa78d9e4b034 data/actuallyadditions/recipes/colorchange/black_glazed_terracotta.json 6542541988d8e26d457a9cd37b85f067adbc1cef data/actuallyadditions/recipes/colorchange/black_stained_glass.json 96e818e3c023aff9cbce5476946bf9fd51cd3676 data/actuallyadditions/recipes/colorchange/black_stained_glass_pane.json 9ae6edaa50bf4c8ec0403a1072d74c7eef8d2e37 data/actuallyadditions/recipes/colorchange/black_terracotta.json 4c0d56c3a6db66bbeb74cb72ecedfbb115448d83 data/actuallyadditions/recipes/colorchange/black_wool.json 71b6acfb8ab23cd44f159ff344877c8a99cd3442 data/actuallyadditions/recipes/colorchange/blue_carpet.json +69a761f9ceb7f3bf052a67a2326a2e4ba8b6d219 data/actuallyadditions/recipes/colorchange/blue_dye.json e5198a6a6eaa9c43ff82ac9d257b15ca570e55e0 data/actuallyadditions/recipes/colorchange/blue_glazed_terracotta.json 355e41364b5e2576f7200ed6a58213280eff2c70 data/actuallyadditions/recipes/colorchange/blue_stained_glass.json b324f07dbde2581598fd5369e935efb5d3f835c2 data/actuallyadditions/recipes/colorchange/blue_stained_glass_pane.json 81f8415b25a813b19708154dbe75d4524b0bff18 data/actuallyadditions/recipes/colorchange/blue_terracotta.json 5c698c51d21723c8a13e329673a4c8d703da359d data/actuallyadditions/recipes/colorchange/blue_wool.json 285bb992795f78b7ad98321c8112e99e3fdcc025 data/actuallyadditions/recipes/colorchange/brown_carpet.json +f7e73bc34b2a7156ea15a214318edb8647a59ee0 data/actuallyadditions/recipes/colorchange/brown_dye.json 820d7dae9fb1cd6e493294fca4aa25a6028f82e6 data/actuallyadditions/recipes/colorchange/brown_glazed_terracotta.json d958b165641b88491a34f21fc36c0db0655a5e1c data/actuallyadditions/recipes/colorchange/brown_stained_glass.json 812817ad102274e0f450e06afedbea85cc7e67a3 data/actuallyadditions/recipes/colorchange/brown_stained_glass_pane.json dfc316d3e89e041fc4cdae2bd4dc1a60885f7ccb data/actuallyadditions/recipes/colorchange/brown_terracotta.json 818ab2ea65a94fa5ff8db6c5a5d106eec32816fd data/actuallyadditions/recipes/colorchange/brown_wool.json aceb5f3b6c900b7489a31274b9e1335d2b08d46b data/actuallyadditions/recipes/colorchange/cyan_carpet.json +e8707c9e4d49c9247f2317bf1c14e0cca295c298 data/actuallyadditions/recipes/colorchange/cyan_dye.json 5d671fc651d06f54aafd3e296999cc7ffeb4673e data/actuallyadditions/recipes/colorchange/cyan_glazed_terracotta.json e9f6e6c48a3ccca94dce89c21216a881b1951bd4 data/actuallyadditions/recipes/colorchange/cyan_stained_glass.json 8d5e6d66c04f621d70ccecaa5bf8dd784428a889 data/actuallyadditions/recipes/colorchange/cyan_stained_glass_pane.json 7342b7aa7b806555144517019adf915f112d5cbd data/actuallyadditions/recipes/colorchange/cyan_terracotta.json 37168cf7f51bdd26a1cb74d5fc3eccd835f7f566 data/actuallyadditions/recipes/colorchange/cyan_wool.json 1c2bd9d19db7cb209b6759b7bf67ce4822ccf74d data/actuallyadditions/recipes/colorchange/gray_carpet.json +b8be4f5fcd70f910b16bf25e6f1a42638def60b2 data/actuallyadditions/recipes/colorchange/gray_dye.json a659b2fa678640fcfde75d5414073449e3742ad1 data/actuallyadditions/recipes/colorchange/gray_glazed_terracotta.json 5697ea3a2b02e02530667f092662f14bc14425ba data/actuallyadditions/recipes/colorchange/gray_stained_glass.json ad5f7354fcd9a4e2fb30986e616f81a972a8bd0f data/actuallyadditions/recipes/colorchange/gray_stained_glass_pane.json efbfc6feafce597e2895ce10216fe231e848b5f0 data/actuallyadditions/recipes/colorchange/gray_terracotta.json e6fa0fd781c0deb18997b92237a097df2bfa14b7 data/actuallyadditions/recipes/colorchange/gray_wool.json 8ae7563109979ba061f7a5f369c49ebd2c549850 data/actuallyadditions/recipes/colorchange/green_carpet.json +65486086f293d01fbcbd6a35b7764e13fd8e9240 data/actuallyadditions/recipes/colorchange/green_dye.json 6d92d3d3d50e0ec759140c4027ee1725cfe31059 data/actuallyadditions/recipes/colorchange/green_glazed_terracotta.json 942f2bd392b317c9aa7cf5616209491fa981c7cf data/actuallyadditions/recipes/colorchange/green_stained_glass.json 0538912d40986cf783d4809c1b810413a2dfd402 data/actuallyadditions/recipes/colorchange/green_stained_glass_pane.json @@ -642,60 +648,70 @@ b610a205de296ff7b4e77affff7358fa85276644 data/actuallyadditions/recipes/colorcha 40fd6b842e4d9d08415bdbe741a523b97e026325 data/actuallyadditions/recipes/colorchange/lamp_white.json 798faea275af15e2644a4fb6f16ecfe67a6abecc data/actuallyadditions/recipes/colorchange/lamp_yellow.json 9858c3342e53d1d4b9efa0b506a5635294f7e565 data/actuallyadditions/recipes/colorchange/light_blue_carpet.json +3cdb80b440bedac76201995e68cb0e21c280b27a data/actuallyadditions/recipes/colorchange/light_blue_dye.json 101bd37efd167d02c7ac25d5cfff0f9aff29172c data/actuallyadditions/recipes/colorchange/light_blue_glazed_terracotta.json af65d68f653994f581e70918aeb7291b34d5e149 data/actuallyadditions/recipes/colorchange/light_blue_stained_glass.json d8bd82c98b8297effbea47a07017a84970a7f67f data/actuallyadditions/recipes/colorchange/light_blue_stained_glass_pane.json 43bd607996f9f2e09ba47100aabc1f899d62de77 data/actuallyadditions/recipes/colorchange/light_blue_terracotta.json 915d5ea71aa02d991a194574a085e7e41e733803 data/actuallyadditions/recipes/colorchange/light_blue_wool.json 8ad183a15c279600d86d33575589cb01336730ff data/actuallyadditions/recipes/colorchange/light_gray_carpet.json +fe161168300de53f18431039a1677903fcedaa29 data/actuallyadditions/recipes/colorchange/light_gray_dye.json 5920b24160484fa1107c3861ea30476ad54c1f67 data/actuallyadditions/recipes/colorchange/light_gray_glazed_terracotta.json a3dedb4530b9b3e72566ed6fa69a2c3403db7fe6 data/actuallyadditions/recipes/colorchange/light_gray_stained_glass.json b1e3eba6e666fa84930394948081ad8ebdd8dcd5 data/actuallyadditions/recipes/colorchange/light_gray_stained_glass_pane.json 923548480b4275eb872ac9e0bfe81694c8ef55b9 data/actuallyadditions/recipes/colorchange/light_gray_terracotta.json 9f5a91dc8b31444492fc77dcd2405375db1ba378 data/actuallyadditions/recipes/colorchange/light_gray_wool.json d43280093a702004960273106f7e2f1a1337e97e data/actuallyadditions/recipes/colorchange/lime_carpet.json +b58615a624714b8107f6645c42cca321e46b5b03 data/actuallyadditions/recipes/colorchange/lime_dye.json c567752df673f205968211a6c8840d211fd8a9c2 data/actuallyadditions/recipes/colorchange/lime_glazed_terracotta.json 2e91f59060e38988d349c0ec4846b11e5654195a data/actuallyadditions/recipes/colorchange/lime_stained_glass.json 9df173b0ffae73de6a0a39c8be99f63fce26a794 data/actuallyadditions/recipes/colorchange/lime_stained_glass_pane.json 01ce4ff3b098126aacf459becda6c3fff5c9e566 data/actuallyadditions/recipes/colorchange/lime_terracotta.json 41e623b3c6730f283a17ab9b293c3dbfb6688a4b data/actuallyadditions/recipes/colorchange/lime_wool.json 45255e8f2fcd9a7a4516071446030079e59bfd73 data/actuallyadditions/recipes/colorchange/magenta_carpet.json +06e539154408d379268e78475758ace15ce2f53e data/actuallyadditions/recipes/colorchange/magenta_dye.json e3eb444ef0b2a3ad7a1d8c34d644efb2f65fa8f3 data/actuallyadditions/recipes/colorchange/magenta_glazed_terracotta.json a4a6ee71b3a76b036eebdc7c2870ab3cfb341b66 data/actuallyadditions/recipes/colorchange/magenta_stained_glass.json 303eacf461723fa6f2f015c390c161be18d2685d data/actuallyadditions/recipes/colorchange/magenta_stained_glass_pane.json ced5fcf725ed067e002ba321da93bf0fc999ec40 data/actuallyadditions/recipes/colorchange/magenta_terracotta.json 5754feb7b97b2e5bed1a44d6b6121d0e6b6d411c data/actuallyadditions/recipes/colorchange/magenta_wool.json bcc8e26d51b470e80a37a72c838d0e9456a66e66 data/actuallyadditions/recipes/colorchange/orange_carpet.json +d21d1ce24a7d3840df92532260a535d38f4b8405 data/actuallyadditions/recipes/colorchange/orange_dye.json 2b744b6306b454adb9fdc3d38860c5af6e2036ab data/actuallyadditions/recipes/colorchange/orange_glazed_terracotta.json 2be65fa3a4bb68bb667f9405c4b1392971522f34 data/actuallyadditions/recipes/colorchange/orange_stained_glass.json ede64b6d4b677b8ce01fabad1b9fad14439a8b4c data/actuallyadditions/recipes/colorchange/orange_stained_glass_pane.json e16caf03c9111d59dcec3af3cd6333738e21866a data/actuallyadditions/recipes/colorchange/orange_terracotta.json 5d34d7ba1302af791ca85fd2f023470328e604b6 data/actuallyadditions/recipes/colorchange/orange_wool.json 9d639fc4cf714b5c28a90f625459a0c864e12f81 data/actuallyadditions/recipes/colorchange/pink_carpet.json +1012285ad07a093c648d59ccdadce4d575e8f52d data/actuallyadditions/recipes/colorchange/pink_dye.json a973c89401c7be8f22603c912e07fd55ef93d346 data/actuallyadditions/recipes/colorchange/pink_glazed_terracotta.json f72e63786af73bd6328c696389d1b9ee5ec85b09 data/actuallyadditions/recipes/colorchange/pink_stained_glass.json f13a13196bb61b8ed377c52f742605c4fe6ab1e9 data/actuallyadditions/recipes/colorchange/pink_stained_glass_pane.json 35023e8f5439ccdb0dccbffafe487013a74652d0 data/actuallyadditions/recipes/colorchange/pink_terracotta.json e3bf0e1777bd2d495162411424fd7aadcb72c96d data/actuallyadditions/recipes/colorchange/pink_wool.json 3be74c280cdd4485c673d68e2527e2c719efdb33 data/actuallyadditions/recipes/colorchange/purple_carpet.json +60a7040c2532351e8178a44882b2763d11b6c5f4 data/actuallyadditions/recipes/colorchange/purple_dye.json 05c83b0a263aaaa1506b4f4f36bca414aa33c2a0 data/actuallyadditions/recipes/colorchange/purple_glazed_terracotta.json ca0ceb8ee561265223d12799c3976cf24f5bbd3d data/actuallyadditions/recipes/colorchange/purple_stained_glass.json 0450915ea1e139a25f71ecc73c3ebcfadac79957 data/actuallyadditions/recipes/colorchange/purple_stained_glass_pane.json 591ca7a1c99e34f681e61142e2af78662ffb55b7 data/actuallyadditions/recipes/colorchange/purple_terracotta.json 0ceb76358bfbc1e289e1d076683870978071a929 data/actuallyadditions/recipes/colorchange/purple_wool.json f682afcc09086f0b90523dd5073145daf7c277b4 data/actuallyadditions/recipes/colorchange/red_carpet.json +46d44b98694ca7d07cd73a737b094d21f9980f84 data/actuallyadditions/recipes/colorchange/red_dye.json f0ec1f1866e20c8c0d277dd1e47cc50c54d8ff4f data/actuallyadditions/recipes/colorchange/red_glazed_terracotta.json c675e2f002271cbc8a63cd1757488e5398f65043 data/actuallyadditions/recipes/colorchange/red_stained_glass.json f2149ed34ff6663a8b80c775fcf70d904201d127 data/actuallyadditions/recipes/colorchange/red_stained_glass_pane.json 4daf2593bce9b35dcc09c4fa14348ad3096c6255 data/actuallyadditions/recipes/colorchange/red_terracotta.json a7fdacc3fe3040376fec72cb64efb48305044c6d data/actuallyadditions/recipes/colorchange/red_wool.json cdaa223d59f5f81846c181680c0e732f1316baac data/actuallyadditions/recipes/colorchange/white_carpet.json +2dd9ceaf61bb7f426c30c9f73a82062652addcd3 data/actuallyadditions/recipes/colorchange/white_dye.json a575e8a13c345ef36dc54ca1a1ec55ad8c0b67ed data/actuallyadditions/recipes/colorchange/white_glazed_terracotta.json de6ac7119df13effca127c612f0221e5a8667ab9 data/actuallyadditions/recipes/colorchange/white_stained_glass.json 721d2fbac5961139b39f8bdfaf0d96b2a11d69ec data/actuallyadditions/recipes/colorchange/white_stained_glass_pane.json 3d887675f14a926b4045c70088e7d8f35d16f77e data/actuallyadditions/recipes/colorchange/white_terracotta.json 48142b653fd55f8cb373541d590d96c94fe182db data/actuallyadditions/recipes/colorchange/white_wool.json e088aee52db067c15c72bfe743ac106b98ca4be2 data/actuallyadditions/recipes/colorchange/yellow_carpet.json +6139ed576e18471734f6042007381ee169b0df5d data/actuallyadditions/recipes/colorchange/yellow_dye.json 896d1ea3e682202a5df4dd10b79a8088a3bd8eaf data/actuallyadditions/recipes/colorchange/yellow_glazed_terracotta.json 86f41507f8176e5c0c60c059c30e42e88d26757a data/actuallyadditions/recipes/colorchange/yellow_stained_glass.json 11ddd815c96912369ee0d96fe719d5958370ed3c data/actuallyadditions/recipes/colorchange/yellow_stained_glass_pane.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/black_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/black_dye.json new file mode 100644 index 000000000..ff50981fa --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/black_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:red_dye" + }, + "result": { + "item": "minecraft:black_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/blue_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/blue_dye.json new file mode 100644 index 000000000..b7aa59ea8 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/blue_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:purple_dye" + }, + "result": { + "item": "minecraft:blue_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/brown_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/brown_dye.json new file mode 100644 index 000000000..10bd59453 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/brown_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:blue_dye" + }, + "result": { + "item": "minecraft:brown_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/cyan_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/cyan_dye.json new file mode 100644 index 000000000..22ddf94ba --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/cyan_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:light_gray_dye" + }, + "result": { + "item": "minecraft:cyan_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/gray_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/gray_dye.json new file mode 100644 index 000000000..41f7d2acb --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/gray_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:pink_dye" + }, + "result": { + "item": "minecraft:gray_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/green_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/green_dye.json new file mode 100644 index 000000000..eaf2a8a9b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/green_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:brown_dye" + }, + "result": { + "item": "minecraft:green_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/light_blue_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/light_blue_dye.json new file mode 100644 index 000000000..c21d8590b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/light_blue_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:magenta_dye" + }, + "result": { + "item": "minecraft:light_blue_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/light_gray_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/light_gray_dye.json new file mode 100644 index 000000000..60602a500 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/light_gray_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:gray_dye" + }, + "result": { + "item": "minecraft:light_gray_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/lime_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/lime_dye.json new file mode 100644 index 000000000..906c16465 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/lime_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:yellow_dye" + }, + "result": { + "item": "minecraft:lime_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/magenta_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/magenta_dye.json new file mode 100644 index 000000000..59884064e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/magenta_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:orange_dye" + }, + "result": { + "item": "minecraft:magenta_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/orange_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/orange_dye.json new file mode 100644 index 000000000..73a78a1fb --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/orange_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:white_dye" + }, + "result": { + "item": "minecraft:orange_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/pink_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/pink_dye.json new file mode 100644 index 000000000..e290ac414 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/pink_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:lime_dye" + }, + "result": { + "item": "minecraft:pink_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/purple_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/purple_dye.json new file mode 100644 index 000000000..874e8a077 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/purple_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:cyan_dye" + }, + "result": { + "item": "minecraft:purple_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/red_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/red_dye.json new file mode 100644 index 000000000..f8024ddff --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/red_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:green_dye" + }, + "result": { + "item": "minecraft:red_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/white_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/white_dye.json new file mode 100644 index 000000000..4f2b69f5d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/white_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:black_dye" + }, + "result": { + "item": "minecraft:white_dye" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/colorchange/yellow_dye.json b/src/generated/resources/data/actuallyadditions/recipes/colorchange/yellow_dye.json new file mode 100644 index 000000000..bdcffc073 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/colorchange/yellow_dye.json @@ -0,0 +1,9 @@ +{ + "type": "actuallyadditions:color_change", + "ingredient": { + "item": "minecraft:light_blue_dye" + }, + "result": { + "item": "minecraft:yellow_dye" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ColorChangeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ColorChangeGenerator.java index dfcaee4b0..37d7611b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ColorChangeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ColorChangeGenerator.java @@ -35,6 +35,7 @@ public class ColorChangeGenerator extends RecipeProvider { buildGlazedTerracotta(consumer); buildCarpet(consumer); buildLamps(consumer); + buildDye(consumer); } private void buildWool(@Nonnull Consumer c) { @@ -171,6 +172,25 @@ public class ColorChangeGenerator extends RecipeProvider { changeColor(c, ActuallyBlocks.LAMP_BLACK.getItem(), ActuallyBlocks.LAMP_RED.getItem()); } + private void buildDye(@Nonnull Consumer c) { + changeColor(c, Items.WHITE_DYE, Items.BLACK_DYE); + changeColor(c, Items.ORANGE_DYE, Items.WHITE_DYE); + changeColor(c, Items.MAGENTA_DYE, Items.ORANGE_DYE); + changeColor(c, Items.LIGHT_BLUE_DYE, Items.MAGENTA_DYE); + changeColor(c, Items.YELLOW_DYE, Items.LIGHT_BLUE_DYE); + changeColor(c, Items.LIME_DYE, Items.YELLOW_DYE); + changeColor(c, Items.PINK_DYE, Items.LIME_DYE); + changeColor(c, Items.GRAY_DYE, Items.PINK_DYE); + changeColor(c, Items.LIGHT_GRAY_DYE, Items.GRAY_DYE); + changeColor(c, Items.CYAN_DYE, Items.LIGHT_GRAY_DYE); + changeColor(c, Items.PURPLE_DYE, Items.CYAN_DYE); + changeColor(c, Items.BLUE_DYE, Items.PURPLE_DYE); + changeColor(c, Items.BROWN_DYE, Items.BLUE_DYE); + changeColor(c, Items.GREEN_DYE, Items.BROWN_DYE); + changeColor(c, Items.RED_DYE, Items.GREEN_DYE); + changeColor(c, Items.BLACK_DYE, Items.RED_DYE); + } + private void changeColor(Consumer consumer, IItemProvider output, Ingredient input) { consumer.accept(new ColorChangeRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "colorchange/" + output.asItem().getRegistryName().getPath()), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 946bae682..3ad848c6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -26,8 +26,6 @@ import de.ellpeck.actuallyadditions.mod.inventory.ActuallyContainers; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; import de.ellpeck.actuallyadditions.mod.items.lens.LensMining; -import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; -import de.ellpeck.actuallyadditions.mod.items.lens.Lenses; import de.ellpeck.actuallyadditions.mod.misc.BannerHelper; import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot; import de.ellpeck.actuallyadditions.mod.misc.apiimpl.LaserRelayConnectionHandler; @@ -135,7 +133,6 @@ public class ActuallyAdditions { //AAWorldGen gen = new AAWorldGen(); ItemCoffee.initIngredients(); CrusherCrafting.init(); - LensRecipeHandler.init(); LensMining.init(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java deleted file mode 100644 index 63589f7c4..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file ("LensRecipeHandler.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.items.lens; - -// TODO: Need to figure out the enchanted stuff, and color changing still, the rest are datagen now. -public final class LensRecipeHandler { - public static void init() { - - // - // ActuallyAdditionsAPI.RECONSTRUCTOR_LENS_CONVERSION_RECIPES.add(recipeEnchBook = new EnchBookConversion()); - // - // IColorLensChanger changer = new ColorLensChangerByDyeMeta(); - // if (ConfigBoolValues.COLOR_LENS_USES_OREDICT.isEnabled()) { - // initOredictDyeRotator(); - // } else { - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Items.DYE, changer); - // } - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(Blocks.WOOL), changer); - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(Blocks.STAINED_GLASS), changer); - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(Blocks.STAINED_GLASS_PANE), changer); - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(Blocks.STAINED_HARDENED_CLAY), changer); - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(Blocks.CARPET), changer); - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(InitBlocks.blockColoredLamp), changer); - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(Item.getItemFromBlock(InitBlocks.blockColoredLampOn), changer); - } - // - // private static Ingredient fromBlock(Block b) { - // return Ingredient.fromItems(Item.getItemFromBlock(b)); - // } - // - // private static void initOredictDyeRotator() { - // List stacks = NonNullList.withSize(16, ItemStack.EMPTY); - // List dyeItems = new ArrayList<>(); - // String[] dyes = { "White", "Orange", "Magenta", "LightBlue", "Yellow", "Lime", "Pink", "Gray", "LightGray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" }; - // for (int i = 0; i < dyes.length; i++) { - // List ores = OreDictionary.getOres("dye" + dyes[i]); - // dyeItems.addAll(ores); - // stacks.set(i, ores.get(ores.size() - 1)); - // } - // ColorLensRotator rotator = new ColorLensRotator(stacks); - // for (ItemStack s : dyeItems) - // ActuallyAdditionsAPI.addReconstructorLensColorChangeItem(s.getItem(), rotator); - // } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java index 77befb71c..78dfac133 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java @@ -14,10 +14,8 @@ import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.internal.IMethodHandler; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient; -import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe; import de.ellpeck.actuallyadditions.mod.blocks.BlockLaserRelay; import de.ellpeck.actuallyadditions.mod.crafting.LaserRecipe; -import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.block.Block;