summaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-05-27 16:10:46 +0200
committerGiovanni Harting <539@idlegandalf.com>2016-05-27 16:10:46 +0200
commita0666590daacad496f9532dcb256bdf0b2a8b00f (patch)
tree470515de562132c6f824a6f47a5229c28594f889 /src/main/java/com
parentc6d90c67f350b6f85e05a86233f5fe71badf7582 (diff)
Squashed commit of the following:
commit 73a56e617debf4e47665ab454f443820b3b00c66 Author: Giovanni Harting <539@idlegandalf.com> Date: Fri May 27 16:07:58 2016 +0200 removed IMCs because there are not needed anymore commit 7e241adc9384d0b23e3178b5e0367b7b9130a081 Author: Giovanni Harting <539@idlegandalf.com> Date: Fri May 27 13:54:03 2016 +0200 updated mappings to stable_24 added a updated tinker (mappings)
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/Fluids.java5
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/ZTiC.java5
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/util/Utils.java12
3 files changed, 4 insertions, 18 deletions
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
index 5922bd9..01a124c 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
@@ -2,14 +2,13 @@ package com.sosnitzka.ztic_addon;
import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid;
-import com.sosnitzka.ztic_addon.util.Utils;
import net.minecraft.init.Blocks;
import net.minecraftforge.fluids.FluidRegistry;
-import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field;
import static com.sosnitzka.ztic_addon.Items.*;
+import static com.sosnitzka.ztic_addon.util.Utils.registerFluid;
import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting;
public class Fluids {
@@ -67,7 +66,7 @@ public class Fluids {
try {
BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType);
- Utils.registerTinkerFluid(StringUtils.capitalize(fluid.getName()), fluid, fluid.isToolForge());
+ registerFluid(fluid);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
index 7c8765c..c85ed8c 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
@@ -21,7 +21,6 @@ import slimeknights.tconstruct.library.TinkerRegistry;
import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
import slimeknights.tconstruct.library.materials.HandleMaterialStats;
import slimeknights.tconstruct.library.materials.HeadMaterialStats;
-import slimeknights.tconstruct.library.materials.Material;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.tools.TinkerMaterials;
@@ -93,8 +92,6 @@ public class ZTiC {
registerTinkerMaterial("Terramite", terramite, terramiteFluid, 419, 7.25f, 2.85f, 1.03f, 208, 150, TITANITE, false, true);
registerTinkerMaterial("Cryptogen", cryptogen, cryptogenFluid, 504, 5.71f, 6.93f, 0.88f, 58, 117, METEORITE, false, true);
registerTinkerMaterial("Proxideum", proxideum, proxideumFluid, 535, 10.55f, 4.21f, 0.99f, -60, 200, METEORITE, false, true);
-
-
}
@EventHandler
@@ -126,10 +123,12 @@ public class ZTiC {
TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura));
TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra));
material.setFluid(fluid).setCraftable(craft).setCastable(cast);
+ /*
if (material.isCraftable()) {
material.addItem(Blocks.tiberiumBlock, Material.VALUE_Block);
material.setRepresentativeItem(Blocks.tiberiumBlock);
}
+ */
proxy.setRenderInfo(material, fluid);
MaterialIntegration integration = new MaterialIntegration(material, fluid, oreSuffix);
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 70c9964..2ae7c3d 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java
@@ -24,18 +24,6 @@ public class Utils {
System.out.println(String.format("Registered: %s", block));
}
-
- public static void registerTinkerFluid(String oreDictSuffix, Fluid fluid, boolean toolForge) {
- System.out.println(String.format("Register TinkerFluid with oreDictSuffix: %s", oreDictSuffix));
- registerFluid(fluid);
-
- NBTTagCompound tag = new NBTTagCompound();
- tag.setString("fluid", fluid.getName());
- tag.setString("ore", oreDictSuffix);
- tag.setBoolean("toolforge", toolForge);
- FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag);
- }
-
public static void registerFluid(Fluid fluid) {
FluidRegistry.registerFluid(fluid);
FluidRegistry.addBucketForFluid(fluid);