From 268f311e7ef41904a1bc05c1dd517297063d1814 Mon Sep 17 00:00:00 2001
From: Flanks255 <32142731+Flanks255@users.noreply.github.com>
Date: Tue, 23 Nov 2021 19:40:55 -0600
Subject: [PATCH] whoops, flipped recipe builder arguments...

---
 src/generated/resources/.cache/cache          | 29 ++++++++++---------
 .../models/item/lamp_powerer.json             |  3 --
 .../recipes/empowering/diamatine.json         |  4 +--
 .../recipes/empowering/diamatine_block.json   |  4 +--
 .../recipes/empowering/emeradic.json          |  4 +--
 .../recipes/empowering/emeradic_block.json    |  4 +--
 .../recipes/empowering/empowered_canola.json  |  4 +--
 .../recipes/empowering/enori.json             |  4 +--
 .../recipes/empowering/enori_block.json       |  4 +--
 .../recipes/empowering/palis.json             |  4 +--
 .../recipes/empowering/palis_block.json       |  4 +--
 .../recipes/empowering/restonia.json          |  4 +--
 .../recipes/empowering/restonia_block.json    |  4 +--
 .../recipes/empowering/void.json              |  4 +--
 .../recipes/empowering/void_block.json        |  4 +--
 .../data/BlockStateGenerator.java             |  2 +-
 .../data/EmpoweringRecipeGenerator.java       |  4 +--
 17 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index eb018b6c6..b59cf97c4 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -47,6 +47,7 @@ faf45dd324cb2eb2fb41f4cb4e8a4f0c17354e55 assets/actuallyadditions/blockstates/it
 78e22fe7ed75763a0b1380f6bbdf6d2ee75349c8 assets/actuallyadditions/blockstates/lamp_black.json
 e7303f1950c105585a232e129c08aec4ba4757b4 assets/actuallyadditions/blockstates/lamp_blue.json
 91a5344f0a56cf0f627545aeb280c1d3c078805b assets/actuallyadditions/blockstates/lamp_brown.json
+1034f9883987c9df684a447b84acca4a4c905b12 assets/actuallyadditions/blockstates/lamp_controller.json
 00d376e464b080c481b754f2c63e7c3232976ad0 assets/actuallyadditions/blockstates/lamp_cyan.json
 1d48ed205dd8ce6d73bc2b86126a77f915ac92f1 assets/actuallyadditions/blockstates/lamp_gray.json
 02bd872e78ea21af959d17854461d61678e76eaf assets/actuallyadditions/blockstates/lamp_green.json
@@ -200,6 +201,7 @@ f18d781df4b1659ee8e38313db97360e5bbfe813 assets/actuallyadditions/models/item/it
 1e3d4970b8a5ed46ed72deedc5c38d8347658d2f assets/actuallyadditions/models/item/lamp_black.json
 8b730988dfb2cb6caa448647d245f9a4160c4247 assets/actuallyadditions/models/item/lamp_blue.json
 42df4aeb9a27d43da2c3a47cafd4f3fac1f3c0fa assets/actuallyadditions/models/item/lamp_brown.json
+a2e5d07b26b794b759e6a0cac9b1c8c9b7d5edae assets/actuallyadditions/models/item/lamp_controller.json
 a7ab5171e74fdeafa04ed27b300248bb9c2c35e5 assets/actuallyadditions/models/item/lamp_cyan.json
 c9e9aec4973eeeb08f7ed65a808f96ab48aed81c assets/actuallyadditions/models/item/lamp_gray.json
 8819c0d6b76c7fdb1c6bf167e009b7b544a834ae assets/actuallyadditions/models/item/lamp_green.json
@@ -209,7 +211,6 @@ f8e9e058860f6b1f99d0859e70cf0e8a04fa9463 assets/actuallyadditions/models/item/la
 c88ca523161a3447a1c9a4feb38fe0b24a5b94e1 assets/actuallyadditions/models/item/lamp_magenta.json
 c8f8905f57f473ec0ad34e87ad14e78638564710 assets/actuallyadditions/models/item/lamp_orange.json
 20818b50f1749e51548754059ec13fe8579691b4 assets/actuallyadditions/models/item/lamp_pink.json
