curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 03:24:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

fluids separated from blocks

Browse Source
This commit is contained in:
minjaesong
2023-10-09 17:35:26 +09:00
parent dd1e53f761
commit d9218a2dd6
15 changed files with 89 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/blockproperties/BlockCodex.kt
View File

@@ -4,8 +4,6 @@ import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.ReferencingRanges.PREFIX_VIRTUALTILE
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameworld.FluidType
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.utils.CSVFetcher
import net.torvald.util.SortedArrayList
import org.apache.commons.csv.CSVRecord
@@ -156,10 +154,10 @@ class BlockCodex {
}
}
operator fun get(fluidType: FluidType?): BlockProp {
/*operator fun get(fluidType: FluidType?): BlockProp {
// TODO fluid from other mods
if (fluidType == null || fluidType.value == 0) {
if (fluidType == null || fluidType == Fluid.NULL) {
return blockProps[Block.AIR]!!
}
@@ -169,7 +167,7 @@ class BlockCodex {
catch (e: NullPointerException) {
throw NullPointerException("Blockprop with id $fluidType does not exist.")
}
}
}*/
fun getOrNull(blockID: ItemID?): BlockProp? {//<O>
return blockProps[blockID]