Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

fix for oreDict messup

Browse Source
This commit is contained in:
Giovanni Harting
2016-05-13 18:08:01 +02:00
parent 44445e7ba9
commit c6fa276263
4 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sosnitzka/ztic_addon/Blocks.java
View File

@@ -50,6 +50,7 @@ public class Blocks {
if (block instanceof BasicBlockOre) {
String oreDictName;
String[] nameParts = block.getUnlocalizedName().replace("tile.", "").split("_");
System.out.println();
if (nameParts.length > 2) {
oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));
@@ -58,6 +59,7 @@ public class Blocks {
}
OreDictionary.registerOre("ore" + StringUtils.capitalize(oreDictName), block);
System.out.println(String.format("Registered OreDict: %s", "ore" + StringUtils.capitalize(oreDictName)));
}
} catch (IllegalAccessException e) {
e.printStackTrace();

76
src/main/java/com/sosnitzka/ztic_addon/Fluids.java
View File

@@ -6,43 +6,42 @@ import com.sosnitzka.ztic_addon.util.Utils;
import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field;
import java.util.Arrays;
public class Fluids {
public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite_fluid", 0xFF272354, true, 200, 10, 4000);
public static BasicTinkerFluid aardiumFluid = new BasicTinkerFluid("aardium_fluid", 0xFFC3F93D, true, 200, 10, 4000);
public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite_fluid", 0xFFc45c82, true, 200, 10, 4000);
public static BasicTinkerFluid axiidianFluid = new BasicTinkerFluid("axiidian_fluid", 0xFF77a19a, true, 200, 10, 4000);
public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth_fluid", 0xFF555555, true, 200, 10, 4000);
public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite_fluid", 0xFFfafa98, true, 200, 10, 4000);
public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite_fluid", 0xFFd29453, true, 200, 10, 4000);
public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine_fluid", 0xFFc16d6d, true, 200, 10, 4000);
public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite_fluid", 0xFF6e6a62, true, 200, 10, 4000);
public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite_fluid", 0xFF6bbbbf, true, 200, 10, 4000);
public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril_fluid", 0xFFa8c0ba, true, 200, 10, 4000);
public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium_fluid", 0xFFfe5c05, true, 200, 10, 4000);
public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF2b282f, true, 200, 10, 4000);
public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF86bd5a, true, 200, 10, 4000);
public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFb6bba8, true, 200, 10, 4000);
public static BasicTinkerFluid yrdeanFluid = new BasicTinkerFluid("yrdean_fluid", 0xFF3e3c6f, true, 200, 10, 4000);
public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite", 0xFF272354, true, 200, 10, 4000);
public static BasicTinkerFluid aardiumFluid = new BasicTinkerFluid("aardium", 0xFFC3F93D, true, 200, 10, 4000);
public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite", 0xFFc45c82, true, 200, 10, 4000);
public static BasicTinkerFluid axiidianFluid = new BasicTinkerFluid("axiidian", 0xFF77a19a, true, 200, 10, 4000);
public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth", 0xFF555555, true, 200, 10, 4000);
public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite", 0xFFfafa98, true, 200, 10, 4000);
public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFd29453, true, 200, 10, 4000);
public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine", 0xFFc16d6d, true, 200, 10, 4000);
public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite", 0xFF6e6a62, true, 200, 10, 4000);
public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite", 0xFF6bbbbf, true, 200, 10, 4000);
public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril", 0xFFa8c0ba, true, 200, 10, 4000);
public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium", 0xFFfe5c05, true, 200, 10, 4000);
public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum", 0xFF2b282f, true, 200, 10, 4000);
public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF86bd5a, true, 200, 10, 4000);
public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFb6bba8, true, 200, 10, 4000);
public static BasicTinkerFluid yrdeanFluid = new BasicTinkerFluid("yrdean", 0xFF3e3c6f, true, 200, 10, 4000);
public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium_fluid", 0xFF7a3b74, true, 200, 10, 4000);
public static BasicTinkerFluid instableNitroniteFluid = new BasicTinkerFluid("instableNitronite_fluid", 0xFF659933, true, 200, 10, 4000);
public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum_fluid", 0xFF416565, true, 200, 10, 4000);
public static BasicTinkerFluid instablePolyniumFluid = new BasicTinkerFluid("instablePolynium_fluid", 0xFF6c6aa3, true, 200, 10, 4000);
public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite_fluid", 0xFF339966, true, 200, 10, 4000);
public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen_fluid", 0xFF9f8a4a, true, 200, 10, 4000);
public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte_fluid", 0xFFb44a14, true, 200, 10, 4000);
public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium_fluid", 0xFF46131D, true, 200, 10, 4000);
public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite_fluid", 0xFFa6b27a, true, 200, 10, 4000);
public static BasicTinkerFluid instablePrysociteFluid = new BasicTinkerFluid("instablePrysocite_fluid", 0xFFbde398, true, 200, 10, 4000);
public static BasicTinkerFluid blazingXylititeFluid = new BasicTinkerFluid("blazingXylitite_fluid", 0xFFffc81d, true, 200, 10, 4000);
public static BasicTinkerFluid instableDyoniteFluid = new BasicTinkerFluid("instableDyonite_fluid", 0xFFff6743, true, 200, 10, 4000);
public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite_fluid", 0xFFfff69b, true, 200, 10, 4000);
public static BasicTinkerFluid radiantPliniumFluid = new BasicTinkerFluid("radiantPlinium_fluid", 0xFFc1ff68, true, 200, 10, 4000);
public static BasicTinkerFluid dysprosaniumFluid = new BasicTinkerFluid("dysprosanium_fluid", 0xFFb7a2bd, true, 200, 10, 4000);
public static BasicTinkerFluid refractiveBysmuidFluid = new BasicTinkerFluid("refractiveBysmuid_fluid", 0xFF7b97b0, true, 200, 10, 4000);
public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 200, 10, 4000);
public static BasicTinkerFluid instableNitroniteFluid = new BasicTinkerFluid("instable_nitronite", 0xFF659933, true, 200, 10, 4000);
public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF416565, true, 200, 10, 4000);
public static BasicTinkerFluid instablePolyniumFluid = new BasicTinkerFluid("instable_polynium", 0xFF6c6aa3, true, 200, 10, 4000);
public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFF339966, true, 200, 10, 4000);
public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen", 0xFF9f8a4a, true, 200, 10, 4000);
public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFFb44a14, true, 200, 10, 4000);
public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium", 0xFF46131D, true, 200, 10, 4000);
public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite", 0xFFa6b27a, true, 200, 10, 4000);
public static BasicTinkerFluid instablePrysociteFluid = new BasicTinkerFluid("instable_prysocite", 0xFFbde398, true, 200, 10, 4000);
public static BasicTinkerFluid blazingXylititeFluid = new BasicTinkerFluid("blazing_xylitite", 0xFFffc81d, true, 200, 10, 4000);
public static BasicTinkerFluid instableDyoniteFluid = new BasicTinkerFluid("instable_dyonite", 0xFFff6743, true, 200, 10, 4000);
public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFfff69b, true, 200, 10, 4000);
public static BasicTinkerFluid radiantPliniumFluid = new BasicTinkerFluid("radiant_plinium", 0xFFc1ff68, true, 200, 10, 4000);
public static BasicTinkerFluid dysprosaniumFluid = new BasicTinkerFluid("dysprosanium", 0xFFb7a2bd, true, 200, 10, 4000);
public static BasicTinkerFluid refractiveBysmuidFluid = new BasicTinkerFluid("refractive_bysmuid", 0xFF7b97b0, true, 200, 10, 4000);
static void register() {
@@ -53,16 +52,7 @@ public class Fluids {
try {
BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType);
String oreDictName;
String[] nameParts = fluid.getName().split("_");
if (nameParts.length > 2) {
oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));
} else {
oreDictName = nameParts[0];
}
Utils.registerTinkerFluid("fluid" + StringUtils.capitalize(oreDictName), fluid, fluid.isToolForge());
Utils.registerTinkerFluid(StringUtils.capitalize(fluid.getName()), fluid, fluid.isToolForge());
} catch (IllegalAccessException e) {
e.printStackTrace();
}

2
src/main/java/com/sosnitzka/ztic_addon/Items.java
View File

@@ -65,7 +65,6 @@ public class Items {
Class<?> targetType = field.getType();
try {
Item item = (Item) field.get(targetType);
GameRegistry.register(item);
if (item instanceof BasicItem) {
@@ -80,6 +79,7 @@ public class Items {
}
OreDictionary.registerOre("ingot" + StringUtils.capitalize(oreDictName), item);
System.out.println(String.format("Registered OreDict: %s", "ingot" + StringUtils.capitalize(oreDictName)));
}
}
} catch (IllegalAccessException e) {

2
src/main/java/com/sosnitzka/ztic_addon/Materials.java
View File

@@ -37,5 +37,5 @@ public class Materials {
public static Material ultranite = new Material("ultranite", TextFormatting.AQUA);
public static Material radiantPlinium = new Material("radiantPlinium", TextFormatting.AQUA);
public static Material dysprosanium = new Material("dysprosanium", TextFormatting.AQUA);
public static Material refractiveBysmuid = new Material("refractiveBysmuidFluid", TextFormatting.AQUA);
public static Material refractiveBysmuid = new Material("refractiveBysmuid", TextFormatting.AQUA);
}