BAD CHANGES

Bread-Experts-Group · Jul 13, 2024 · ec01b59 · ec01b59
1 parent f41d68b
commit ec01b59
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/src/main/kotlin/breadmod/block/machine/entity/CreativeGeneratorBlockEntity.kt b/src/main/kotlin/breadmod/block/machine/entity/CreativeGeneratorBlockEntity.kt
@@ -51,12 +51,17 @@ class CreativeGeneratorBlockEntity(
         if(blockEntities.isNotEmpty()) {
             val total = min(energyHandle.bMaxExtract, energyHandle.stored)
             val toDistribute = total / blockEntities.size
-            var distributed = 0
-            blockEntities.forEach { opt -> opt.ifPresent {
-                distributed += it.receiveEnergy(toDistribute, false)
-                if(distributed > total) { energyHandle.extractEnergy(total, false); return@ifPresent }
+            blockEntities.forEach { opt -> opt.ifPresent { present ->
+                val energyToPush = min(present.maxEnergyStored - present.energyStored, toDistribute)
+                println("present block entity storage/max storage: ${present.energyStored}/${present.maxEnergyStored}")
+                println("to distribute: $energyToPush")
+                present.receiveEnergy(energyToPush, false)
+                energyHandle.extractEnergy(energyToPush, false)
+
+//                distributed += present.receiveEnergy(energyToPush, false)
+//                if(distributed > total) { energyHandle.extractEnergy(total, false) }
+                return@ifPresent
             } }
-            energyHandle.extractEnergy(distributed, false)
         }
     }
 }
diff --git a/src/main/kotlin/breadmod/block/machine/entity/renderer/ToasterRenderer.kt b/src/main/kotlin/breadmod/block/machine/entity/renderer/ToasterRenderer.kt
@@ -3,16 +3,13 @@ package breadmod.block.machine.entity.renderer
 import breadmod.ModMain
 import breadmod.block.machine.entity.ToasterBlockEntity
 import breadmod.util.render.renderBlockModel
+import breadmod.util.render.renderStaticItem
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
-import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.core.Direction
-import net.minecraft.world.item.ItemDisplayContext
-import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
 import net.minecraftforge.client.model.generators.ModelProvider
 
@@ -77,18 +74,4 @@ class ToasterRenderer: BlockEntityRenderer<ToasterBlockEntity> {
         }
         pPoseStack.popPose()
     }
-
-    private fun renderStaticItem(pStack: ItemStack, pPoseStack: PoseStack, pBuffer: MultiBufferSource, pBlockEntity: BlockEntity, pPackedLight: Int) {
-        val itemRenderer = Minecraft.getInstance().itemRenderer
-        itemRenderer.renderStatic(
-            pStack,
-            ItemDisplayContext.FIXED,
-            pPackedLight,
-            OverlayTexture.NO_OVERLAY,
-            pPoseStack,
-            pBuffer,
-            pBlockEntity.level,
-            1
-        )
-    }
 }
diff --git a/src/main/kotlin/breadmod/util/render/General.kt b/src/main/kotlin/breadmod/util/render/General.kt
@@ -9,7 +9,9 @@ import net.minecraft.client.renderer.GameRenderer
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.entity.ItemRenderer
+import net.minecraft.client.renderer.texture.OverlayTexture
 import net.minecraft.client.resources.model.BakedModel
+import net.minecraft.world.item.ItemDisplayContext
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraftforge.client.RenderTypeHelper
@@ -100,6 +102,8 @@ fun renderItemModel(
 
 /**
  * Renders a provided [pModel] (as a block model) onto a [BlockEntityRenderer]
+ *
+ * *Note that the [pModel] does not rotate with the block*
  */
 fun renderBlockModel(
     pPoseStack: PoseStack,
@@ -124,6 +128,23 @@ fun renderBlockModel(
     )
 }
 
+/**
+ * Renders a provided [pStack] onto a [BlockEntityRenderer]
+ */
+fun renderStaticItem(pStack: ItemStack, pPoseStack: PoseStack, pBuffer: MultiBufferSource, pBlockEntity: BlockEntity, pPackedLight: Int) {
+    val itemRenderer = Minecraft.getInstance().itemRenderer
+    itemRenderer.renderStatic(
+        pStack,
+        ItemDisplayContext.FIXED,
+        pPackedLight,
+        OverlayTexture.NO_OVERLAY,
+        pPoseStack,
+        pBuffer,
+        pBlockEntity.level,
+        1
+    )
+}
+
 fun drawVertex(
     pBuilder: VertexConsumer,
     pPoseStack: PoseStack,