From eabc1ffe8c81b57d07e3a1ef7fb07b646f032e96 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sat, 24 Dec 2016 13:39:55 +0100 Subject: [PATCH] Added missing json files, fixed some coloring and spelling issues --- src/main/java/com/sosnitzka/taiga/Fluids.java | 2 +- src/main/java/com/sosnitzka/taiga/MaterialTraits.java | 2 +- src/main/java/com/sosnitzka/taiga/TAIGA.java | 8 ++++---- .../resources/assets/taiga/blockstates/fluid_block.json | 7 ------- src/main/resources/assets/taiga/lang/en_US.lang | 4 ++-- .../resources/assets/taiga/models/item/jauxum_dust.json | 6 ++++++ .../resources/assets/taiga/models/item/jauxum_ingot.json | 6 ++++++ .../resources/assets/taiga/models/item/jauxum_nugget.json | 6 ++++++ .../resources/assets/taiga/models/item/ovium_dust.json | 6 ++++++ .../resources/assets/taiga/models/item/ovium_ingot.json | 6 ++++++ .../resources/assets/taiga/models/item/ovium_nugget.json | 6 ++++++ .../resources/assets/taiga/models/item/terrax_dust.json | 6 ++++++ .../resources/assets/taiga/models/item/terrax_ingot.json | 6 ++++++ .../resources/assets/taiga/models/item/terrax_nugget.json | 6 ++++++ 14 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/taiga/models/item/jauxum_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/jauxum_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/jauxum_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/ovium_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/ovium_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/ovium_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/terrax_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/terrax_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/terrax_nugget.json diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index 90219ad..444d8a1 100644 --- a/src/main/java/com/sosnitzka/taiga/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -16,7 +16,7 @@ public class Fluids { public static BasicTinkerFluid basaltFluid = new BasicTinkerFluid("basalt_fluid", 0xFFe4ddc3, 550, 10, 6000); public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000); public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000); - public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF271c29, 850, 10, 10000); + public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF372c49, 850, 10, 10000); public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 1400, 10, 10000); public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1915, 10, 10000); public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 3050, 10, 10000); diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 4fd2be9..bc1a72a 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -84,7 +84,7 @@ public class MaterialTraits { public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE); public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow); public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(pulverizing).addTrait(superheavy); - public static Material nihilite = new Material("nihilite", TextFormatting.BLACK).addTrait(souleater); + public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater); /** * With Dev **/ diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index c918c6d..af10d77 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -5,6 +5,7 @@ import com.sosnitzka.taiga.proxy.CommonProxy; import com.sosnitzka.taiga.recipes.CraftingRegistry; import com.sosnitzka.taiga.recipes.SmeltingRegistry; import com.sosnitzka.taiga.world.WorldGen; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.SidedProxy; @@ -15,7 +16,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import slimeknights.tconstruct.library.MaterialIntegration; import slimeknights.tconstruct.library.materials.BowMaterialStats; -import slimeknights.tconstruct.tools.TinkerMaterials; import java.util.List; @@ -58,9 +58,9 @@ public class TAIGA { CraftingRegistry.register(); // Registers crafting recipes // Adds new harvest levels' names - harvestLevelNames.put(DURANITE, TinkerMaterials.bone.getTextColor() + "Duranite"); - harvestLevelNames.put(VALYRIUM, TinkerMaterials.bone.getTextColor() + "Valyrium"); - harvestLevelNames.put(VIBRANIUM, TinkerMaterials.blueslime.getTextColor() + "Vibranium"); + harvestLevelNames.put(DURANITE, TextFormatting.DARK_GREEN + "Duranite"); + harvestLevelNames.put(VALYRIUM, TextFormatting.GOLD + "Valyrium"); + harvestLevelNames.put(VIBRANIUM, TextFormatting.DARK_PURPLE + "Vibranium"); for (MaterialIntegration m : integrateList) { diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index 8ea98d9..475cd6f 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -144,13 +144,6 @@ } } ], - "tiberiumX_fluid": [ - { - "custom": { - "fluid": "tiberiumX_fluid" - } - } - ], "fractum_fluid": [ { "custom": { diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 5c1eba5..42636a2 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -313,13 +313,13 @@ modifier.heroic.desc=§oUntil you'll die.§r\nWhen the end is near, you grow str modifier.hollow.name=Hollow modifier.hollow.desc=§oBraindead!§r\nMakes your enemies brainless. modifier.instable.name=Unstable -modifier.instable.desc=§oCan you feel this?§r\nSeriously, this ist completely unstable! Expect explosions! +modifier.instable.desc=§oCan you feel this?§r\nSeriously, this is completely unstable! Expect explosions! modifier.naturebound.name=Naturebound modifier.naturebound.desc=§oYou are one with your surrounding!§r\nRepairs the tool on several blocks. modifier.pulverizing.name=Pulverizing modifier.pulverizing.desc=§oSmash it!§r\nDestroy a lot of your drops. modifier.resonance.name=Resonance -modifier.resonance.desc=§oFeel the vibrations!§r\Enemies propably fly away after a hit! +modifier.resonance.desc=§oFeel the vibrations!§r\nEnemies propably fly away after a hit! modifier.slaughtering.name=Slaughtering modifier.slaughtering.desc=§oYum yum!§r\nWho needs EXP if you can have a lot more meat? modifier.softy.name=Softy diff --git a/src/main/resources/assets/taiga/models/item/jauxum_dust.json b/src/main/resources/assets/taiga/models/item/jauxum_dust.json new file mode 100644 index 0000000..2b3cf34 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/jauxum_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/jauxum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/jauxum_ingot.json b/src/main/resources/assets/taiga/models/item/jauxum_ingot.json new file mode 100644 index 0000000..b6fcb4f --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/jauxum_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/jauxum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/jauxum_nugget.json b/src/main/resources/assets/taiga/models/item/jauxum_nugget.json new file mode 100644 index 0000000..ff21b99 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/jauxum_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/jauxum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ovium_dust.json b/src/main/resources/assets/taiga/models/item/ovium_dust.json new file mode 100644 index 0000000..1db4511 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/ovium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/ovium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ovium_ingot.json b/src/main/resources/assets/taiga/models/item/ovium_ingot.json new file mode 100644 index 0000000..ccad8f3 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/ovium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/ovium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/ovium_nugget.json b/src/main/resources/assets/taiga/models/item/ovium_nugget.json new file mode 100644 index 0000000..85a9edb --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/ovium_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/ovium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/terrax_dust.json b/src/main/resources/assets/taiga/models/item/terrax_dust.json new file mode 100644 index 0000000..2675ed5 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/terrax_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/terrax" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/terrax_ingot.json b/src/main/resources/assets/taiga/models/item/terrax_ingot.json new file mode 100644 index 0000000..795c4d4 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/terrax_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/terrax" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/terrax_nugget.json b/src/main/resources/assets/taiga/models/item/terrax_nugget.json new file mode 100644 index 0000000..e15ce06 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/terrax_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/terrax" + } +} \ No newline at end of file