Update large energy cell model

src/main/generated/.cache/19c08d24c255c2719fbb8ac01f9dff290b763461

@@ -1,19 +1,19 @@
-// 1.20.4	2024-04-05T21:27:28.167768	Oritech/Model Definitions
-0ea8315aed10abcf90ec950fee0062aed26075cb assets\oritech\models\item\energy_pipe.json
+// 1.20.4	2024-04-09T18:04:21.9188741	Oritech/Model Definitions
 b4b5bb16cd9934be2399058ea8772b23ac699345 assets\oritech\models\item\exo_chestplate.json
+0ea8315aed10abcf90ec950fee0062aed26075cb assets\oritech\models\item\energy_pipe.json
 8ede0997449fd1c3f65a07df184768a843b473ed assets\oritech\models\item\centrifuge_block.json
 90e28b721796ff7ee21c8eefe4525f03a251d2fb assets\oritech\models\block\machine_extender.json
+b783791f300e3eaafeea4ee5c9409080e000fd47 assets\oritech\models\item\giga_storage_block.json
 3fcaea2f05319816f7904137763182c4106c91a9 assets\oritech\blockstates\destroyer_block.json
-f6f7e5db26b25e82f470c458856b827e4a20af6b assets\oritech\models\item\exo_helmet_gold_trim.json
 e6f197ee5ac22cd68bc502a86d40b65bfe40884a assets\oritech\models\item\target_designator.json
-7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\lava_generator_block.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\centrifuge_block.json
+7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\lava_generator_block.json
 8ef5ff056a3d2fa26393ec9ccb4b6f3b410f8be8 assets\oritech\models\item\item_pipe.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\fragment_forge_block.json
 b91305cbccecb97f9d74e2b92787ae9fa6387786 assets\oritech\blockstates\fluid_pipe.json
-ee0b26a63d15b59e2aa800cf492f8bb941a14922 assets\oritech\models\item\exo_helmet_copper_trim.json
-7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\big_solar_panel_block.json
+cf4f804b64f5b0eda2f74519b2c79da4c8aff2d9 assets\oritech\blockstates\giga_storage_block.json
 98d62a615b70fca694eb00c6b8aa9297c4a92b62 assets\oritech\blockstates\energy_pipe_connection.json
+7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\big_solar_panel_block.json
 3e5d7c884b038c90ab274adde5d4c3657b3895ae assets\oritech\models\item\exo_boots.json
 3ceff0ef4325bb269831205626285bc857c60de8 assets\oritech\models\item\destroyer_block.json
 829faf2dfb04c9aea2dd6c971037fbfdaa9aa389 assets\oritech\models\item\pump_block.json
@@ -24,35 +24,30 @@ e4497bad8afbd4f4b4e830d892284a05718b06dd assets\oritech\models\block\machine_cor
 a5651b8d4a27308b40c404f7cd3abcf9769b64b6 assets\oritech\models\item\machine_core_basic.json
 fb03aa413ddd02d32aca58d75003db4dbc224080 assets\oritech\models\item\exo_leggings.json
 c3174dc9e04055bae724425eb8b2c2894297bf70 assets\oritech\blockstates\pump_block.json
-5363fc942e5922dcfcc267ddb75e192cedaba5b3 assets\oritech\models\item\exo_helmet_redstone_trim.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\basic_generator_block.json
 2f7dfa17792770a034a13f117e6b8b1942b459e4 assets\oritech\models\block\placer_block.json
 ee822d455f99c8c53c789fdb744979f678ca2729 assets\oritech\blockstates\fertilizer_block.json
 46af77abe62b29d232feadccde429fd59d5603fc assets\oritech\blockstates\placer_block.json
-f02aaa95416cb6c150ccdbc5f6ef235c28ac6dc5 assets\oritech\models\item\exo_helmet_diamond_trim.json
 3d37038977380bd685f913e722cc3b1c3a25c35d assets\oritech\models\item\atomic_forge_block.json
