Fix crash with capacitor addon extenders caused by 1.21.1 upgrade

src/main/generated/.cache/19c08d24c255c2719fbb8ac01f9dff290b763461

@@ -1,4 +1,4 @@
-// 1.21.1	2024-09-15T11:33:07.6565456	Oritech/Model Definitions
+// 1.21.1	2024-09-16T21:21:55.9076484	Oritech/Model Definitions
 2e964d91a46577bf6a179afb1ded52a0d5deaaaa assets\oritech\models\item\copper_gem.json
 ef6a1aaf0e99d850fc2908f444af16d0ddf99274 assets\oritech\models\item\metal_beam_block.json
 d83f00d15d54fb178e4a4f9ba12506b9c9ff12ed assets\oritech\models\item\hand_drill.json
@@ -137,13 +137,12 @@ ae7031269016284ee08639eb9c7b3bcc8326c8bc assets\oritech\blockstates\resource_nod
 f4f2c78bc448794239f53404b7844b156fa1980e assets\oritech\models\item\small_platinum_clump.json
 cf209b1e12fe28afe954cc04787600c1295738c5 assets\oritech\models\item\small_iron_clump.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\steam_engine_block.json
-eafe84c787830ab2a866e0878e9ed718d58659f5 assets\oritech\blockstates\banana_block.json
 e8ea32d466df5531df3b6678639b3ffae59d9989 assets\oritech\models\item\overcharged_crystal.json
 b88d35a0501faadde7cac29da4436cb9a42ea353 assets\oritech\models\block\iron_plating_pressure_plate_down.json
 84bc2922b2e7b64a95ec3160df10688923726be8 assets\oritech\models\item\copper_nugget.json
 45fbece69084d6df6eaa4ba344d25eef914c63c3 assets\oritech\models\item\small_storage_block.json
-c0a08ce14172e22abd9f55d82686f7e96e74834a assets\oritech\blockstates\large_storage_block.json
 0fd9239827741bd5fa2b8123c7a50fd138dfb548 assets\oritech\blockstates\resource_node_lapis.json
+c0a08ce14172e22abd9f55d82686f7e96e74834a assets\oritech\blockstates\large_storage_block.json
 4af7874799cc7544ddf9f32365204ce6f7e123df assets\oritech\models\item\gold_clump.json
 1ff4797b29b6d18ed425889527532cf1fc84c42f assets\oritech\models\block\nickel_plating_stairs_inner.json
 8bf485ac83476add1c6d660f3dc7ca314dbfaf1e assets\oritech\models\item\platinum_dust.json
@@ -165,8 +164,8 @@ ec2effe119bdc488bb712fce824d93f39d26fc58 assets\oritech\models\item\advanced_bat
 b651fb0fb5a13875cc50aadf6783eb3c00cdcfa2 assets\oritech\models\block\iron_plating_slab.json
 f5aa7f60ffd29a1c94dd7008abc79c9355445857 assets\oritech\models\block\machine_plating_pressure_plate_down.json
 97794db126be871e2cb68297abbe8917c343e705 assets\oritech\models\item\fluid_pipe.json
-b6e5689929f535533f388e42d96ed60e2ec4d882 assets\oritech\models\item\heisenberg_compensator.json
 0f4677080cc972c9caf041c0b0def800c6704259 assets\oritech\models\item\adamant_dust.json
+b6e5689929f535533f388e42d96ed60e2ec4d882 assets\oritech\models\item\heisenberg_compensator.json
 7fd474f18c02f5dd3a54510faa2d37665310c429 assets\oritech\blockstates\quarry_beam_ring.json
 d39d7a8eaa54d12c155fb1acd1722e322c0aeac3 assets\oritech\models\block\block_destroyer_head.json
 30525b49546801c90bc77faa6eab332ba288eca5 assets\oritech\models\item\fertilizer_block.json
@@ -236,10 +235,9 @@ cb417a815cc7c1231f7478ae5706ac779d2db171 assets\oritech\blockstates\resource_nod
 b36cb951a571fd6642ae04f9d62b7be9de04c40e assets\oritech\models\item\lava_generator_block.json
 ad938aecbed42b2d26ae78aa06c1599ee3cda1c9 assets\oritech\models\block\resource_node_emerald.json
 d35ecef5df9198b12dc04267780c727c144b1959 assets\oritech\models\item\assembler_block.json
