From 2d10d92c25c9af76fbcb032d97ad514a552fba55 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sat, 21 May 2016 02:07:38 +0200 Subject: [PATCH] Added some additional liquids for alloy casting (not working actually) --- src/main/java/com/sosnitzka/ztic_addon/Fluids.java | 10 ++++++++++ src/main/java/com/sosnitzka/ztic_addon/Materials.java | 4 ++-- src/main/java/com/sosnitzka/ztic_addon/util/Utils.java | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java index 26d45b4..4c483c2 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java @@ -43,6 +43,16 @@ public class Fluids { public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb6af74, true, 200, 10, 4000); public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 200, 10, 4000); + // Additional Fluid without traits / materials + public static BasicTinkerFluid endstoneFluid = new BasicTinkerFluid("endstone", 0xFFdddd22, false, 800, 10, 2500); + public static BasicTinkerFluid enderFluid = new BasicTinkerFluid("ender", 0xFF227777, false, 600, 5, 1000); + public static BasicTinkerFluid nitroFluid = new BasicTinkerFluid("nitro", 0xBBBBBB, false, 300, 2, 5000); + public static BasicTinkerFluid obsidianFluid = new BasicTinkerFluid("obsidian", 0xFF660044, false, 1200, 3, 5000); + public static BasicTinkerFluid redstoneFluid = new BasicTinkerFluid("redstone", 0xFFFF0000, false, 350, 3, 900); + public static BasicTinkerFluid glowstoneFluid = new BasicTinkerFluid("glowstone", 0xFFEEEE00, false, 400, 10, 1000); + public static BasicTinkerFluid lapisFluid = new BasicTinkerFluid("lapis", 0xFF1005FF, false, 400, 2, 1000); + public static BasicTinkerFluid netherFluid = new BasicTinkerFluid("nether", 0xFF881111, false, 900, 5, 1500); + static void register() { Field[] declaredFields = Fluids.class.getDeclaredFields(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Materials.java b/src/main/java/com/sosnitzka/ztic_addon/Materials.java index 1ca63e3..82dc1b5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Materials.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Materials.java @@ -26,12 +26,12 @@ public class Materials { public static Material mythril = new Material("mythril", TextFormatting.AQUA); public static Material astrium = new Material("astrium", TextFormatting.LIGHT_PURPLE); - public static Material nitronite = new Material("nitronite", TextFormatting.LIGHT_PURPLE); + public static Material nitronite = new Material("nitronite", TextFormatting.LIGHT_PURPLE).addTrait(instable, HeadMaterialStats.TYPE); public static Material proxideum = new Material("proxideum", TextFormatting.LIGHT_PURPLE); public static Material noctunyx = new Material("noctunyx", TextFormatting.LIGHT_PURPLE); public static Material imperomite = new Material("imperomite", TextFormatting.DARK_GREEN); public static Material cryptogen = new Material("cryptogen", TextFormatting.DARK_GREEN); - public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED).addTrait(instable, HeadMaterialStats.TYPE); + public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED); public static Material seismodium = new Material("seismodium", TextFormatting.DARK_GREEN); public static Material terramite = new Material("terramite", TextFormatting.GRAY); public static Material lumixyl = new Material("lumixyl", TextFormatting.GRAY); diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java b/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java index 408fdb5..d958282 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java +++ b/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java @@ -16,6 +16,7 @@ public class Utils { public static String PREFIX_ORE = "ore"; public static String PREFIX_BLOCK = "block"; + public static void registerBlockWithItem(Block block) { System.out.println(String.format("Register Block: %s", block.getUnlocalizedName())); GameRegistry.register(block);