From 4a119d07a2287dff4dce4271909a5b3b0a1e608f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 15 Jan 2015 04:40:31 -0500 Subject: [PATCH] Fix WAILA compat. Update to WAILA 1.5.8a. Fix stair block descriptions. --- gradle.properties | 2 +- .../java/com/cricketcraft/chisel/Chisel.java | 2 +- .../chisel/block/BlockCarvableStairs.java | 2 +- .../chisel/carving/CarvableHelper.java | 6 +---- .../compat/{Waila.java => WailaCompat.java} | 23 ++++++++++++++----- 5 files changed, 21 insertions(+), 14 deletions(-) rename src/main/java/com/cricketcraft/chisel/compat/{Waila.java => WailaCompat.java} (63%) diff --git a/gradle.properties b/gradle.properties index c44b0c99..2eb02977 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ mod_version=2.2.2 minecraft_version=1.7.10 forge_version=10.13.2.1277 -waila_version=1.5.3 +waila_version=1.5.8a ccl_version=1.1.1.110 ccc_version=1.0.4.29 nei_version=1.0.3.74 diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 3e660b10..0b3ec73e 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -138,7 +138,7 @@ public class Chisel { MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(instance); - FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.Waila.register"); + FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.compat.WailaCompat.register"); } private void registerWorldgen(Features feature, Block block, int amount) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java index f7dafbf6..ea20d6d5 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java @@ -89,6 +89,6 @@ public class BlockCarvableStairs extends BlockStairs implements ICarvable { @Override public CarvableVariation getVariation(int metadata) { - return carverHelper.getVariation(metadata); + return carverHelper.getVariation(blockMeta + (metadata / 8)); } } diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java index 5f2464bd..7a16f157 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java @@ -296,11 +296,7 @@ public class CarvableHelper { if (forbidChiseling) return; - if (variation.block == null) { - Carving.chisel.addVariation(name, block, blockMeta, variation.metadata); - } else { - Carving.chisel.addVariation(name, variation.block, variation.blockMeta, variation.metadata); - } + Carving.chisel.addVariation(name, block, blockMeta, variation.metadata); } public void registerBlockIcons(String modName, Block block, IIconRegister register) { diff --git a/src/main/java/com/cricketcraft/chisel/compat/Waila.java b/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java similarity index 63% rename from src/main/java/com/cricketcraft/chisel/compat/Waila.java rename to src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java index f93f162a..77932013 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Waila.java +++ b/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java @@ -6,11 +6,18 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockCarvable; +import com.cricketcraft.chisel.api.ICarvable; -public class Waila implements IWailaDataProvider { +public class WailaCompat implements IWailaDataProvider { + + private WailaCompat() { + } @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler configHandler) { @@ -24,8 +31,8 @@ public class Waila implements IWailaDataProvider { @Override public List getWailaBody(ItemStack stack, List strings, IWailaDataAccessor accessor, IWailaConfigHandler configHandler) { - if (accessor.getBlock() instanceof BlockCarvable) { - BlockCarvable block = (BlockCarvable) accessor.getBlock(); + if (accessor.getBlock() instanceof ICarvable) { + ICarvable block = (ICarvable) accessor.getBlock(); strings.add(block.getVariation(accessor.getMetadata()).getDescription()); } return strings; @@ -36,8 +43,12 @@ public class Waila implements IWailaDataProvider { return strings; } + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + return tag; + } + public static void register(IWailaRegistrar registrar) { - Waila instance = new Waila(); - registrar.registerBodyProvider(instance, BlockCarvable.class); + registrar.registerBodyProvider(new WailaCompat(), ICarvable.class); } }