From ace224e41e8e8c4cddaae66a428242a0adedf673 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 6 Apr 2019 15:50:34 -0500 Subject: [PATCH] Update forge, fix spreader placement and rendering weirdness --- build.gradle | 2 +- .../botania/client/core/handler/HUDHandler.java | 2 +- .../botania/common/block/mana/BlockSpreader.java | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b5450ab17..dbe84334a 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ minecraft { } dependencies { - minecraft 'net.minecraftforge:forge:1.13.2-25.0.107' + minecraft 'net.minecraftforge:forge:1.13.2-25.0.110' } repositories { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 403328a1b..54fd999f5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -133,7 +133,7 @@ public final class HUDHandler { if(PlayerHelper.hasAnyHeldItem(mc.player)) { if(pos != null && PlayerHelper.hasHeldItem(mc.player, ModItems.twigWand)) { - // todo 1.13 weird AT crash renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand)); + renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand)); if(block instanceof IWandHUD) { profiler.startSection("wandItem"); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 6f93cdb16..3917eea8a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -30,6 +30,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -57,7 +58,7 @@ import java.util.List; import java.util.Locale; public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { - + private static final VoxelShape RENDER_SHAPE = makeCuboidShape(1, 1, 1, 15, 15, 15); public enum Variant { MANA, REDSTONE, @@ -71,9 +72,15 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex this.variant = v; } + @Nonnull @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack par6ItemStack) { - EnumFacing orientation = EnumFacing.getFacingDirections(placer)[0]; + public VoxelShape getRenderShape(IBlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos) { + return RENDER_SHAPE; + } + + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + EnumFacing orientation = EnumFacing.getFacingDirections(placer)[0].getOpposite(); TileSpreader spreader = (TileSpreader) world.getTileEntity(pos); switch(orientation) {