-713ab594a257d31b4869a9e1d0c9c260d2c03efc assets\oritech\models\item\exo_helmet_amethyst_trim.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\test_generator_block.json
-eafe84c787830ab2a866e0878e9ed718d58659f5 assets\oritech\blockstates\banana_block.json
 b5ee97616ae0d2da17dfaecf45aa42f2cf19f691 assets\oritech\blockstates\machine_extender.json
+eafe84c787830ab2a866e0878e9ed718d58659f5 assets\oritech\blockstates\banana_block.json
 25864df3cd7786f2bf4fe6fa9855b3cf366c28ca assets\oritech\models\item\banana.json
 1fdbeb99862a58436d745edb768b503539ecb295 assets\oritech\models\item\placer_block.json
 58b38bcc6c404953490330d4cc797464b6874d88 assets\oritech\models\item\test_generator_block.json
 b8bc03092cb1eb686ede01daffc7421253af860c assets\oritech\models\item\machine_extender.json
-9cd64a2fe3b9a0ee479646d36cc0302bcd7cab4f assets\oritech\models\block\destroyer_block.json
 45fbece69084d6df6eaa4ba344d25eef914c63c3 assets\oritech\models\item\small_storage_block.json
+9cd64a2fe3b9a0ee479646d36cc0302bcd7cab4f assets\oritech\models\block\destroyer_block.json
 63f14855c688ce7ec236097ce232dd381cbc1538 assets\oritech\blockstates\addon_indicator_block.json
-746b98d721e5ae0d96dd769e71b786afa8c2d142 assets\oritech\models\item\banana_block.json
 7ee14de0149c70d1145dbf338518690b536cc02e assets\oritech\models\item\powered_furnace_block.json
+746b98d721e5ae0d96dd769e71b786afa8c2d142 assets\oritech\models\item\banana_block.json
 c0a08ce14172e22abd9f55d82686f7e96e74834a assets\oritech\blockstates\large_storage_block.json
 230eb8fa77942cdf46509bea8df75b48f82e9e8e assets\oritech\blockstates\machine_frame_block.json
-e04ecebac41bd7a8446d1fd571eff37d82f62136 assets\oritech\models\item\exo_helmet_quartz_trim.json
-6d1cc00e6b4eedc2b729f9896326beff200a2e56 assets\oritech\models\item\exo_helmet.json
+7490d9bdd19f3bb73de89d7e68af4f576c3d4749 assets\oritech\models\item\exo_helmet.json
 9caec2452545622571a137712307b8e0e669af9e assets\oritech\models\block\block_fertilizer_head.json
 54472f85797924c842326a60299d72263cb2c301 assets\oritech\blockstates\block_destroyer_head.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\atomic_forge_block.json
 ff59e92a557b29eeb7f85b1c15ef206c5b99aff6 assets\oritech\models\item\foundry_block.json
-a5d3a189026c4cb4a6a11ed6ec87ca03295bf890 assets\oritech\models\item\exo_helmet_iron_trim.json
 907e1d1717c926ebc0455ebe3291c7e917eb74d2 assets\oritech\models\item\basic_generator_block.json
 c641d411ad252487b93d779cee9028b9ee920281 assets\oritech\blockstates\machine_core_basic.json
 70cd17a84bf2d31647992ee3d21766ca5ea23151 assets\oritech\models\item\fragment_forge_block.json
@@ -61,31 +56,28 @@ a5afa0ba8780ec08bd0a9284bc08e0c681fe7158 assets\oritech\blockstates\block_placer
 5054284e6d5fe0785ac93bdda5101c47337953cf assets\oritech\models\item\machine_frame_block.json
 7b3ae67ec28f9b36b96539cd48b92096861d0853 assets\oritech\models\item\oil_bucket.json
 56c7ceb5cc86d67913ad95cb4ae5ec192aed926f assets\oritech\models\block\pump_block.json
-1b9cd3719105dc1e03398de41f2cab37337816fe assets\oritech\blockstates\machine_core_good.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\powered_furnace_block.json
+1b9cd3719105dc1e03398de41f2cab37337816fe assets\oritech\blockstates\machine_core_good.json
 ccd7e87c2ba5a5062bb88aa6e103d49d47cd56ff assets\oritech\blockstates\energy_pipe.json
 5462a2453fcdd2f8b99129894aec60f282d29ca9 assets\oritech\models\item\pulverizer_block.json
 ae8496aa356910304cb7036f1290ca3f7d76437e assets\oritech\models\item\item_filter_block.json
 a3f9b72f6f36d42af4e5c3a87d7e180b2e36a2ed assets\oritech\models\item\machine_core_good.json
 b36cb951a571fd6642ae04f9d62b7be9de04c40e assets\oritech\models\item\lava_generator_block.json
-d35ecef5df9198b12dc04267780c727c144b1959 assets\oritech\models\item\assembler_block.json
 97794db126be871e2cb68297abbe8917c343e705 assets\oritech\models\item\fluid_pipe.json
 469ea8a66c529fe26bc029c21092e7f062ed0e40 assets\oritech\models\block\banana_block.json
+d35ecef5df9198b12dc04267780c727c144b1959 assets\oritech\models\item\assembler_block.json
 f337c5c80895d0c133e8218a41a0915b307cce18 assets\oritech\blockstates\small_storage_block.json
 b6ebdae5692a337d52fe49ec327da5cff08540da assets\oritech\models\item\large_storage_block.json
 d39d7a8eaa54d12c155fb1acd1722e322c0aeac3 assets\oritech\models\block\block_destroyer_head.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\foundry_block.json
 30525b49546801c90bc77faa6eab332ba288eca5 assets\oritech\models\item\fertilizer_block.json
-d1fc13ef49e7c7daeb69e22add4ec04486e00dc1 assets\oritech\models\item\exo_helmet_netherite_trim.json
 f3ae190c95428a3bf1421215237e55fdb64e6775 assets\oritech\blockstates\item_filter_block.json
 4fdcd4e9aa234ae7bec19742bd5433c629017fe7 assets\oritech\models\item\big_solar_panel_block.json
-4fe86fa19f065ab781f5abab773f65cb232bcad6 assets\oritech\models\item\exo_helmet_lapis_trim.json
 5d80e89ede99144cb0f94a543c2b86239fc5cbdd assets\oritech\blockstates\item_pipe_connection.json
 f53b229ded70f8ae0bff50e829d62326601b0fe8 assets\oritech\models\block\block_placer_head.json
 b7e73ae6ffd983038af7540301bf488242562790 assets\oritech\models\block\fertilizer_block.json
 83b81f38fd21e58e98aab409d36368b3a78b675e assets\oritech\blockstates\item_pipe.json
 66c23bb916995ef1664b6119475d183a66f32624 assets\oritech\blockstates\block_fertilizer_head.json
 3d6d17333aeaef12a7bd95f18b169ee69a0bab5f assets\oritech\blockstates\fluid_pipe_connection.json
 42580a93e058faa5381bfac746ed2a200ec5f323 assets\oritech\models\item\laser_arm_block.json
-633d97061642c78bf543cdf18bff9737afadc52e assets\oritech\models\item\exo_helmet_emerald_trim.json
 3166a5959c87c4465c5eed82034d3178c4b8b518 assets\oritech\models\block\machine_core_good.json

src/main/generated/assets/oritech/blockstates/giga_storage_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "oritech:block/giga_storage_block"
+    }
+  }
+}

src/main/generated/assets/oritech/models/item/exo_helmet.json

