From 8bde113a8a8e834eb600f8ecdb68702886b02c64 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 30 Oct 2016 00:36:20 +0200
Subject: [PATCH] Fixes

---
 .../java/com/raoulvdberge/refinedstorage/block/BlockBase.java  | 2 +-
 .../raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java  | 3 ++-
 .../refinedstorage/integration/jei/RecipeCategorySolderer.java | 1 +
 .../refinedstorage/integration/jei/RecipeWrapperSolderer.java  | 2 ++
 .../refinedstorage/render/BakedModelDiskDrive.java             | 1 +
 .../refinedstorage/render/BakedModelDiskManipulator.java       | 3 +--
 .../com/raoulvdberge/refinedstorage/render/BakedModelTRSR.java | 1 +
 .../com/raoulvdberge/refinedstorage/tile/TileDestructor.java   | 2 +-
 8 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
index 49ecf291a..0f251355a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
@@ -118,7 +118,7 @@ public abstract class BlockBase extends Block {
 
     @Override
     public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
-        return willHarvest ? true : super.removedByPlayer(state, world, pos, player, willHarvest);
+        return willHarvest || super.removedByPlayer(state, world, pos, player, willHarvest);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java
index 8eb284274..0db9c2d74 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java
@@ -8,7 +8,7 @@ import java.util.Set;
 
 public class ModGuiFactory implements IModGuiFactory {
     @Override
-    public void initialize(Minecraft minecraftInstance) {
+    public void initialize(Minecraft mc) {
 
     }
 
@@ -23,6 +23,7 @@ public class ModGuiFactory implements IModGuiFactory {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
         return null;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java
index 2306e0b9e..2cc49fb13 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java
@@ -45,6 +45,7 @@ public class RecipeCategorySolderer implements IRecipeCategory {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) {
         IGuiItemStackGroup group = recipeLayout.getItemStacks();
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java
index ad2b0a494..3be3d4ee1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java
@@ -23,11 +23,13 @@ public class RecipeWrapperSolderer extends BlankRecipeWrapper {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public List<ItemStack> getInputs() {
         return inputs;
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public List<ItemStack> getOutputs() {
         return Collections.singletonList(output);
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java
index 6827f5964..9d1db8b9d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java
@@ -163,6 +163,7 @@ public class BakedModelDiskDrive implements IBakedModel {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public ItemCameraTransforms getItemCameraTransforms() {
         return base.getItemCameraTransforms();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java
index 9551dd15b..eef3ad583 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java
@@ -64,7 +64,6 @@ public class BakedModelDiskManipulator implements IBakedModel {
         }
     }
 
-    private IBakedModel baseConnected;
     private IBakedModel baseDisconnected;
     private Map<EnumFacing, IBakedModel> modelsConnected = new HashMap<>();
     private Map<EnumFacing, IBakedModel> modelsDisconnected = new HashMap<>();
@@ -88,7 +87,6 @@ public class BakedModelDiskManipulator implements IBakedModel {
     });
 
     public BakedModelDiskManipulator(IBakedModel baseConnected, IBakedModel baseDisconnected, IBakedModel disk, IBakedModel diskFull, IBakedModel diskDisconnected) {
-        this.baseConnected = baseConnected;
         this.baseDisconnected = baseDisconnected;
 
         for (EnumFacing facing : EnumFacing.HORIZONTALS) {
@@ -167,6 +165,7 @@ public class BakedModelDiskManipulator implements IBakedModel {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public ItemCameraTransforms getItemCameraTransforms() {
         return baseDisconnected.getItemCameraTransforms();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelTRSR.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelTRSR.java
index 795bf0590..7c19847b0 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelTRSR.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelTRSR.java
@@ -116,6 +116,7 @@ public class BakedModelTRSR implements IBakedModel {
 
     @Nonnull
     @Override
+    @SuppressWarnings("deprecation")
     public ItemCameraTransforms getItemCameraTransforms() {
         return original.getItemCameraTransforms();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java
index 88ff32504..4e86bae5d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java
@@ -45,7 +45,7 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF
     public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
     public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
     public static final TileDataParameter<Integer> TYPE = IType.createParameter();
-    public static final TileDataParameter<Boolean> PICKUP = new TileDataParameter<Boolean>(DataSerializers.BOOLEAN, false, new ITileDataProducer<Boolean, TileDestructor>() {
+    public static final TileDataParameter<Boolean> PICKUP = new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer<Boolean, TileDestructor>() {
         @Override
         public Boolean getValue(TileDestructor tile) {
             return tile.pickupItem;