diff options
| author | Giovanni Harting <539@idlegandalf.com> | 2016-12-25 23:16:58 +0100 |
|---|---|---|
| committer | Giovanni Harting <539@idlegandalf.com> | 2016-12-25 23:16:58 +0100 |
| commit | ac15fd9da155fd8191259846155296884b64c2c3 (patch) | |
| tree | d77d3cf5560ba59e084755e6540831a715026c64 | |
| parent | 176e39f5e6a8b5c7cf0e551199bc159c70f68a5d (diff) | |
first progress on book integration, need to introduce a custom json structure
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/TAIGA.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java | 3 | ||||
| -rw-r--r-- | src/main/resources/assets/taiga/book/en_US/intro/welcome.json | 8 | ||||
| -rw-r--r-- | src/main/resources/assets/taiga/book/en_US/language.lang | 1 | ||||
| -rw-r--r-- | src/main/resources/assets/taiga/book/index.json | 9 | ||||
| -rw-r--r-- | src/main/resources/assets/taiga/book/sections/intro.json | 7 | ||||
| -rw-r--r-- | src/main/resources/assets/taiga/textures/gui/book/logo.png | bin | 0 -> 57158 bytes |
8 files changed, 36 insertions, 2 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index af10d77..c8c0bfb 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -70,6 +70,7 @@ public class TAIGA { @EventHandler public void postInit(FMLPostInitializationEvent e) { + proxy.registerBookPages(); } @EventHandler @@ -124,7 +125,5 @@ public class TAIGA { integrateOre("Karmesine", karmesineFluid); integrateOre("Ovium", oviumFluid); integrateOre("Jauxum", jauxumFluid); - - } }
\ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java index 8c024b5..75ff267 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fluids.Fluid; +import slimeknights.mantle.client.book.repository.FileRepository; +import slimeknights.tconstruct.library.book.TinkerBook; import slimeknights.tconstruct.library.client.MaterialRenderInfo; import slimeknights.tconstruct.library.client.texture.MetalTextureTexture; import slimeknights.tconstruct.library.materials.Material; @@ -122,6 +124,11 @@ public class ClientProxy extends CommonProxy { TAIGAConfiguration.clientPreInit(); } + @Override + public void registerBookPages() { + TinkerBook.INSTANCE.addRepository(new FileRepository("taiga:book")); + } + public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition { public final Fluid fluid; diff --git a/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java index c340408..0ae4808 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java @@ -24,4 +24,7 @@ public class CommonProxy { public void registerServerCommands(FMLServerStartingEvent e) { } + + public void registerBookPages() { + } } diff --git a/src/main/resources/assets/taiga/book/en_US/intro/welcome.json b/src/main/resources/assets/taiga/book/en_US/intro/welcome.json new file mode 100644 index 0000000..31907d1 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/intro/welcome.json @@ -0,0 +1,8 @@ +{ + "title": "TEST Title", + "text": [ + { + "text": "Test text." + } + ] +}
\ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/language.lang b/src/main/resources/assets/taiga/book/en_US/language.lang new file mode 100644 index 0000000..6a632b8 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/language.lang @@ -0,0 +1 @@ +index_title=TAIGA
\ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/index.json b/src/main/resources/assets/taiga/book/index.json new file mode 100644 index 0000000..2990b81 --- /dev/null +++ b/src/main/resources/assets/taiga/book/index.json @@ -0,0 +1,9 @@ +[ + { + "name": "index_title", + "data": "sections/intro.json", + "icon": { + "file": "taiga:textures/gui/book/logo.png" + } + } +]
\ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/sections/intro.json b/src/main/resources/assets/taiga/book/sections/intro.json new file mode 100644 index 0000000..276837e --- /dev/null +++ b/src/main/resources/assets/taiga/book/sections/intro.json @@ -0,0 +1,7 @@ +[ + { + "name": "welcome", + "type": "text", + "data": "intro/welcome.json" + } +]
\ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/gui/book/logo.png b/src/main/resources/assets/taiga/textures/gui/book/logo.png Binary files differnew file mode 100644 index 0000000..3ab7aaa --- /dev/null +++ b/src/main/resources/assets/taiga/textures/gui/book/logo.png |