@@ -1,67 +1,5 @@
 {
   "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "oritech:item/exo_helmet_quartz_trim",
-      "predicate": {
-        "trim_type": 0.1
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_iron_trim",
-      "predicate": {
-        "trim_type": 0.2
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_netherite_trim",
-      "predicate": {
-        "trim_type": 0.3
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_redstone_trim",
-      "predicate": {
-        "trim_type": 0.4
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_copper_trim",
-      "predicate": {
-        "trim_type": 0.5
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_gold_trim",
-      "predicate": {
-        "trim_type": 0.6
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_emerald_trim",
-      "predicate": {
-        "trim_type": 0.7
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_diamond_trim",
-      "predicate": {
-        "trim_type": 0.8
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_lapis_trim",
-      "predicate": {
-        "trim_type": 0.9
-      }
-    },
-    {
-      "model": "oritech:item/exo_helmet_amethyst_trim",
-      "predicate": {
-        "trim_type": 1.0
-      }
-    }
-  ],
   "textures": {
     "layer0": "oritech:item/exo_helmet"
   }

src/main/generated/assets/oritech/models/item/giga_storage_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "oritech:block/giga_storage_block"
+}

src/main/java/rearth/oritech/block/base/entity/ExpandableEnergyStorageBlockEntity.java

@@ -114,9 +114,10 @@ protected HashMap<Direction, BlockApiCache<EnergyStorage, Direction>> getNeighbo
         var res = new HashMap<Direction, BlockApiCache<EnergyStorage, Direction>>(6);
         var facing = getFacing();
         var blockInFront = (BlockPos) Geometry.offsetToWorldPosition(facing, new Vec3i(-1, 0, 0), pos);
+        var worldOffset = blockInFront.subtract(pos);
 
         var frontCache = BlockApiCache.create(EnergyStorage.SIDED, (ServerWorld) world, blockInFront);
-        res.put(Direction.DOWN, frontCache);
+        res.put(Direction.fromVector(worldOffset.getX(), worldOffset.getY(), worldOffset.getZ()), frontCache);
 
         return res;
     }

src/main/java/rearth/oritech/block/base/entity/ExpandableMultiblockEnergyStorageBlockEntity.java

@@ -0,0 +1,71 @@
+package rearth.oritech.block.base.entity;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import rearth.oritech.util.InventoryProvider;
+import rearth.oritech.util.MultiblockMachineController;
+import team.reborn.energy.api.EnergyStorage;
+
+import java.util.ArrayList;
+
+public abstract class ExpandableMultiblockEnergyStorageBlockEntity extends ExpandableEnergyStorageBlockEntity implements MultiblockMachineController {
+
+    private final ArrayList<BlockPos> coreBlocksConnected = new ArrayList<>();
+
+    private float coreQuality = 1f;
+
+    public ExpandableMultiblockEnergyStorageBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
+        super(type, pos, state);
+    }
+
+    @Override
+    public void writeNbt(NbtCompound nbt) {
+        super.writeNbt(nbt);
+        addMultiblockToNbt(nbt);
+    }
+
+    @Override
+    public void readNbt(NbtCompound nbt) {
+        super.readNbt(nbt);
+        loadMultiblockNbtData(nbt);
+    }
+
+    @Override
+    public Direction getFacingForMultiblock() {
+        return super.getFacingForAddon();
+    }
+
+    @Override
+    public ArrayList<BlockPos> getConnectedCores() {
+        return coreBlocksConnected;
+    }
+
+    @Override
+    public void setCoreQuality(float quality) {
+        this.coreQuality = quality;
+    }
+
+    @Override
+    public float getCoreQuality() {
+        return this.coreQuality;
+    }
+
+    @Override
+    public InventoryProvider getInventoryForLink() {
+        return null;
+    }
+
+    @Override
+    public EnergyStorage getEnergyStorageForLink() {
+        return energyStorage;
+    }
+
+    @Override
+    public void playSetupAnimation() {
+        // this block has no animation
+    }
+
+}