From 34f8a5e65cbbe8a8bfbf09d6c9364c4fa723d9ef Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 25 Jul 2015 22:31:55 -0400 Subject: [PATCH] Fix botania compat #379 --- .../com/cricketcraft/chisel/api/IConnectable.java | 12 +++++++----- .../cricketcraft/chisel/compat/Compatibility.java | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/api/IConnectable.java b/src/main/java/com/cricketcraft/chisel/api/IConnectable.java index f00e02e4..583ada35 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IConnectable.java +++ b/src/main/java/com/cricketcraft/chisel/api/IConnectable.java @@ -1,24 +1,26 @@ package com.cricketcraft.chisel.api; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; /** * This extension of {@link IFacade} allows the block to say whether or not OTHER CTM blocks can connect to IT. */ -public interface IConnectable extends IFacade { +public interface IConnectable { /** * Determines whether other CTM blocks can connect to this one. * * @param world * @param x + * The X position of the block that is connecting to this one. NOT the position of your block. * @param y + * The Y position of the block that is connecting to this one. NOT the position of your block. * @param z - * @param from - * The direction that the block is connecting from. This differes from the {@link IFacade} methods in that it is NOT the side which is being rendered. + * The Z position of the block that is connecting to this one. NOT the position of your block. + * @param side + * The side being drawn. * @return True if a block can connect to this one from the given direction. False otherwise. */ - boolean canConnectCTM(IBlockAccess world, int x, int y, int z, ForgeDirection from); + boolean canConnectCTM(IBlockAccess world, int x, int y, int z, int side); } diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java index 21860741..78a44706 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java @@ -82,7 +82,8 @@ public class Compatibility { addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 14, 99); addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); - addSupport("Botania", "endStoneBrick", "end_stone", 12, 0); + addSupport("Botania", "endStoneBrick", "end_stone", 0, 0); + addSupport("Botania", "endStoneBrick", "end_stone", 1, 0); if(Loader.isModLoaded("EE3")){ loadEE3Values();