Add models for bio and oil generator

Author: Rearth

src/main/generated/.cache/19c08d24c255c2719fbb8ac01f9dff290b763461

@@ -1,23 +1,23 @@
-// 1.20.4	2024-04-09T20:01:08.562303	Oritech/Model Definitions
+// 1.20.4	2024-04-11T22:05:30.5469396	Oritech/Model Definitions
 b4b5bb16cd9934be2399058ea8772b23ac699345 assets\oritech\models\item\exo_chestplate.json
-8ede0997449fd1c3f65a07df184768a843b473ed assets\oritech\models\item\centrifuge_block.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
 3fcaea2f05319816f7904137763182c4106c91a9 assets\oritech\blockstates\destroyer_block.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
-b91305cbccecb97f9d74e2b92787ae9fa6387786 assets\oritech\blockstates\fluid_pipe.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\fragment_forge_block.json
+b91305cbccecb97f9d74e2b92787ae9fa6387786 assets\oritech\blockstates\fluid_pipe.json
 98d62a615b70fca694eb00c6b8aa9297c4a92b62 assets\oritech\blockstates\energy_pipe_connection.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\big_solar_panel_block.json
 ff8c539de2afd50edaef11008239ffb8e08c66de assets\oritech\models\block\pump_trunk_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
-7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\pulverizer_block.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\laser_arm_block.json
+7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\pulverizer_block.json
 e4497bad8afbd4f4b4e830d892284a05718b06dd assets\oritech\models\block\machine_core_basic.json
 505d30e3b61ee0ba1f2616e1226689e2cdb7ab58 assets\oritech\models\block\addon_indicator_block.json
 a5651b8d4a27308b40c404f7cd3abcf9769b64b6 assets\oritech\models\item\machine_core_basic.json
@@ -28,18 +28,17 @@ fb03aa413ddd02d32aca58d75003db4dbc224080 assets\oritech\models\item\exo_leggings
 ee822d455f99c8c53c789fdb744979f678ca2729 assets\oritech\blockstates\fertilizer_block.json
 46af77abe62b29d232feadccde429fd59d5603fc assets\oritech\blockstates\placer_block.json
 3d37038977380bd685f913e722cc3b1c3a25c35d assets\oritech\models\item\atomic_forge_block.json
-7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\test_generator_block.json
 eafe84c787830ab2a866e0878e9ed718d58659f5 assets\oritech\blockstates\banana_block.json
 b5ee97616ae0d2da17dfaecf45aa42f2cf19f691 assets\oritech\blockstates\machine_extender.json
+2dc896d2d7e1b25b275fbc04d54958711b3469f7 assets\oritech\models\item\bio_generator_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
 45fbece69084d6df6eaa4ba344d25eef914c63c3 assets\oritech\models\item\small_storage_block.json
 9cd64a2fe3b9a0ee479646d36cc0302bcd7cab4f assets\oritech\models\block\destroyer_block.json
+b8bc03092cb1eb686ede01daffc7421253af860c assets\oritech\models\item\machine_extender.json
 63f14855c688ce7ec236097ce232dd381cbc1538 assets\oritech\blockstates\addon_indicator_block.json
-7ee14de0149c70d1145dbf338518690b536cc02e assets\oritech\models\item\powered_furnace_block.json
 746b98d721e5ae0d96dd769e71b786afa8c2d142 assets\oritech\models\item\banana_block.json
+7ee14de0149c70d1145dbf338518690b536cc02e assets\oritech\models\item\powered_furnace_block.json
 c0a08ce14172e22abd9f55d82686f7e96e74834a assets\oritech\blockstates\large_storage_block.json
 230eb8fa77942cdf46509bea8df75b48f82e9e8e assets\oritech\blockstates\machine_frame_block.json
 7490d9bdd19f3bb73de89d7e68af4f576c3d4749 assets\oritech\models\item\exo_helmet.json
@@ -48,19 +47,20 @@ c0a08ce14172e22abd9f55d82686f7e96e74834a assets\oritech\blockstates\large_storag
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\atomic_forge_block.json
 ff59e92a557b29eeb7f85b1c15ef206c5b99aff6 assets\oritech\models\item\foundry_block.json
 907e1d1717c926ebc0455ebe3291c7e917eb74d2 assets\oritech\models\item\basic_generator_block.json
-c641d411ad252487b93d779cee9028b9ee920281 assets\oritech\blockstates\machine_core_basic.json
 78f4a2e5abfbdcb3a8cd6f797ad3aa776614617d assets\oritech\blockstates\pump_trunk_block.json
+c641d411ad252487b93d779cee9028b9ee920281 assets\oritech\blockstates\machine_core_basic.json
 70cd17a84bf2d31647992ee3d21766ca5ea23151 assets\oritech\models\item\fragment_forge_block.json
 a5afa0ba8780ec08bd0a9284bc08e0c681fe7158 assets\oritech\blockstates\block_placer_head.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\assembler_block.json
 5054284e6d5fe0785ac93bdda5101c47337953cf assets\oritech\models\item\machine_frame_block.json
 7b3ae67ec28f9b36b96539cd48b92096861d0853 assets\oritech\models\item\oil_bucket.json
 7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\powered_furnace_block.json