-469ea8a66c529fe26bc029c21092e7f062ed0e40 assets\oritech\models\block\banana_block.json
 f337c5c80895d0c133e8218a41a0915b307cce18 assets\oritech\blockstates\small_storage_block.json
-cd42865cd9cf2246641556a57fa35977594b0405 assets\oritech\models\block\machine_plating_stairs_inner.json
 b6ebdae5692a337d52fe49ec327da5cff08540da assets\oritech\models\item\large_storage_block.json
+cd42865cd9cf2246641556a57fa35977594b0405 assets\oritech\models\block\machine_plating_stairs_inner.json
 6f643b73a5df4587167e012e2b17aadcf7e2b373 assets\oritech\blockstates\spawner_controller_block.json
 35e614910133af1962641aebf5f3d1f45bac0851 assets\oritech\models\item\machine_plating_stairs.json
 1a1a2b1ff79d6a7d432f6842f63c36ec04632223 assets\oritech\models\item\duratium_dust.json
@@ -285,7 +283,6 @@ a5bcc52397f53e02db0b9f96fcf5faa8c43e7d65 assets\oritech\models\item\fluxite.json
 6b397fe0defa806d5dad91ae5b058d891f000270 assets\oritech\models\item\gold_dust.json
 126cf96b88f994d12fd27a160634b476afd00098 assets\oritech\models\block\iron_plating_stairs_inner.json
 b4e5c696b9898183a7852c4ed14e8173d4695a49 assets\oritech\models\block\nickel_plating_pressure_plate_down.json
-746b98d721e5ae0d96dd769e71b786afa8c2d142 assets\oritech\models\item\banana_block.json
 a94671f9ea6bc5c464bea061589573c70ec7704c assets\oritech\models\block\nickel_plating_slab.json
 e00cfa7892647f3e1c720598a6417c4c5f2581a2 assets\oritech\blockstates\machine_core_5.json
 2422ff7b51ccae980cf6a4f91678af915b114336 assets\oritech\models\item\resource_node_platinum.json

src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json

