AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 11:24:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

move some fluid blocks, WaterloggableBlock, fix fluid rendering

Browse Source
This commit is contained in:
Bixilon 2023-01-23 22:21:43 +01:00
parent 432d783849
commit 217e78dd9a
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
14 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/data/registries/blocks/factory/BlockFactories.kt
View File

@ -17,7 +17,7 @@ import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
import de.bixilon.minosoft.data.registries.blocks.types.Block
import de.bixilon.minosoft.data.registries.blocks.types.air.AirBlock
import de.bixilon.minosoft.data.registries.blocks.types.fluid.LavaFluidBlock
import de.bixilon.minosoft.data.registries.blocks.types.fluid.WaterFluidBlock
import de.bixilon.minosoft.data.registries.blocks.types.fluid.water.WaterFluidBlock
import de.bixilon.minosoft.data.registries.blocks.types.stone.RockBlock
import de.bixilon.minosoft.data.registries.factory.DefaultFactory
import de.bixilon.minosoft.data.registries.identified.ResourceLocation

3
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidBlock.kt
View File

@ -19,7 +19,6 @@ import de.bixilon.minosoft.data.registries.blocks.light.CustomLightProperties
import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.types.Block
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.properties.LightedBlock
import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.ShapedBlock
import de.bixilon.minosoft.data.registries.identified.ResourceLocation
@ -29,7 +28,7 @@ import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import java.util.*
abstract class FluidBlock(identifier: ResourceLocation, settings: BlockSettings) : Block(identifier, settings), FluidFilled, ShapedBlock, LightedBlock {
abstract class FluidBlock(identifier: ResourceLocation, settings: BlockSettings) : Block(identifier, settings), FluidHolder, ShapedBlock, LightedBlock {
override fun getOutlineShape(connection: PlayConnection, blockState: BlockState): VoxelShape {
return VoxelShape(mutableListOf(AABB(Vec3.EMPTY, Vec3(1.0f, fluid.getHeight(blockState), 1.0f))))

2
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidFilled.kt → src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidFilled.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer
package de.bixilon.minosoft.data.registries.blocks.types.fluid
/**
* A block that is fluid filled, e.g. water or kelp (filled with water)

2
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/FluidHolder.kt → src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/FluidHolder.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer
package de.bixilon.minosoft.data.registries.blocks.types.fluid
import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid

5
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/WaterFluidBlock.kt → src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterFluidBlock.kt
View File

@ -11,16 +11,17 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.data.registries.blocks.types.fluid
package de.bixilon.minosoft.data.registries.blocks.types.fluid.water
import de.bixilon.kutil.cast.CastUtil.unsafeNull
import de.bixilon.minosoft.data.registries.blocks.factory.BlockFactory
import de.bixilon.minosoft.data.registries.blocks.settings.BlockSettings
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock
import de.bixilon.minosoft.data.registries.fluid.fluids.flowable.water.WaterFluid
import de.bixilon.minosoft.data.registries.identified.ResourceLocation
import de.bixilon.minosoft.data.registries.registries.Registries
class WaterFluidBlock(identifier: ResourceLocation = this.identifier, settings: BlockSettings) : FluidBlock(identifier, settings) {
class WaterFluidBlock(identifier: ResourceLocation = Companion.identifier, settings: BlockSettings) : FluidBlock(identifier, settings) {
override val fluid: WaterFluid = unsafeNull()
init {

16
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/fluid/water/WaterloggableBlock.kt Normal file
View File

@ -0,0 +1,16 @@
/*
* Minosoft
* Copyright (C) 2020-2023 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.data.registries.blocks.types.fluid.water
interface WaterloggableBlock

3
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/PixLyzerBlock.kt
View File

@ -26,6 +26,7 @@ import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.state.builder.BlockStateBuilder
import de.bixilon.minosoft.data.registries.blocks.state.builder.BlockStateSettings
import de.bixilon.minosoft.data.registries.blocks.types.Block
import de.bixilon.minosoft.data.registries.blocks.types.fluid.water.WaterloggableBlock
import de.bixilon.minosoft.data.registries.blocks.types.properties.FrictionBlock
import de.bixilon.minosoft.data.registries.blocks.types.properties.JumpBlock
import de.bixilon.minosoft.data.registries.blocks.types.properties.ReplaceableBlock
@ -49,7 +50,7 @@ open class PixLyzerBlock(
identifier: ResourceLocation,
registries: Registries,
data: Map<String, Any>,
) : Block(identifier, BlockSettings(soundGroup = data["sound_group"]?.toInt()?.let { registries.soundGroup[it] }, item = data["item"]?.toInt())), FrictionBlock, JumpBlock, VelocityBlock, RandomOffsetBlock, ShapedBlock, BlockStateBuilder, ReplaceableBlock, PotentialFullOpaqueBlock {
) : Block(identifier, BlockSettings(soundGroup = data["sound_group"]?.toInt()?.let { registries.soundGroup[it] }, item = data["item"]?.toInt())), FrictionBlock, JumpBlock, VelocityBlock, RandomOffsetBlock, ShapedBlock, BlockStateBuilder, ReplaceableBlock, PotentialFullOpaqueBlock, WaterloggableBlock {
override val randomOffset: RandomOffsetTypes? = data["offset_type"].nullCast<String>()?.let { RandomOffsetTypes[it] }

2
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpBlock.kt
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.water
import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock
import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid

2
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/KelpPlantBlock.kt
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.water
import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock
import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid

2
src/main/java/de/bixilon/minosoft/data/registries/blocks/types/pixlyzer/water/SeagrassBlock.kt
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.water
import de.bixilon.minosoft.data.registries.blocks.factory.PixLyzerBlockFactory
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.PixLyzerBlock
import de.bixilon.minosoft.data.registries.factory.clazz.MultiClassFactory
import de.bixilon.minosoft.data.registries.fluid.DefaultFluids

4
src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/Fluid.kt
View File

@ -21,8 +21,8 @@ import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.state.PropertyBlockState
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidHolder
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidHolder
import de.bixilon.minosoft.data.registries.identified.ResourceLocation
import de.bixilon.minosoft.data.registries.registries.registry.RegistryItem
import de.bixilon.minosoft.gui.rendering.models.unbaked.fluid.FluidModel

2
src/main/java/de/bixilon/minosoft/data/registries/fluid/fluids/flowable/water/WaterFluid.kt
View File

@ -22,6 +22,7 @@ import de.bixilon.minosoft.data.entities.entities.player.local.LocalPlayerEntity
import de.bixilon.minosoft.data.registries.blocks.properties.BlockProperties
import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.state.PropertyBlockState
import de.bixilon.minosoft.data.registries.blocks.types.fluid.water.WaterloggableBlock
import de.bixilon.minosoft.data.registries.effects.movement.MovementEffect
import de.bixilon.minosoft.data.registries.enchantment.armor.ArmorEnchantment
import de.bixilon.minosoft.data.registries.fluid.FluidFactory
@ -133,6 +134,7 @@ class WaterFluid(resourceLocation: ResourceLocation = this.identifier) : Flowabl
fun BlockState.isWaterlogged(): Boolean {
if (this.block !is WaterloggableBlock) return false
if (this !is PropertyBlockState) return false
return properties[BlockProperties.WATERLOGGED]?.toBoolean() ?: return false
}

5
src/main/java/de/bixilon/minosoft/data/world/container/BlockSectionDataProvider.kt
View File

@ -17,7 +17,8 @@ import de.bixilon.minosoft.data.Axes
import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.registries.blocks.cube.CubeDirections
import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidBlock
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidFilled
import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.FullOpaqueBlock
import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.PotentialFullOpaqueBlock
import de.bixilon.minosoft.data.registries.fluid.fluids.flowable.water.WaterFluid.Companion.isWaterlogged
@ -85,7 +86,7 @@ class BlockSectionDataProvider(
private fun BlockState?.isFluid(): Boolean {
if (this == null) return false
if (this.block is FluidFilled) {
if (this.block is FluidFilled || this.block is FluidBlock) {
return true
}
if (this.isWaterlogged()) {

6
src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/FluidCullSectionPreparer.kt
View File

@ -22,7 +22,7 @@ import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kutil.cast.CastUtil.nullCast
import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.registries.blocks.state.BlockState
import de.bixilon.minosoft.data.registries.blocks.types.pixlyzer.FluidHolder
import de.bixilon.minosoft.data.registries.blocks.types.fluid.FluidHolder
import de.bixilon.minosoft.data.registries.blocks.types.properties.shape.PotentialFullOpaqueBlock
import de.bixilon.minosoft.data.registries.fluid.fluids.Fluid
import de.bixilon.minosoft.data.registries.fluid.fluids.flowable.FlowableFluid
@ -283,8 +283,8 @@ class FluidCullSectionPreparer(
}
if (!fluid.matches(blockState)) {
// TODO: this was blockState.material.solid
if (blockState.block is PotentialFullOpaqueBlock && blockState.block.isFullOpaque(blockState)) {
// TODO: this was !blockState.material.solid
if (blockState.block !is PotentialFullOpaqueBlock || !blockState.block.isFullOpaque(blockState)) {
count++
}
continue