From 17ae55c35992829bf377ac5bc0741b234cb90bda Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 8 Feb 2018 19:37:21 +0100 Subject: 1.12.2; not well tested; book integration still broken --- src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java | 6 ++++-- src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java | 3 ++- src/main/java/com/sosnitzka/taiga/generic/BlockOre.java | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/sosnitzka/taiga/generic') diff --git a/src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java b/src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java index 5386a47..485aa5d 100644 --- a/src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicBlock.java @@ -6,7 +6,8 @@ import net.minecraft.block.material.Material; public class BasicBlock extends Block { private String oreDictPrefix; - public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, String oreDictPrefix) { + public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, float + lightLevel, String oreDictPrefix) { super(material); setUnlocalizedName(name); setRegistryName(name); @@ -25,7 +26,8 @@ public class BasicBlock extends Block { this(name, material, hardness, resistance, harvest, lightLevel, null); } - public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, String oreDictPrefix) { + public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, String + oreDictPrefix) { this(name, material, hardness, resistance, harvest, 0.0F, oreDictPrefix); } diff --git a/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java b/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java index 57c4924..9a40690 100644 --- a/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BasicTinkerFluid.java @@ -13,7 +13,8 @@ public class BasicTinkerFluid extends FluidMolten { public BasicTinkerFluid(String fluidName, int color, int temp, int lumen, int visk) { // Constructs the FluidMolten with textures and color - super(fluidName, color, new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow")); + super(fluidName, color, new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation + ("tconstruct:blocks/fluids/molten_metal_flow")); //Settings this.setUnlocalizedName(Util.prefix(fluidName)); this.setTemperature(temp); diff --git a/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java index 55737c3..111b2fb 100644 --- a/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java +++ b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java @@ -20,7 +20,8 @@ public class BlockOre extends Block { private int itemAmount; private int xpAmount; - public BlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, Item item, int amount, int xp) { + public BlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, + Item item, int amount, int xp) { super(material); setUnlocalizedName(name); setRegistryName(name); @@ -55,7 +56,8 @@ public class BlockOre extends Block { public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) { if (!worldIn.isRemote) { if (random.nextFloat() < 0.5) { - worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 4f + 1.5f, true, true); + worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 4f + 1.5f, true, + true); } } } -- cgit v1.2.3