diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md old mode 100644 new mode 100755 diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts old mode 100644 new mode 100755 diff --git a/buildSrc/src/main/kotlin/build-extensions.kt b/buildSrc/src/main/kotlin/build-extensions.kt old mode 100644 new mode 100755 diff --git a/buildSrc/src/main/kotlin/multiloader-common.gradle.kts b/buildSrc/src/main/kotlin/multiloader-common.gradle.kts old mode 100644 new mode 100755 diff --git a/buildSrc/src/main/kotlin/multiloader-loader.gradle.kts b/buildSrc/src/main/kotlin/multiloader-loader.gradle.kts old mode 100644 new mode 100755 diff --git a/common/build.gradle.kts b/common/build.gradle.kts old mode 100644 new mode 100755 diff --git a/common/gradle.properties b/common/gradle.properties old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/CommonClass.java b/common/src/main/java/net/cmr/jurassicrevived/CommonClass.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/custom/DecoBlock.java b/common/src/main/java/net/cmr/jurassicrevived/block/custom/DecoBlock.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/custom/FenceLightBlock.java b/common/src/main/java/net/cmr/jurassicrevived/block/custom/FenceLightBlock.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/custom/FencePoleBlock.java b/common/src/main/java/net/cmr/jurassicrevived/block/custom/FencePoleBlock.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/custom/FenceWireBlock.java b/common/src/main/java/net/cmr/jurassicrevived/block/custom/FenceWireBlock.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/custom/LightPostBlock.java b/common/src/main/java/net/cmr/jurassicrevived/block/custom/LightPostBlock.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/custom/RotatableBlock.java b/common/src/main/java/net/cmr/jurassicrevived/block/custom/RotatableBlock.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/entity/ModBlockEntities.java b/common/src/main/java/net/cmr/jurassicrevived/block/entity/ModBlockEntities.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/FossilCleanerBlockEntity.java b/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/FossilCleanerBlockEntity.java index 42ad14b..69b5ed0 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/FossilCleanerBlockEntity.java +++ b/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/FossilCleanerBlockEntity.java @@ -122,6 +122,10 @@ public class FossilCleanerBlockEntity extends BlockEntity implements ExtendedMen return fluidStack; } + private void setFluid(FluidStack stack) { + this.fluidStack = stack == null || stack.isEmpty() ? FluidStack.empty() : stack; + } + @Override public Component getDisplayName() { return Component.translatable("block.jurassicrevived.fossil_cleaner"); diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/PipeBlockEntity.java b/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/PipeBlockEntity.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/TankBlockEntity.java b/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/TankBlockEntity.java index f348336..4693230 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/TankBlockEntity.java +++ b/common/src/main/java/net/cmr/jurassicrevived/block/entity/custom/TankBlockEntity.java @@ -125,7 +125,7 @@ public class TankBlockEntity extends BlockEntity implements ExtendedMenuProvider } public void setFluid(FluidStack stack) { - this.fluidStack = stack; + this.fluidStack = stack == null || stack.isEmpty() ? FluidStack.empty() : stack; setChanged(); if (level != null && !level.isClientSide()) { level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), 3); diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/entity/energy/ModEnergyStorage.java b/common/src/main/java/net/cmr/jurassicrevived/block/entity/energy/ModEnergyStorage.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/entity/energy/ModEnergyUtil.java b/common/src/main/java/net/cmr/jurassicrevived/block/entity/energy/ModEnergyUtil.java old mode 100644 new mode 100755 diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/renderer/TankBlockEntityRenderer.java b/common/src/main/java/net/cmr/jurassicrevived/block/renderer/TankBlockEntityRenderer.java index aaf4730..a0271a5 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/block/renderer/TankBlockEntityRenderer.java +++ b/common/src/main/java/net/cmr/jurassicrevived/block/renderer/TankBlockEntityRenderer.java @@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import dev.architectury.fluid.FluidStack; import dev.architectury.hooks.fluid.FluidStackHooks; +import net.cmr.jurassicrevived.Constants; import net.cmr.jurassicrevived.block.entity.custom.TankBlockEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemBlockRenderTypes; @@ -42,7 +43,7 @@ public class TankBlockEntityRenderer implements BlockEntityRenderer