@@ -1,76 +1,75 @@
 {
   "values": [
-    "oritech:fluid_pipe",
-    "oritech:energy_pipe",
-    "oritech:laser_arm_block",
-    "oritech:drone_port_block",
-    "oritech:machine_plating_block",
-    "oritech:machine_capacitor_addon",
-    "oritech:machine_core_4",
-    "oritech:atomic_forge_block",
-    "oritech:treefeller_block",
-    "oritech:iron_plating_slab",
-    "oritech:fuel_generator_block",
-    "oritech:machine_core_3",
-    "oritech:pump_block",
-    "oritech:ceiling_light_hanging",
-    "oritech:machine_plating_slab",
-    "oritech:big_solar_panel_block",
-    "oritech:machine_inventory_proxy_addon",
-    "oritech:tech_button",
+    "oritech:machine_core_7",
     "oritech:nickel_plating_block",
-    "oritech:lava_generator_block",
-    "oritech:tech_lever",
+    "oritech:spawner_controller_block",
     "oritech:enchantment_catalyst_block",
-    "oritech:machine_efficiency_addon",
-    "oritech:iron_plating_pressure_plate",
-    "oritech:placer_block",
-    "oritech:machine_core_7",
-    "oritech:fertilizer_block",
-    "oritech:machine_core_6",
-    "oritech:basic_generator_block",
-    "oritech:steam_engine_block",
-    "oritech:ceiling_light",
-    "oritech:nickel_plating_pressure_plate",
-    "oritech:banana_block",
-    "oritech:machine_yield_addon",
-    "oritech:iron_plating_stairs",
-    "oritech:bio_generator_block",
     "oritech:machine_plating_pressure_plate",
-    "oritech:assembler_block",
-    "oritech:machine_extender",
-    "oritech:steam_boiler_addon",
-    "oritech:item_pipe",
-    "oritech:machine_core_5",
-    "oritech:iron_plating_block",
-    "oritech:tech_door",
-    "oritech:foundry_block",
     "oritech:machine_core_1",
+    "oritech:treefeller_block",
+    "oritech:nickel_plating_pressure_plate",
     "oritech:spawner_cage_block",
+    "oritech:bio_generator_block",
+    "oritech:drone_port_block",
     "oritech:destroyer_block",
-    "oritech:capacitor_addon_extender",
-    "oritech:crop_filter_addon",
-    "oritech:enchanter_block",
+    "oritech:metal_beam_block",
+    "oritech:foundry_block",
+    "oritech:quarry_addon",
+    "oritech:machine_redstone_addon",
     "oritech:industrial_glass_block",
+    "oritech:fluid_pipe",
+    "oritech:steam_boiler_addon",
     "oritech:machine_frame_block",
-    "oritech:large_storage_block",
-    "oritech:machine_redstone_addon",
+    "oritech:machine_acceptor_addon",
+    "oritech:iron_plating_stairs",
+    "oritech:capacitor_addon_extender",
     "oritech:machine_plating_stairs",
+    "oritech:nickel_plating_slab",
+    "oritech:machine_core_3",
+    "oritech:large_storage_block",
+    "oritech:pulverizer_block",
+    "oritech:fuel_generator_block",
     "oritech:machine_speed_addon",
+    "oritech:machine_extender",
+    "oritech:placer_block",
+    "oritech:pump_block",
+    "oritech:machine_efficiency_addon",
+    "oritech:laser_arm_block",
+    "oritech:powered_furnace_block",
+    "oritech:fertilizer_block",
+    "oritech:iron_plating_pressure_plate",
+    "oritech:machine_yield_addon",
+    "oritech:machine_fluid_addon",
+    "oritech:ceiling_light_hanging",
+    "oritech:machine_core_5",
+    "oritech:tech_lever",
+    "oritech:big_solar_panel_block",
+    "oritech:machine_core_4",
+    "oritech:ceiling_light",
     "oritech:deep_drill_block",
-    "oritech:machine_core_2",
+    "oritech:iron_plating_slab",
+    "oritech:machine_capacitor_addon",
+    "oritech:crop_filter_addon",
+    "oritech:assembler_block",
+    "oritech:tech_door",
+    "oritech:machine_plating_slab",
     "oritech:item_filter_block",
+    "oritech:machine_core_6",
+    "oritech:nickel_plating_stairs",
+    "oritech:basic_generator_block",
+    "oritech:steam_engine_block",
+    "oritech:machine_inventory_proxy_addon",
+    "oritech:iron_plating_block",
+    "oritech:machine_plating_block",
     "oritech:fragment_forge_block",
-    "oritech:quarry_addon",
-    "oritech:powered_furnace_block",
-    "oritech:pulverizer_block",
     "oritech:centrifuge_block",
-    "oritech:spawner_controller_block",
-    "oritech:metal_beam_block",
-    "oritech:machine_fluid_addon",
-    "oritech:machine_acceptor_addon",
-    "oritech:nickel_plating_stairs",
-    "oritech:nickel_plating_slab",
+    "oritech:item_pipe",
+    "oritech:lava_generator_block",
+    "oritech:machine_core_2",
+    "oritech:atomic_forge_block",
+    "oritech:energy_pipe",
+    "oritech:tech_button",
+    "oritech:enchanter_block",
     "oritech:energy_pipe_connection",
     "oritech:fluid_pipe_connection",
     "oritech:item_pipe_connection",

src/main/java/rearth/oritech/block/blocks/machines/addons/MachineAddonBlock.java

@@ -26,7 +26,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import rearth.oritech.Oritech;
-import rearth.oritech.block.entity.machines.MachineCoreEntity;
 import rearth.oritech.block.entity.machines.addons.AddonBlockEntity;
 import rearth.oritech.block.entity.machines.addons.EnergyAcceptorAddonBlockEntity;
 import rearth.oritech.init.BlockContent;
@@ -150,7 +149,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
         } catch (InstantiationException | InvocationTargetException | NoSuchMethodException |
                  IllegalAccessException e) {
             Oritech.LOGGER.error("Unable to create blockEntity for " + getBlockEntityType().getSimpleName() + " at " + this);
-            return new MachineCoreEntity(pos, state);
+            return new AddonBlockEntity(pos, state);
         }
     }
 

src/main/java/rearth/oritech/init/BlockEntitiesContent.java

@@ -166,6 +166,7 @@ public class BlockEntitiesContent implements AutoRegistryContainer<BlockEntityTy
       BlockContent.CROP_FILTER_ADDON,
       BlockContent.MACHINE_EXTENDER,
       BlockContent.MACHINE_CAPACITOR_ADDON,
+      BlockContent.CAPACITOR_ADDON_EXTENDER,
       BlockContent.QUARRY_ADDON
     ).build();