From 50913569db8167cde559851ebaec793c3a269d5d Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:16:56 -0500 Subject: [PATCH] Hide WAILA and remove collision of render blocks (#3436) Co-authored-by: Martin Robertz --- .../regularBlock/AntimatterRenderBlock.java | 22 +++++++++++++++++++ .../common/blocks/BlockBlackholeRenderer.java | 20 ++++++++++++++++- .../common/blocks/BlockWormholeRender.java | 20 ++++++++++++++++- .../tectech/thing/block/BlockEOHRender.java | 17 ++++++++++++++ .../tectech/thing/block/BlockForgeOfGods.java | 22 +++++++++++++++++++ 5 files changed, 99 insertions(+), 2 deletions(-) diff --git a/src/main/java/goodgenerator/blocks/regularBlock/AntimatterRenderBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/AntimatterRenderBlock.java index baa06f70dcf..4eb7a15bd71 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/AntimatterRenderBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/AntimatterRenderBlock.java @@ -7,6 +7,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -59,4 +61,24 @@ public ArrayList getDrops(World world, int x, int y, int z, int meta, return new ArrayList<>(); } + @Override + public boolean isCollidable() { + return false; + } + + @Override + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { + return false; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } } diff --git a/src/main/java/gregtech/common/blocks/BlockBlackholeRenderer.java b/src/main/java/gregtech/common/blocks/BlockBlackholeRenderer.java index 84d61172c3f..760fa9a9a07 100644 --- a/src/main/java/gregtech/common/blocks/BlockBlackholeRenderer.java +++ b/src/main/java/gregtech/common/blocks/BlockBlackholeRenderer.java @@ -7,6 +7,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; @@ -68,7 +70,23 @@ public ArrayList getDrops(World world, int x, int y, int z, int meta, @Override public boolean isCollidable() { - return true; + return false; + } + + @Override + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { + return false; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; } } diff --git a/src/main/java/gregtech/common/blocks/BlockWormholeRender.java b/src/main/java/gregtech/common/blocks/BlockWormholeRender.java index 7ae76156395..354b350ff1f 100644 --- a/src/main/java/gregtech/common/blocks/BlockWormholeRender.java +++ b/src/main/java/gregtech/common/blocks/BlockWormholeRender.java @@ -7,6 +7,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; @@ -69,7 +71,23 @@ public ArrayList getDrops(World world, int x, int y, int z, int meta, @Override public boolean isCollidable() { - return true; + return false; + } + + @Override + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { + return false; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; } } diff --git a/src/main/java/tectech/thing/block/BlockEOHRender.java b/src/main/java/tectech/thing/block/BlockEOHRender.java index db70a4a9568..082f287cc46 100644 --- a/src/main/java/tectech/thing/block/BlockEOHRender.java +++ b/src/main/java/tectech/thing/block/BlockEOHRender.java @@ -7,6 +7,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; @@ -75,4 +77,19 @@ public boolean isCollidable() { return false; } + @Override + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { + return false; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } } diff --git a/src/main/java/tectech/thing/block/BlockForgeOfGods.java b/src/main/java/tectech/thing/block/BlockForgeOfGods.java index 3667ebfd1d9..50438963bf5 100644 --- a/src/main/java/tectech/thing/block/BlockForgeOfGods.java +++ b/src/main/java/tectech/thing/block/BlockForgeOfGods.java @@ -7,6 +7,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; @@ -66,4 +68,24 @@ public ArrayList getDrops(World world, int x, int y, int z, int meta, return new ArrayList<>(); } + @Override + public boolean isCollidable() { + return false; + } + + @Override + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { + return false; + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World worldIn, int x, int y, int z) { + return null; + } }