From 44445e7ba943e0f07295f6b2ddc8f52e173d80c4 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Fri, 13 May 2016 17:39:37 +0200
Subject: [PATCH] workaround for unlocalized names

---
 src/main/java/com/sosnitzka/ztic_addon/Blocks.java | 2 +-
 src/main/java/com/sosnitzka/ztic_addon/Fluids.java | 4 ++--
 src/main/java/com/sosnitzka/ztic_addon/Items.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
index 332920d..26dcfaf 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
@@ -49,7 +49,7 @@ public class Blocks {
 
                     if (block instanceof BasicBlockOre) {
                         String oreDictName;
-                        String[] nameParts = block.getUnlocalizedName().split("_");
+                        String[] nameParts = block.getUnlocalizedName().replace("tile.", "").split("_");
 
                         if (nameParts.length > 2) {
                             oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
index b96c4ab..6847d61 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
@@ -54,7 +54,7 @@ public class Fluids {
                     BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType);
 
                     String oreDictName;
-                    String[] nameParts = fluid.getUnlocalizedName().split("_");
+                    String[] nameParts = fluid.getName().split("_");
 
                     if (nameParts.length > 2) {
                         oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));
@@ -62,7 +62,7 @@ public class Fluids {
                         oreDictName = nameParts[0];
                     }
 
-                    Utils.registerTinkerFluid("fluid" + StringUtils.capitalize(nameParts[0]), fluid, fluid.isToolForge());
+                    Utils.registerTinkerFluid("fluid" + StringUtils.capitalize(oreDictName), fluid, fluid.isToolForge());
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java
index d6f9966..e608ffa 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Items.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Items.java
@@ -71,7 +71,7 @@ public class Items {
                     if (item instanceof BasicItem) {
                         if (((BasicItem) item).isOreDict()) {
                             String oreDictName;
-                            String[] nameParts = item.getUnlocalizedName().split("_");
+                            String[] nameParts = item.getUnlocalizedName().replace("item.", "").split("_");
 
                             if (nameParts.length > 2) {
                                 oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));