-ccd7e87c2ba5a5062bb88aa6e103d49d47cd56ff assets\oritech\blockstates\energy_pipe.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
+7eb395cd65df72caf43bedc54067cbf53940fd6c assets\oritech\blockstates\bio_generator_block.json
 b36cb951a571fd6642ae04f9d62b7be9de04c40e assets\oritech\models\item\lava_generator_block.json
 97794db126be871e2cb68297abbe8917c343e705 assets\oritech\models\item\fluid_pipe.json
 469ea8a66c529fe26bc029c21092e7f062ed0e40 assets\oritech\models\block\banana_block.json

src/main/generated/assets/oritech/blockstates/test_generator_block.json renamed to src/main/generated/assets/oritech/blockstates/bio_generator_block.json

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

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

@@ -74,6 +74,8 @@ public void tick(World world, BlockPos pos, BlockState state, MachineBlockEntity
                 }
                 markDirty();
                 markNetDirty();
+            } else {    // this will cause the progress to reset when it' still burning but the generator is full
+                progress = 0;
             }
         } else if (canFitEnergy()) {
             // try consume new item

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

@@ -4,7 +4,6 @@
 import org.jetbrains.annotations.NotNull;
 import rearth.oritech.block.base.block.UpgradableMachineBlock;
 import rearth.oritech.block.entity.machines.generators.BasicGeneratorEntity;
-import rearth.oritech.block.entity.machines.generators.TestGeneratorEntity;
 
 public class BasicGeneratorBlock extends UpgradableMachineBlock {
     public BasicGeneratorBlock(Settings settings) {

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

@@ -0,0 +1,17 @@
+package rearth.oritech.block.blocks.machines.generators;
+
+import net.minecraft.block.entity.BlockEntity;
+import org.jetbrains.annotations.NotNull;
+import rearth.oritech.block.base.block.MultiblockMachine;
+import rearth.oritech.block.entity.machines.generators.BioGeneratorEntity;
+
+public class BioGeneratorBlock extends MultiblockMachine {
+    public BioGeneratorBlock(Settings settings) {
+        super(settings);
+    }
+    
+    @Override
+    public @NotNull Class<? extends BlockEntity> getBlockEntityType() {
+        return BioGeneratorEntity.class;
+    }
+}

src/main/java/rearth/oritech/block/blocks/machines/generators/BasicGeneratorBlock.java

@@ -26,7 +26,12 @@ public BasicGeneratorEntity(BlockPos pos, BlockState state) {
 
     @Override
     protected OritechRecipeType getOwnRecipeType() {
-        return RecipeContent.TEST_GENERATOR;
+        return RecipeContent.BIO_GENERATOR;
+    }
+    
+    @Override
+    protected float getAnimationSpeed() {
+        return 1 * getSpeedMultiplier();
     }
 
     @Override

src/main/java/rearth/oritech/block/blocks/machines/generators/BioGeneratorBlock.java

@@ -4,24 +4,23 @@
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
-import rearth.oritech.block.base.entity.UpgradableGeneratorBlockEntity;
+import rearth.oritech.block.base.entity.MultiblockGeneratorBlockEntity;
 import rearth.oritech.client.init.ModScreens;
 import rearth.oritech.init.BlockEntitiesContent;
 import rearth.oritech.init.recipes.OritechRecipeType;
 import rearth.oritech.init.recipes.RecipeContent;
 import rearth.oritech.util.InventorySlotAssignment;
 
-import java.util.ArrayList;
 import java.util.List;
 
-public class TestGeneratorEntity extends UpgradableGeneratorBlockEntity {
-    public TestGeneratorEntity(BlockPos pos, BlockState state) {
-        super(BlockEntitiesContent.TEST_GENERATOR_ENTITY, pos, state, 30);
+public class BioGeneratorEntity extends MultiblockGeneratorBlockEntity {
+    public BioGeneratorEntity(BlockPos pos, BlockState state) {
+        super(BlockEntitiesContent.BIO_GENERATOR_ENTITY, pos, state, 30);
     }
 
     @Override
     protected OritechRecipeType getOwnRecipeType() {
-        return RecipeContent.TEST_GENERATOR;
+        return RecipeContent.BIO_GENERATOR;
     }
 
     @Override
@@ -38,7 +37,7 @@ public List<GuiSlot> getGuiSlots() {
 
     @Override
     public ScreenHandlerType<?> getScreenHandlerType() {
-        return ModScreens.TEST_GENERATOR_SCREEN;
+        return ModScreens.BIO_GENERATOR_SCREEN;
     }
 
     @Override
@@ -48,6 +47,17 @@ public int getInventorySize() {
 
     @Override
     public List<Vec3i> getAddonSlots() {
-        return new ArrayList<>();
+        
+        return List.of(
+          new Vec3i(1, 0, 0),
+          new Vec3i(1, 1, 0)
+        );
+    }
+    
+    @Override
+    public List<Vec3i> getCorePositions() {
+        return List.of(
+          new Vec3i(0, 1, 0)
+        );
     }
 }