Merge branch 'main' into modded-farmland-mulch

common/src/main/kotlin/com/cobblemon/mod/common/block/BerryBlock.kt

@@ -143,7 +143,10 @@ class BerryBlock(private val berryIdentifier: Identifier, settings: Settings) :
         state: BlockState,
         variant: MulchVariant
     ): Boolean {
-        return getMulch(state) == MulchVariant.NONE && state.get(AGE) < FLOWER_AGE && world.getBlockState(pos.down()).isOf(Blocks.FARMLAND)
+        val plantedBlock = world.getBlockState(pos.down())
+        return getMulch(state) == MulchVariant.NONE &&
+                state.get(AGE) < FLOWER_AGE &&
+                (plantedBlock.block is FarmlandBlock || plantedBlock.isOf(Blocks.FARMLAND))
     }
 
     override fun applyMulch(

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/FossilAnalyzerBlockEntity.kt

@@ -29,17 +29,11 @@ class FossilAnalyzerBlockEntity(
 
     class FossilAnalyzerInventory(val analyzerEntity: FossilAnalyzerBlockEntity) : SidedInventory {
         override fun clear() {
-            if(analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
-                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
-                fossilMultiblockStructure.fossilInventory.clear()
-            }
+            TODO("Not yet implemented")
         }
 
         override fun size(): Int {
-            if (analyzerEntity.multiblockStructure != null) {
-                return 3
-            }
-            return 0
+            TODO("Not yet implemented")
         }
 
         override fun isEmpty(): Boolean {
@@ -47,37 +41,19 @@ class FossilAnalyzerBlockEntity(
         }
 
         override fun getStack(slot: Int): ItemStack {
-            if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
-                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
-                if (fossilMultiblockStructure.fossilInventory.size > slot) {
-                    return fossilMultiblockStructure.fossilInventory[slot]
-                }
-            }
             return ItemStack.EMPTY
         }
 
         override fun removeStack(slot: Int, amount: Int): ItemStack {
-            if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
-                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
-                if (fossilMultiblockStructure.fossilInventory.size > slot) {
-                    return fossilMultiblockStructure.fossilInventory[slot]
-                }
-            }
             return ItemStack.EMPTY
         }
 
         override fun removeStack(slot: Int): ItemStack {
-            if(analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
-                val fossilMultiblockStructure = analyzerEntity.multiblockStructure as FossilMultiblockStructure
-                if (fossilMultiblockStructure.fossilInventory.size > slot) {
-                    return fossilMultiblockStructure.fossilInventory.removeAt(slot)
-                }
-            }
             return ItemStack.EMPTY
         }
 
         override fun setStack(slot: Int, stack: ItemStack) {
-            if (analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
+            if (analyzerEntity.multiblockStructure != null) {
                 val struct = analyzerEntity.multiblockStructure as FossilMultiblockStructure
                 analyzerEntity.world?.let {
                     struct.insertFossil(stack, it)
@@ -96,9 +72,6 @@ class FossilAnalyzerBlockEntity(
         }
 
         override fun getAvailableSlots(side: Direction?): IntArray {
-            if(analyzerEntity.multiblockStructure != null && analyzerEntity.multiblockStructure is FossilMultiblockStructure) {
-                return intArrayOf(0,1,2)
-            }
             return IntArray(1)
         }