Skip to content

Commit

Permalink
Fuel tanks now show amount
Browse files Browse the repository at this point in the history
  • Loading branch information
@Seggan
Seggan committed Mar 14, 2024
1 parent 7df7158 commit e64235f
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 50 deletions.
2 changes: 1 addition & 1 deletion plugin/src/main/kotlin/io/github/addoncommunity/galactifun/api/rockets/RocketInfo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class RocketInfo(
appendLine(" Stage ${stageNum++}: ")
appendLine(" Fuel:")
for ((gas, volume) in stage.fuel) {
appendLine(" $gas: %.2f liters, %.2s".format(volume.liters, volume * gas.liquidDensity))
appendLine(" $gas: %.2s, %.2s".format(volume, volume * gas.liquidDensity))
}
appendLine(" Engines:")
var engineNum = 1
Expand Down
1 change: 1 addition & 0 deletions plugin/src/main/kotlin/io/github/addoncommunity/galactifun/impl/items/CommandComputer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,6 @@ class CommandComputer(
return
}
e.player.sendMessage(NamedTextColor.GOLD + info.info)
e.cancel()
}
}
19 changes: 18 additions & 1 deletion plugin/src/main/kotlin/io/github/addoncommunity/galactifun/impl/items/FuelTank.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@ import io.github.addoncommunity.galactifun.util.adjacentFaces
import io.github.addoncommunity.galactifun.util.checkBlock
import io.github.addoncommunity.galactifun.util.general.enumMapOf
import io.github.addoncommunity.galactifun.util.general.mergeMaps
import io.github.addoncommunity.galactifun.util.general.with
import io.github.addoncommunity.galactifun.util.items.TickingBlock
import io.github.addoncommunity.galactifun.util.items.buildMenu
import io.github.seggan.sf4k.serial.*
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType
import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack
import me.mrCookieSlime.Slimefun.api.BlockStorage
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.format.NamedTextColor
import org.bukkit.Material
import org.bukkit.block.Block
import org.bukkit.inventory.ItemStack