-816e301ba6a4490b216da2697b280f8a39edd61f assets/actuallyadditions/models/item/lamp_powerer.json
 a346185f550e8a0bc36382d3a8c11737747f65c1 assets/actuallyadditions/models/item/lamp_purple.json
 0da789e3cbe0cf917c931e93d8269fd1c0848c2a assets/actuallyadditions/models/item/lamp_red.json
 13645100bd0fa18851918dd20bbf3b015b2155d0 assets/actuallyadditions/models/item/lamp_white.json
@@ -307,19 +308,19 @@ d8b99c7f215d465fc850a1194592d013534a4f13 data/actuallyadditions/recipes/drill_up
 904fea248e94ca5f6f5e8c8b0a86cbb58a7fcdb2 data/actuallyadditions/recipes/drill_upgrade_speed_iii.json
 e486645f290728de9a6ed7e33c52cb6aa59f15d1 data/actuallyadditions/recipes/drill_upgrade_three_by_three.json
 7dda4aacecfa2287bbb8ddde3d1a9418630bd578 data/actuallyadditions/recipes/empowerer.json
-9316df62bc7b545672dedff2c762f9a0b766a0ea data/actuallyadditions/recipes/empowering/diamatine.json
-a4b75e14148ccece9e0e28e20baa4e03ca3b86ed data/actuallyadditions/recipes/empowering/diamatine_block.json
-f24a635e12529518687af4b2a05c65fc527ed625 data/actuallyadditions/recipes/empowering/emeradic.json
-3e9844c73c0961a25c743336d7132417a0fa492d data/actuallyadditions/recipes/empowering/emeradic_block.json
-e069e8f2429a4830ac0359545554da0361a8341b data/actuallyadditions/recipes/empowering/empowered_canola.json
-0d1c582f3a224dddd276024c8a5603e0a6848f48 data/actuallyadditions/recipes/empowering/enori.json
-3bcaf3ff322a000c84d268e616e8a3e584e01c45 data/actuallyadditions/recipes/empowering/enori_block.json
-e4d136505f3e77399c0083c8e63b178b3446eec4 data/actuallyadditions/recipes/empowering/palis.json
-d8f2aa6eeee377b743a62754e4365c3c238a5d67 data/actuallyadditions/recipes/empowering/palis_block.json
-77ecf4721164a38d62e27128c833428a70319cb3 data/actuallyadditions/recipes/empowering/restonia.json
-a388056389c80dab94220074e65eb5522dc19b11 data/actuallyadditions/recipes/empowering/restonia_block.json
-48aab165ea325696ed7a3b7632160aa0c8cdf6de data/actuallyadditions/recipes/empowering/void.json
-f2b6e259012a8d9889a325d0c9e6a44aff4a8cc5 data/actuallyadditions/recipes/empowering/void_block.json
+7d5c7b23ae26a61998599eea16ec9b16eb85e014 data/actuallyadditions/recipes/empowering/diamatine.json
+539b7277fb268425ac6302a0ab9c53076f4b3096 data/actuallyadditions/recipes/empowering/diamatine_block.json
+b1d924ad70b2610e969cbc1c050a1ea511b28df8 data/actuallyadditions/recipes/empowering/emeradic.json
+1228197667cccd15d8e35fadac0ac7582decbae5 data/actuallyadditions/recipes/empowering/emeradic_block.json
+e451efbed03164bb396e93509303808f3f491d66 data/actuallyadditions/recipes/empowering/empowered_canola.json
+ec7b3aee79b43aac2aa54d211c3bd612282ba107 data/actuallyadditions/recipes/empowering/enori.json
+b857d3d08f386b2f39bfe0d0f859ed09e626f617 data/actuallyadditions/recipes/empowering/enori_block.json
+b6ba00e1b63fa9a83078e250106910e1c7ffa8c0 data/actuallyadditions/recipes/empowering/palis.json
+1e902cc67bb7bd65b7f6961c927071d47aca9a75 data/actuallyadditions/recipes/empowering/palis_block.json
+d4bd8997ccd0540f717f420dab6190d1beca3083 data/actuallyadditions/recipes/empowering/restonia.json
+1b59c946f4cfbfc9bc3a2e7562105cd3a0d09d69 data/actuallyadditions/recipes/empowering/restonia_block.json
+141e2c09092abd099fac833b9be526bcb33f145a data/actuallyadditions/recipes/empowering/void.json
+d112aa7267600c2a55f5efb617cb574aaa56502e data/actuallyadditions/recipes/empowering/void_block.json
 f4d47f3dbd7f20c539567efb8520ab2196a8bef8 data/actuallyadditions/recipes/engineer_goggles.json
 3bcb439db08c2b931bec7d623c2b24738e515c0d data/actuallyadditions/recipes/engineer_goggles_advanced.json
 80df7dd9bc05ca5666c4945d632f9bfdb4cd6191 data/actuallyadditions/recipes/ethetic_green_slab.json
