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

Fixed missing and wrong positioned names

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-07-16 12:52:46 +02:00
parent 615d8a4714
commit 83621749ab
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,14 +3,12 @@ package com.sosnitzka.ztic_addon;
import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid; import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;
import slimeknights.tconstruct.library.Util;
import slimeknights.tconstruct.library.fluid.FluidMolten;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import static com.sosnitzka.ztic_addon.Items.*; import static com.sosnitzka.ztic_addon.Items.*;
import static com.sosnitzka.ztic_addon.util.Utils.registerFluid;
import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting; import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting;
public class Fluids { public class Fluids {
@@ -67,7 +65,6 @@ public class Fluids {
Class<?> targetType = field.getType(); Class<?> targetType = field.getType();
try { try {
BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType); BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType);
registerFluid(fluid); registerFluid(fluid);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
@@ -88,17 +85,4 @@ public class Fluids {
registerMelting(Blocks.NETHERRACK, FluidRegistry.LAVA, 48); registerMelting(Blocks.NETHERRACK, FluidRegistry.LAVA, 48);
registerMelting(Blocks.STONE, FluidRegistry.LAVA, 144); 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;
}
} }

29
src/main/resources/assets/ztic_addon/blockstates/fluid_block.json Normal file
View File

@@ -0,0 +1,29 @@
{
"forge_marker": 1,
"defaults": {
"model": "forge:fluid"
},
"variants": {
"arcanite": [
{
"custom": {
"fluid": "arcanite"
}
}
],
"titanite": [
{
"custom": {
"fluid": "titanite"
}
}
],
"dyonite": [
{
"custom": {
"fluid": "dyonite"
}
}
]
}
}