Merge branch 'main' of https://github.com/thedarkcolour/MinecraftFuture…

… into main
thedarkcolour · Mar 28, 2022 · 60ff5cc · 60ff5cc
2 parents e15e162 + 8da10ec
commit 60ff5cc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -104,7 +104,7 @@ dependencies {
     // Stuff I care about
     implementation(fg.deobf(curse("enchantment_descriptions", 250419, 2689502)))
     implementation(fg.deobf(curse("enchantment_descriptions_sources", 250419, 2689503)))
-    implementation(fg.deobf(curse("fluidlogged_api", 485654, 3384016)))
+    implementation(fg.deobf(curse("fluidlogged_api", 485654, 3698755)))
     implementation(fg.deobf(curse("biomes_o_plenty", 220318, 2842510)))
     implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.19.548")
     implementation(fg.deobf("mezz.jei:jei_1.12.2:4.15.0.+"))

diff --git a/src/main/java/thedarkcolour/futuremc/block/ChainBlock.kt b/src/main/java/thedarkcolour/futuremc/block/ChainBlock.kt
@@ -1,6 +1,6 @@
 package thedarkcolour.futuremc.block
 
-import git.jbredwards.fluidlogged_api.common.block.IFluidloggable
+import git.jbredwards.fluidlogged_api.api.block.IFluidloggable
 import net.minecraft.block.state.BlockFaceShape
 import net.minecraft.block.state.IBlockState
 import net.minecraft.util.BlockRenderLayer
@@ -10,7 +10,7 @@ import net.minecraft.world.IBlockAccess
 import net.minecraftforge.fml.common.Optional
 import thedarkcolour.core.block.FBlock
 
-@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.common.block.IFluidloggable", modid = "fluidlogged_api")
+@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.api.block.IFluidloggable", modid = "fluidlogged_api")
 class ChainBlock(properties: Properties) : FBlock(properties), IFluidloggable {
     override fun isPassable(worldIn: IBlockAccess?, pos: BlockPos?) = false
     override fun getRenderLayer() = BlockRenderLayer.CUTOUT

diff --git a/src/main/java/thedarkcolour/futuremc/block/villagepillage/BlockWall.kt b/src/main/java/thedarkcolour/futuremc/block/villagepillage/BlockWall.kt
@@ -1,6 +1,6 @@
 package thedarkcolour.futuremc.block.villagepillage
 
-import git.jbredwards.fluidlogged_api.common.block.IFluidloggable
+import git.jbredwards.fluidlogged_api.api.block.IFluidloggable
 import net.minecraft.block.Block
 import net.minecraft.block.BlockFenceGate
 import net.minecraft.block.SoundType
@@ -19,7 +19,7 @@ import net.minecraft.world.World
 import net.minecraftforge.fml.common.Optional
 import thedarkcolour.core.block.FBlock
 
-@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.common.block.IFluidloggable", modid = "fluidlogged_api")
+@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.api.block.IFluidloggable", modid = "fluidlogged_api")
 class BlockWall(properties: Properties) : FBlock(properties), IFluidloggable {
     init {
         defaultState = defaultState.withProperty(UP, false).withProperty(NORTH, false).withProperty(EAST, false).withProperty(

diff --git a/src/main/java/thedarkcolour/futuremc/block/villagepillage/LanternBlock.kt b/src/main/java/thedarkcolour/futuremc/block/villagepillage/LanternBlock.kt
@@ -1,6 +1,6 @@
 package thedarkcolour.futuremc.block.villagepillage
 
-import git.jbredwards.fluidlogged_api.common.block.IFluidloggable
+import git.jbredwards.fluidlogged_api.api.block.IFluidloggable
 import net.minecraft.block.Block
 import net.minecraft.block.BlockHopper
 import net.minecraft.block.BlockTrapDoor
@@ -20,7 +20,7 @@ import net.minecraftforge.fml.common.Optional
 import thedarkcolour.core.block.FBlock
 import java.util.*
 
-@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.common.block.IFluidloggable", modid = "fluidlogged_api")
+@Optional.Interface(iface = "git.jbredwards.fluidlogged_api.api.block.IFluidloggable", modid = "fluidlogged_api")
 class LanternBlock(properties: Properties) : FBlock(properties), IFluidloggable {
     init {
         // todo check to see if i should add to FBlock

diff --git a/src/main/java/thedarkcolour/futuremc/item/FireproofItemLogic.kt b/src/main/java/thedarkcolour/futuremc/item/FireproofItemLogic.kt
@@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.MathHelper
 import net.minecraft.world.WorldServer
 import net.minecraftforge.event.ForgeEventFactory
+import net.minecraftforge.fml.common.Loader
 import java.util.*
 import kotlin.math.abs
 import kotlin.math.floor
@@ -140,8 +141,7 @@ object FireproofItemLogic {
         entity.spawnRunningParticles()
         entity.handleWaterMovement()
 
-        // todo replace with call to ICubicWorld.getMinHeight - 64.0
-        if (entity.posY < -64.0) {
+        if (entity.posY < -64.0 && !Loader.isModLoaded("cubicchunks")) {
             entity.outOfWorld()
         }