From 39976d13194c52a916b3207c5aafce145306c7bf Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Mon, 9 Jan 2017 22:16:01 +0100 Subject: [PATCH] Moved tinker page to client to prevent for server crash --- src/main/java/com/sosnitzka/taiga/TAIGA.java | 2 +- src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index b7ae9ea..f1d4354 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -69,7 +69,7 @@ public class TAIGA { m.integrateRecipes(); } - registerPageType("taigaore", ContentOre.class); + } @EventHandler diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java index b2d03be..47bb968 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java @@ -4,6 +4,7 @@ import com.sosnitzka.taiga.Blocks; import com.sosnitzka.taiga.Items; import com.sosnitzka.taiga.TAIGA; import com.sosnitzka.taiga.TAIGAConfiguration; +import com.sosnitzka.taiga.book.ContentOre; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -27,6 +28,7 @@ import java.lang.reflect.Field; import static com.sosnitzka.taiga.Fluids.*; import static com.sosnitzka.taiga.MaterialTraits.*; +import static slimeknights.mantle.client.book.BookLoader.registerPageType; @SuppressWarnings("unused") public class ClientProxy extends CommonProxy { @@ -127,7 +129,9 @@ public class ClientProxy extends CommonProxy { @Override public void registerBookPages() { + TinkerBook.INSTANCE.addRepository(new FileRepository("taiga:book")); + registerPageType("taigaore", ContentOre.class); } public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition {