Added getBlock/getBlockMetadata methods to Vec3i.

Misc adjustments.

Author: MartinSVK12

multiblocks/src/main/java/sunsetsatellite/catalyst/multiblocks/RenderMultiblock.java

@@ -20,7 +20,7 @@ public void doRender(Tessellator tessellator, TileEntity tileEntity, double d, d
         int i = tileEntity.x;
         int j = tileEntity.y;
         int k = tileEntity.z;
-        Direction dir = Direction.getDirectionFromSide(tileEntity.getMovedData()).getOpposite();
+        Direction dir = Direction.getDirectionFromSide(tileEntity.getMovedData());
         World world = this.renderDispatcher.renderEngine.mc.theWorld;
         if(tileEntity instanceof IMultiblock){
             Multiblock multiblock = ((IMultiblock) tileEntity).getMultiblock();

multipart/src/main/java/sunsetsatellite/catalyst/multipart/block/BlockCarpenterWorkbench.java

@@ -24,6 +24,7 @@ protected TileEntity getNewBlockEntity() {
 		return new TileEntityCarpenterWorkbench();
 	}
 
+	@Override
 	public boolean onBlockRightClicked(World world, int i, int j, int k, EntityPlayer entityplayer, Side side, double xHit, double yHit) {
 		if (world.isClientSide) {
 			return true;

multipart/src/main/java/sunsetsatellite/catalyst/multipart/item/ItemMultipart.java

@@ -1,6 +1,7 @@
 package sunsetsatellite.catalyst.multipart.item;
 
 import com.mojang.nbt.CompoundTag;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.block.BlockFluid;
 import net.minecraft.core.block.entity.TileEntity;
@@ -72,7 +73,7 @@ public Multipart getMultipart(ItemStack itemstack) {
 	public boolean onUseItemOnBlock(ItemStack stack, EntityPlayer player, World world, int blockX, int blockY, int blockZ, Side side, double xPlaced, double yPlaced) {
 		Multipart multipart = getMultipart(stack);
 		if(multipart == null) return false;
-		Pair<Direction, BlockSection> pair = Catalyst.getBlockSurfaceClickPosition(world, player);
+		Pair<Direction, BlockSection> pair = Catalyst.getBlockSurfaceClickPosition(world, player, Minecraft.getMinecraft(this).objectMouseOver);
 		Side playerFacing = Catalyst.calculatePlayerFacing(player.yRot);
 		if (pairIsInvalid(pair)) return false;
 		Direction dir = pair.getRight().toDirection(pair.getLeft(), playerFacing);

src/main/java/sunsetsatellite/catalyst/Catalyst.java

@@ -1,7 +1,7 @@
 package sunsetsatellite.catalyst;
 
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.client.Minecraft;
+import net.minecraft.core.Global;
 import net.minecraft.core.HitResult;
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.data.registry.Registry;
@@ -44,9 +44,8 @@ public static void displayGui(EntityPlayer player, TileEntity tileEntity, String
 		((IMpGui)player).displayCustomGUI(tileEntity, id);
 	}
 
-	public static Pair<Direction,BlockSection> getBlockSurfaceClickPosition(World world, EntityPlayer player){
-		if (!world.isClientSide) {
-			HitResult hit = Minecraft.getMinecraft(Catalyst.class).objectMouseOver;
+	public static Pair<Direction,BlockSection> getBlockSurfaceClickPosition(World world, EntityPlayer player, HitResult hit){
+		if (!Global.isServer) {
 			if(hit.hitType == HitResult.HitType.TILE){
 				Direction dir = Direction.getDirectionFromSide(hit.side.getId());
 				Vec3f vec3f = new Vec3f(hit.location.xCoord,hit.location.yCoord,hit.location.zCoord);

src/main/java/sunsetsatellite/catalyst/core/util/Procedure.java

@@ -1,7 +1,7 @@
 package sunsetsatellite.catalyst.core.util;
 
 /**
- * Represents a function that accepts no arguments and produces no result.
+ * Represents a function that accepts no arguments and produces no result besides side effects.
  *
  * <p>This is a functional interface
  * whose functional method is {@link #run()}.

src/main/java/sunsetsatellite/catalyst/core/util/TickTimer.java

@@ -1,5 +1,8 @@
 package sunsetsatellite.catalyst.core.util;
 
+/**
+ * A timer that calls {@link TickTimer#timeoutMethod} when {@link TickTimer#max} ticks have been counted, can be single-shot or looped.
+ */
 public class TickTimer {
     public Object owner;
     public Procedure timeoutMethod;

src/main/java/sunsetsatellite/catalyst/core/util/VarargsFunction3.java

@@ -0,0 +1,16 @@
+package sunsetsatellite.catalyst.core.util;
+
+/**
+ * Represents a function that accepts 2 arguments + vararg argument and produces a result.
+ *
+ * <p>This is a functional interface
+ * whose functional method is {@link #apply(T,T2,V...)}.
+ */
+@FunctionalInterface
+public interface VarargsFunction3<T,T2,V,R> {
+
+	/**
+	 * Runs the procedure.
+	 */
+	R apply(T t, T2 t2, V... args);
+}

src/main/java/sunsetsatellite/catalyst/core/util/Vec3i.java

@@ -1,6 +1,7 @@
 package sunsetsatellite.catalyst.core.util;
 
 import com.mojang.nbt.CompoundTag;
+import net.minecraft.core.block.Block;
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.util.helper.MathHelper;
 import net.minecraft.core.world.WorldSource;
@@ -226,4 +227,12 @@ public int hashCode() {
 	public TileEntity getTileEntity(WorldSource worldSource){
 		return worldSource.getBlockTileEntity(this.x, this.y, this.z);
 	}
+
+	public Block getBlock(WorldSource worldSource){
+		return worldSource.getBlock(this.x, this.y, this.z);
+	}
+
+	public int getBlockMetadata(WorldSource worldSource){
+		return worldSource.getBlockMetadata(this.x, this.y, this.z);
+	}
 }