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

Shorted the code for clarity

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-05-11 18:16:27 +02:00
parent 58cc3a72e6
commit 3e74756b20
1 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/main/ZCompression.java
View File

@@ -174,64 +174,27 @@ public class ZCompression {
BasicFluid vibraniumFluid = new BasicFluid("vibraniumFluid", 0xFFb6bba8); BasicFluid vibraniumFluid = new BasicFluid("vibraniumFluid", 0xFFb6bba8);
BasicFluid yrdeanFluid = new BasicFluid("yrdeanFluid", 0xFF3e3c6f); BasicFluid yrdeanFluid = new BasicFluid("yrdeanFluid", 0xFF3e3c6f);
registerFluid(arcaniteFluid); registerTinkerFluid("Arcanite", arcaniteFluid, true, 200, 10, 4000);
registerFluid(aardiumFluid); registerTinkerFluid("Aardium", aardiumFluid, true, 200, 10, 4000);
registerFluid(adamantiteFluid); registerTinkerFluid("Adamantite", adamantiteFluid, true, 200, 10, 4000);
registerFluid(axiidianFluid); registerTinkerFluid("Axiidian", axiidianFluid, true, 200, 10, 4000);
registerFluid(bismuthFluid); registerTinkerFluid("Bismuth", bismuthFluid, true, 200, 10, 4000);
registerFluid(eterniteFluid); registerTinkerFluid("Eternite", eterniteFluid, true, 200, 10, 4000);
registerFluid(ignititeFluid); registerTinkerFluid("Ignitite", ignititeFluid, true, 200, 10, 4000);
registerFluid(karmesineFluid); registerTinkerFluid("Karmesine", karmesineFluid, true, 200, 10, 4000);
registerFluid(meteoriteFluid); registerTinkerFluid("Meteorite", meteoriteFluid, true, 200, 10, 4000);
registerFluid(mindoriteFluid); registerTinkerFluid("Mindorite", mindoriteFluid, true, 200, 10, 4000);
registerFluid(mythrilFluid); registerTinkerFluid("Mythril", mythrilFluid, true, 200, 10, 4000);
registerFluid(palladiumFluid); registerTinkerFluid("Palladium", palladiumFluid, true, 200, 10, 4000);
registerFluid(prometheumFluid); registerTinkerFluid("Prometheum", prometheumFluid, true, 200, 10, 4000);
registerFluid(tiberiumFluid); registerTinkerFluid("Tiberium", tiberiumFluid, true, 200, 10, 4000);
registerFluid(vibraniumFluid); registerTinkerFluid("Vibranium", vibraniumFluid, true, 200, 10, 4000);
registerFluid(yrdeanFluid); registerTinkerFluid("Yrdean", yrdeanFluid, true, 200, 10, 4000);
registerTinkerFluid("Arcanite", arcaniteFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Aardium", aardiumFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Adamantite", adamantiteFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Axiidian", axiidianFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Bismuth", bismuthFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Eternite", eterniteFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Ignitite", ignititeFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Karmesine", karmesineFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Meteorite", meteoriteFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Mindorite", mindoriteFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Mythril", mythrilFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Palladium", palladiumFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Prometheum", prometheumFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Tiberium", tiberiumFluid, true);
aardiumFluid.setTemperature(2000).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Vibranium", vibraniumFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerFluid("Yrdean", yrdeanFluid, true);
aardiumFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
// TConstruct Alloys // TConstruct Alloys
BasicFluid fractoryteFluid = new BasicFluid("fractoryteFluid", 0xFF75BFEB); BasicFluid fractoryteFluid = new BasicFluid("fractoryteFluid", 0xFF75BFEB);
registerTinkerFluid("Fractoryte", fractoryteFluid, true, 200, 10, 4000);
registerFluid(fractoryteFluid);
registerTinkerFluid("Fractoryte", fractoryteFluid, true);
fractoryteFluid.setTemperature(200).setLuminosity(10).setViscosity(4000);
registerTinkerAlloys(fractoryteFluid, adamantiteFluid, arcaniteFluid); registerTinkerAlloys(fractoryteFluid, adamantiteFluid, arcaniteFluid);
@@ -250,7 +213,6 @@ public class ZCompression {
@EventHandler @EventHandler
public void postInit(FMLPostInitializationEvent e) { public void postInit(FMLPostInitializationEvent e) {
} }
private void registerOreDict() { private void registerOreDict() {
@@ -295,12 +257,17 @@ public class ZCompression {
FluidRegistry.addBucketForFluid(fluid); FluidRegistry.addBucketForFluid(fluid);
} }
private void registerTinkerFluid(String oreDictSuffix, Fluid fluid, boolean toolForge) { private void registerTinkerFluid(String oreDictSuffix, Fluid fluid, boolean toolForge, int temperature, int lumen, int viscosity) {
FluidRegistry.registerFluid(fluid);
FluidRegistry.addBucketForFluid(fluid);
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
tag.setString("fluid", fluid.getName()); tag.setString("fluid", fluid.getName());
tag.setString("ore", oreDictSuffix); tag.setString("ore", oreDictSuffix);
tag.setBoolean("toolforge", toolForge); tag.setBoolean("toolforge", toolForge);
FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag); FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag);
fluid.setTemperature(temperature).setLuminosity(lumen).setViscosity(viscosity);
} }
private void registerTinkerAlloys(Fluid alloy, Fluid first, Fluid second) { private void registerTinkerAlloys(Fluid alloy, Fluid first, Fluid second) {
@@ -308,9 +275,11 @@ public class ZCompression {
NBTTagCompound fluid = new NBTTagCompound(); NBTTagCompound fluid = new NBTTagCompound();
fluid.setString("FluidName", alloy.getName()); fluid.setString("FluidName", alloy.getName());
fluid.setInteger("Amount", 144); fluid.setInteger("Amount", 144);
tagList.appendTag(fluid);
fluid = new NBTTagCompound(); fluid = new NBTTagCompound();
fluid.setString("FluidName", first.getName()); fluid.setString("FluidName", first.getName());
fluid.setInteger("Amount", 144); fluid.setInteger("Amount", 144);
tagList.appendTag(fluid);
fluid = new NBTTagCompound(); fluid = new NBTTagCompound();
fluid.setString("FluidName", second.getName()); fluid.setString("FluidName", second.getName());
fluid.setInteger("Amount", 288); fluid.setInteger("Amount", 288);