diff --git a/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json b/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json
deleted file mode 100644
index b60351032..000000000
--- a/src/generated/resources/assets/actuallyadditions/models/item/lamp_powerer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "actuallyadditions:block/lamp_powerer"
-}
\ No newline at end of file
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json
index 61a6b21b5..8970a1f2e 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 5000,
-  "time": 6522834,
-  "color": 50,
+  "time": 50,
+  "color": 6522834,
   "result": {
     "item": "actuallyadditions:diamatine_empowered_crystal"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine_block.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine_block.json
index dabdd7754..42b1c977e 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine_block.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/diamatine_block.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 50000,
-  "time": 6522834,
-  "color": 500,
+  "time": 500,
+  "color": 6522834,
   "result": {
     "item": "actuallyadditions:empowered_diamatine_crystal_block"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json
index 5098b13c8..630beebc7 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 5000,
-  "time": 3492376,
-  "color": 50,
+  "time": 50,
+  "color": 3492376,
   "result": {
     "item": "actuallyadditions:emeradic_empowered_crystal"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic_block.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic_block.json
index 254f2b8a8..cea457c8a 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic_block.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/emeradic_block.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 50000,
-  "time": 3492376,
-  "color": 500,
+  "time": 500,
+  "color": 3492376,
   "result": {
     "item": "actuallyadditions:empowered_emeradic_crystal_block"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json
index 6831966f9..e808db26d 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/empowered_canola.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 1000,
-  "time": 88908,
-  "color": 30,
+  "time": 30,
+  "color": 88908,
   "result": {
     "item": "actuallyadditions:empowered_canola_seed"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json
index 708e4c399..9bba38035 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/enori.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 5000,
-  "time": 13421772,
-  "color": 50,
+  "time": 50,
+  "color": 13421772,
   "result": {
     "item": "actuallyadditions:enori_empowered_crystal"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/enori_block.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/enori_block.json
index 08bddb5ba..536cd61ac 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/enori_block.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/enori_block.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 50000,
-  "time": 13421772,
-  "color": 500,
+  "time": 500,
+  "color": 13421772,
   "result": {
     "item": "actuallyadditions:empowered_enori_crystal_block"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json
index ea196c658..4deaff286 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/palis.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 5000,
-  "time": 2437779,
-  "color": 50,
+  "time": 50,
+  "color": 2437779,
   "result": {
     "item": "actuallyadditions:palis_empowered_crystal"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/palis_block.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/palis_block.json
index c223f1aba..daf191130 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/palis_block.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/palis_block.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 50000,
-  "time": 2437779,
-  "color": 500,
+  "time": 500,
+  "color": 2437779,
   "result": {
     "item": "actuallyadditions:empowered_palis_crystal_block"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json
index 0cb187408..fc13dd4c7 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 5000,
-  "time": 10365735,
-  "color": 50,
+  "time": 50,
+  "color": 10365735,
   "result": {
     "item": "actuallyadditions:restonia_empowered_crystal"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia_block.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia_block.json
index 1ad47ed32..acbafb981 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia_block.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/restonia_block.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 50000,
-  "time": 10365735,
-  "color": 500,
+  "time": 500,
+  "color": 10365735,
   "result": {
     "item": "actuallyadditions:empowered_restonia_crystal_block"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json
index a53b0c5ad..e7ce88008 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/void.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 5000,
-  "time": 3355443,
-  "color": 50,
+  "time": 50,
+  "color": 3355443,
   "result": {
     "item": "actuallyadditions:void_empowered_crystal"
   }
diff --git a/src/generated/resources/data/actuallyadditions/recipes/empowering/void_block.json b/src/generated/resources/data/actuallyadditions/recipes/empowering/void_block.json
index 9e649110f..a82476f74 100644
--- a/src/generated/resources/data/actuallyadditions/recipes/empowering/void_block.json
+++ b/src/generated/resources/data/actuallyadditions/recipes/empowering/void_block.json
@@ -18,8 +18,8 @@
     }
   ],
   "energy": 50000,
-  "time": 3355443,
-  "color": 500,
+  "time": 500,
+  "color": 3355443,
   "result": {
     "item": "actuallyadditions:empowered_void_crystal_block"
   }
diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java
index 818e1556c..a25c97739 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/BlockStateGenerator.java
@@ -40,7 +40,7 @@ public class BlockStateGenerator extends BlockStateProvider {
         horizontallyDirectionalBlock(ActuallyBlocks.POWERED_FURNACE);
         horizontallyDirectionalBlock(ActuallyBlocks.COAL_GENERATOR);
         horizontallyDirectionalBlock(ActuallyBlocks.OIL_GENERATOR);
-        horizontallyDirectionalBlock(ActuallyBlocks.LAMP_CONTROLLER);
+        fullyDirectionalBlock(ActuallyBlocks.LAMP_CONTROLLER);
         horizontallyDirectionalBlock(ActuallyBlocks.LAVA_FACTORY_CONTROLLER);
 
         // Standard Block
diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java
index cf766df34..42c767518 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/data/EmpoweringRecipeGenerator.java
@@ -154,14 +154,14 @@ public class EmpoweringRecipeGenerator extends RecipeProvider {
         public void save(Consumer<IFinishedRecipe> consumer, ResourceLocation name) {
             if (modifiers.size() != 4)
                 throw new IllegalStateException("invalid modifier count: " + modifiers.size() + ", recipe: " + name.toString());
-            consumer.accept(new EmpowererRecipe.FinishedRecipe(name, result, base, modifiers.get(0), modifiers.get(1), modifiers.get(2), modifiers.get(3), energy, time, color));
+            consumer.accept(new EmpowererRecipe.FinishedRecipe(name, result, base, modifiers.get(0), modifiers.get(1), modifiers.get(2), modifiers.get(3), energy, color, time));
         }
 
         public void save(Consumer<IFinishedRecipe> consumer, String name) {
             ResourceLocation res = new ResourceLocation(ActuallyAdditions.MODID, "empowering/" + name);
             if (modifiers.size() != 4)
                 throw new IllegalStateException("invalid modifier count: " + modifiers.size() + ", recipe: " + res);
-            consumer.accept(new EmpowererRecipe.FinishedRecipe(res, result, base, modifiers.get(0), modifiers.get(1), modifiers.get(2), modifiers.get(3), energy, time, color));
+            consumer.accept(new EmpowererRecipe.FinishedRecipe(res, result, base, modifiers.get(0), modifiers.get(1), modifiers.get(2), modifiers.get(3), energy, color, time));
         }
     }
 }