1.12.2; not well tested; book integration still broken

4 files changed, 10 insertions, 8 deletions

diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java
index f525e99..357fb76 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockCobble.java
@@ -11,7 +11,8 @@ import static slimeknights.tconstruct.TConstruct.random;
 
 public class BlockCobble extends BasicBlock {
 
-    public BlockCobble(String name, Material material, float hardness, float resistance, int harvestlevel, float light, String oreDictPrefix) {
+    public BlockCobble(String name, Material material, float hardness, float resistance, int harvestlevel, float
+            light, String oreDictPrefix) {
         super(name, material, hardness, resistance, harvestlevel, light, oreDictPrefix);
         MinecraftForge.EVENT_BUS.register(this);
     }
@@ -24,7 +25,8 @@ public class BlockCobble extends BasicBlock {
                 if (random.nextBoolean()) {
                     e.getWorld().setBlockState(e.getPos(), Blocks.LAVA.getDefaultState());
                 } else {
-                    e.getWorld().newExplosion(null, e.getPos().getX(), e.getPos().getY() + 1 / 16f, e.getPos().getZ(), 0.5f + random.nextFloat() * 1.5f, false, true);
+                    e.getWorld().newExplosion(null, e.getPos().getX(), e.getPos().getY() + 1 / 16f, e.getPos().getZ()
+                            , 0.5f + random.nextFloat() * 1.5f, false, true);
                 }
             }
         }
diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java
index 1aa4017..e2c351a 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockMetal.java
@@ -3,15 +3,13 @@ package com.sosnitzka.taiga.blocks;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.NonNullList;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.mantle.block.EnumBlock;
 
-import javax.annotation.Nonnull;
-import java.util.List;
 import java.util.Locale;
 
 public class BlockMetal extends EnumBlock<BlockMetal.MetalTypes> {
@@ -24,7 +22,7 @@ public class BlockMetal extends EnumBlock<BlockMetal.MetalTypes> {
 
     @SideOnly(Side.CLIENT)
     @Override
-    public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, List<ItemStack> list) {
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
         for (MetalTypes type : MetalTypes.values()) {
             list.add(new ItemStack(this, 1, type.getMeta()));
         }
diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java
index d87794b..637071b 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockMeteoriteRock.java
@@ -13,7 +13,8 @@ public class BlockMeteoriteRock extends BasicBlock {
 
     private IBlockState cobbblestate;
 
-    public BlockMeteoriteRock(String name, Material material, float hardness, float resistance, int harvestlevel, float light, String oreDictPrefix, IBlockState cobble) {
+    public BlockMeteoriteRock(String name, Material material, float hardness, float resistance, int harvestlevel,
+                              float light, String oreDictPrefix, IBlockState cobble) {
         super(name, material, hardness, resistance, harvestlevel, light, oreDictPrefix);
         MinecraftForge.EVENT_BUS.register(this);
         this.cobbblestate = cobble;
diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
index 18d92a0..95a2ebe 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
@@ -46,7 +46,8 @@ public class BlockTiberium extends BasicBlock {
     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() * 2f + 1.5f, true, true);
+                worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 2f + 1.5f, true,
+                        true);
             }
         }
     }