Expand All @@ -35,7 +40,8 @@ class FuelTank(

private val menu = buildMenu {
numRows = 1
input(INPUT, 0).addBorder()
input(INPUT with 0).addBorder()
item(0 with 0, CustomItemStack(Material.WATER_BUCKET, "&fContents"))
}

private val fuelDataType = MapBlockStorageDataType(
Expand Down Expand Up @@ -95,6 +101,17 @@ class FuelTank(
if (distributable <= 0) break
setFuelLevel(block, toAdd)
}

val contentsItem = menu.getItemInSlot(0)
val currentFuel = getFuelLevel(b)
val lore = mutableListOf<Component>()
for ((gas, amount) in currentFuel) {
lore += Component.text()
.color(NamedTextColor.BLUE)
.content("$gas: %.2s, %.2s".format(amount, amount * gas.liquidDensity))
.build()
}
contentsItem.lore(lore)
}

fun getFuelLevel(block: Block): Map<Gas, Volume> {
Expand Down
5 changes: 5 additions & 0 deletions plugin/src/main/kotlin/io/github/addoncommunity/galactifun/util/general/IntPair.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package io.github.addoncommunity.galactifun.util.general

data class IntPair(val first: Int, val second: Int)

infix fun Int.with(that: Int) = IntPair(this, that)
21 changes: 0 additions & 21 deletions plugin/src/main/kotlin/io/github/addoncommunity/galactifun/util/items/MenuBlock.kt
View file

This file was deleted.

66 changes: 39 additions & 27 deletions plugin/src/main/kotlin/io/github/addoncommunity/galactifun/util/items/MenuBuilder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.addoncommunity.galactifun.util.items

import io.github.addoncommunity.galactifun.util.general.IntPair
import io.github.addoncommunity.galactifun.util.general.with
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun
import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack
import io.github.thebusybiscuit.slimefun4.libraries.dough.protection.Interaction
import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils
import it.unimi.dsi.fastutil.ints.IntArrayList
import it.unimi.dsi.fastutil.ints.IntList
import it.unimi.dsi.fastutil.ints.IntOpenHashSet
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHandler
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset
Expand All @@ -18,10 +18,10 @@ import org.bukkit.inventory.ItemStack

class MenuBuilder {

private val inputBorder = IntArrayList()
private val outputBorder = IntArrayList()
private val inputs = IntArrayList()
private val outputs = IntArrayList()
private val inputBorder = mutableListOf<IntPair>()
private val outputBorder = mutableListOf<IntPair>()
private val inputs = mutableListOf<IntPair>()
private val outputs = mutableListOf<IntPair>()

private val otherItems = mutableListOf<MenuItem>()

Expand All @@ -33,34 +33,41 @@ class MenuBuilder {
field = value.coerceIn(1, 6)
}

fun item(x: Int, y: Int, item: ItemStack, onClick: MenuClickHandler = ChestMenuUtils.getEmptyClickHandler()) {
otherItems.add(MenuItem(coordsToSlot(x, y), item, onClick))
fun item(coords: IntPair, item: ItemStack, onClick: MenuClickHandler = ChestMenuUtils.getEmptyClickHandler()) {
otherItems.add(MenuItem(coordsToSlot(coords), item, onClick))
}

fun inputBorder(vararg points: Int) = inputBorder.addAll(points)
fun inputBorder(vararg points: IntPair) {
inputBorder.addAll(points)
}

fun outputBorder(vararg points: Int) = outputBorder.addAll(points)
fun outputBorder(vararg points: IntPair) {
outputBorder.addAll(points)
}

fun input(vararg points: Int): MaybeBorder {
fun input(vararg points: IntPair): MaybeBorder {
inputs.addAll(points)
return MaybeBorder(points, inputBorder)
}

fun output(vararg points: Int): MaybeBorder {
fun output(vararg points: IntPair): MaybeBorder {
outputs.addAll(points)
return MaybeBorder(points, outputBorder)
}

inner class MaybeBorder internal constructor(private val points: IntArray, private val borderList: IntList) {
inner class MaybeBorder internal constructor(
private val points: Array<out IntPair>,
private val borderList: MutableList<IntPair>
) {
fun addBorder() {
var i = 0
while (i < points.size) {
val cx = points[i++]
val cy = points[i++]
for (point in points) {
for (x in -1..1) {
for (y in -1..1) {
val result = coordsToSlot(cx + x, cy + y)
if (result !in inputs && result !in outputs && result in 0 until numRows * 9) {
val result = point.first + x with point.second + y
if (result !in inputs
&& result !in outputs
&& coordsToSlot(result) in 0 until numRows * 9
) {
borderList.add(result)
}
}
Expand All @@ -71,10 +78,10 @@ class MenuBuilder {

fun applyOn(sfItem: SlimefunItem) {
val lastIndex = numRows * 9
val ins = inputs.toIntArray()
val outs = outputs.toIntArray()
val inBorder = inputBorder.toIntArray()
val outBorder = outputBorder.toIntArray()
val ins = inputs.mapToIntArray(::coordsToSlot)
val outs = outputs.mapToIntArray(::coordsToSlot)
val inBorder = inputBorder.mapToIntArray(::coordsToSlot)
val outBorder = outputBorder.mapToIntArray(::coordsToSlot)

val bg = IntOpenHashSet(IntArray(lastIndex) { it })
ins.forEach(bg::remove)
Expand Down Expand Up @@ -116,12 +123,17 @@ class MenuBuilder {
}
}

private fun coordsToSlot(x: Int, y: Int): Int {
return x + y * 9
private fun coordsToSlot(coords: IntPair): Int {
return coords.first + coords.second * 9
}

private fun IntList.addAll(array: IntArray) {
array.forEach(this::add)
private fun <T> Collection<T>.mapToIntArray(transform: (T) -> Int): IntArray {
val array = IntArray(size)
var index = 0
for (element in this) {
array[index++] = transform(element)
}
return array
}

private data class MenuItem(val slot: Int, val item: ItemStack, val handler: MenuClickHandler)
Expand Down

0 comments on commit e64235f

Please sign in to comment.