From 4db215fc654f390313198e02cc1579728d2aca0c Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Thu, 12 Jan 2017 22:57:48 +0100 Subject: Finished creation of book pages for Ores. Other pages will come (e.g. about fuels / temperatures). Added german translation. --- src/main/java/com/sosnitzka/taiga/Alloys.java | 1 + src/main/java/com/sosnitzka/taiga/Fluids.java | 2 +- src/main/java/com/sosnitzka/taiga/MaterialTraits.java | 1 + src/main/java/com/sosnitzka/taiga/TAIGA.java | 7 +------ src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java | 2 +- src/main/java/com/sosnitzka/taiga/book/ContentOre.java | 1 - 6 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/sosnitzka/taiga/Alloys.java b/src/main/java/com/sosnitzka/taiga/Alloys.java index 75b46b1..a47c8a3 100644 --- a/src/main/java/com/sosnitzka/taiga/Alloys.java +++ b/src/main/java/com/sosnitzka/taiga/Alloys.java @@ -15,6 +15,7 @@ public class Alloys { public static void register() { registerTinkerAlloy(new FluidStack(terraxFluid, 2), new FluidStack(karmesineFluid, 1), new FluidStack(oviumFluid, 1), new FluidStack(jauxumFluid, 1)); registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(basaltFluid, 1)); + registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(dilithiumFluid, 2)); registerTinkerAlloy(new FluidStack(fractumFluid, 2), new FluidStack(triberiumFluid, 3), new FluidStack(TinkerFluids.obsidian, 3), new FluidStack(abyssumFluid, 1)); registerTinkerAlloy(new FluidStack(violiumFluid, 2), new FluidStack(auroriumFluid, 3), new FluidStack(TinkerFluids.ardite, 2)); registerTinkerAlloy(new FluidStack(proxiiFluid, 3), new FluidStack(prometheumFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(eezoFluid, 1)); diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index 2d62a77..5f8f7e7 100644 --- a/src/main/java/com/sosnitzka/taiga/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -54,7 +54,7 @@ public class Fluids { // Community - public static BasicTinkerFluid dilithiumFluid = new BasicTinkerFluid("dilithium_fluid", 0xEEEEEEEE, 2500, 10, 5000); + public static BasicTinkerFluid dilithiumFluid = new BasicTinkerFluid("dilithium_fluid", 0xFF79aea6, 1500, 10, 5000); /** * Registers all materials' fluids
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index bb1e57a..d98d950 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -108,5 +108,6 @@ public class MaterialTraits { public static Material ovium = new Material("ovium", TextFormatting.BLUE); public static Material jauxum = new Material("jauxum", TextFormatting.YELLOW); public static Material karmesine = new Material("karmesine", TextFormatting.RED); + public static Material dilithium = new Material("dilithium", TextFormatting.BLUE); } diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index f1d4354..212bbb2 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -1,7 +1,6 @@ package com.sosnitzka.taiga; import com.google.common.collect.Lists; -import com.sosnitzka.taiga.book.ContentOre; import com.sosnitzka.taiga.proxy.CommonProxy; import com.sosnitzka.taiga.recipes.CraftingRegistry; import com.sosnitzka.taiga.recipes.SmeltingRegistry; @@ -24,7 +23,6 @@ import static com.sosnitzka.taiga.Fluids.*; import static com.sosnitzka.taiga.MaterialTraits.*; import static com.sosnitzka.taiga.util.Utils.integrateMaterial; import static com.sosnitzka.taiga.util.Utils.integrateOre; -import static slimeknights.mantle.client.book.BookLoader.registerPageType; import static slimeknights.tconstruct.library.utils.HarvestLevels.*; @Mod(modid = TAIGA.MODID, version = TAIGA.VERSION, guiFactory = TAIGA.GUIFACTORY, dependencies = "required-after:tconstruct@[1.10.2-2.5.0,);" + "required-after:mantle@[1.10.2-1.0.0,)") @@ -119,10 +117,7 @@ public class TAIGA { integrateMaterial("Yrdeen", yrdeen, yrdeenFluid, 999, 9.1f, 3f, 1.35f, 150, 250, COBALT, shitty); integrateMaterial("Meteorite", meteorite, meteoriteFluid, 1500, 1.5f, 1.5f, .5f, 0, 0, OBSIDIAN, shitty); integrateMaterial("Obsidiorite", obsidiorite, obsidioriteFluid, 1500, .5f, .5f, 1, -100, 100, COBALT, shitty); - // when more traits / ideas are available - // integrateMaterial("Uru", uru, uruFluid, (552), 8.75f, 2.87f, 0.98f, -100, 200, DIAMOND); - // integrateMaterial("Osram", osram, osramFluid, 500, 5f, 3f, 0.8f, -50, 50, DIAMOND); - // integrateMaterial("Abyssum", abyssum, abyssumFluid, 100, 1f, 1f, 1f, 300, 300, DIAMOND); + integrateOre("Osram", osramFluid); integrateOre("Abyssum", abyssumFluid); integrateOre("Iox", ioxFluid); diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index e53f73e..60f826b 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -99,7 +99,7 @@ public class TAIGAConfiguration { final int DILITHIUM_DEFAULT = 12; final int OSRAM_DEFAULT = 1; final int DURANITE_DEFAULT = 1; - final int BASALT_DEFAULT = 10; + final int BASALT_DEFAULT = 12; final int EEZO_DEFAULT = 3; final int KARMESINE_DEFAULT = 8; final int JAUXUM_DEFAULT = 8; diff --git a/src/main/java/com/sosnitzka/taiga/book/ContentOre.java b/src/main/java/com/sosnitzka/taiga/book/ContentOre.java index ec88a92..10f5728 100644 --- a/src/main/java/com/sosnitzka/taiga/book/ContentOre.java +++ b/src/main/java/com/sosnitzka/taiga/book/ContentOre.java @@ -36,7 +36,6 @@ public class ContentOre extends TinkerPage { TextData tdTitle = new TextData(title); tdTitle.underlined = true; - addTitle(list, CustomFontColor.encodeColor(r, g, b) + title, true); if (input != null && !input.id.equals("")) { -- cgit v1.2.3