summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/com/sosnitzka/ztic_addon/Fluids.java18
-rw-r--r--src/main/resources/assets/ztic_addon/blockstates/fluid_block.json29
2 files changed, 30 insertions, 17 deletions
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
index cde3713..38e72fd 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
@@ -3,14 +3,12 @@ package com.sosnitzka.ztic_addon;
import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid;
import net.minecraft.init.Blocks;
-import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
-import slimeknights.tconstruct.library.Util;
-import slimeknights.tconstruct.library.fluid.FluidMolten;
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 +65,6 @@ public class Fluids {
Class<?> targetType = field.getType();
try {
BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType);
-
registerFluid(fluid);
} catch (IllegalAccessException e) {
e.printStackTrace();
@@ -88,17 +85,4 @@ public class Fluids {
registerMelting(Blocks.NETHERRACK, FluidRegistry.LAVA, 48);
registerMelting(Blocks.STONE, FluidRegistry.LAVA, 144);
}
-
-
- private static FluidMolten fluidMetal(String name, int color) {
- FluidMolten fluid = new FluidMolten(name, color);
- return registerFluid(fluid);
- }
-
- protected static <T extends Fluid> T registerFluid(T fluid) {
- fluid.setUnlocalizedName(Util.prefix(fluid.getName()));
- FluidRegistry.registerFluid(fluid);
-
- return fluid;
- }
}
diff --git a/src/main/resources/assets/ztic_addon/blockstates/fluid_block.json b/src/main/resources/assets/ztic_addon/blockstates/fluid_block.json
new file mode 100644
index 0000000..2edf31e
--- /dev/null
+++ b/src/main/resources/assets/ztic_addon/blockstates/fluid_block.json
@@ -0,0 +1,29 @@
+{
+ "forge_marker": 1,
+ "defaults": {
+ "model": "forge:fluid"
+ },
+ "variants": {
+ "arcanite": [
+ {
+ "custom": {
+ "fluid": "arcanite"
+ }
+ }
+ ],
+ "titanite": [
+ {
+ "custom": {
+ "fluid": "titanite"
+ }
+ }
+ ],
+ "dyonite": [
+ {
+ "custom": {
+ "fluid": "dyonite"
+ }
+ }
+ ]
+ }
+} \ No newline at end of file