This commit is contained in:
Raoul Van den Berge
2016-10-30 00:36:20 +02:00
parent 6fb64bbeb8
commit 8bde113a8a
8 changed files with 10 additions and 5 deletions

View File

@@ -118,7 +118,7 @@ public abstract class BlockBase extends Block {
@Override @Override
public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { 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 @Override

View File

@@ -8,7 +8,7 @@ import java.util.Set;
public class ModGuiFactory implements IModGuiFactory { public class ModGuiFactory implements IModGuiFactory {
@Override @Override
public void initialize(Minecraft minecraftInstance) { public void initialize(Minecraft mc) {
} }
@@ -23,6 +23,7 @@ public class ModGuiFactory implements IModGuiFactory {
} }
@Override @Override
@SuppressWarnings("deprecation")
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
return null; return null;
} }

View File

@@ -45,6 +45,7 @@ public class RecipeCategorySolderer implements IRecipeCategory {
} }
@Override @Override
@SuppressWarnings("deprecation")
public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) {
IGuiItemStackGroup group = recipeLayout.getItemStacks(); IGuiItemStackGroup group = recipeLayout.getItemStacks();

View File

@@ -23,11 +23,13 @@ public class RecipeWrapperSolderer extends BlankRecipeWrapper {
} }
@Override @Override
@SuppressWarnings("deprecation")
public List<ItemStack> getInputs() { public List<ItemStack> getInputs() {
return inputs; return inputs;
} }
@Override @Override
@SuppressWarnings("deprecation")
public List<ItemStack> getOutputs() { public List<ItemStack> getOutputs() {
return Collections.singletonList(output); return Collections.singletonList(output);
} }

View File

@@ -163,6 +163,7 @@ public class BakedModelDiskDrive implements IBakedModel {
} }
@Override @Override
@SuppressWarnings("deprecation")
public ItemCameraTransforms getItemCameraTransforms() { public ItemCameraTransforms getItemCameraTransforms() {
return base.getItemCameraTransforms(); return base.getItemCameraTransforms();
} }

View File

@@ -64,7 +64,6 @@ public class BakedModelDiskManipulator implements IBakedModel {
} }
} }
private IBakedModel baseConnected;
private IBakedModel baseDisconnected; private IBakedModel baseDisconnected;
private Map<EnumFacing, IBakedModel> modelsConnected = new HashMap<>(); private Map<EnumFacing, IBakedModel> modelsConnected = new HashMap<>();
private Map<EnumFacing, IBakedModel> modelsDisconnected = 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) { public BakedModelDiskManipulator(IBakedModel baseConnected, IBakedModel baseDisconnected, IBakedModel disk, IBakedModel diskFull, IBakedModel diskDisconnected) {
this.baseConnected = baseConnected;
this.baseDisconnected = baseDisconnected; this.baseDisconnected = baseDisconnected;
for (EnumFacing facing : EnumFacing.HORIZONTALS) { for (EnumFacing facing : EnumFacing.HORIZONTALS) {
@@ -167,6 +165,7 @@ public class BakedModelDiskManipulator implements IBakedModel {
} }
@Override @Override
@SuppressWarnings("deprecation")
public ItemCameraTransforms getItemCameraTransforms() { public ItemCameraTransforms getItemCameraTransforms() {
return baseDisconnected.getItemCameraTransforms(); return baseDisconnected.getItemCameraTransforms();
} }

View File

@@ -116,6 +116,7 @@ public class BakedModelTRSR implements IBakedModel {
@Nonnull @Nonnull
@Override @Override
@SuppressWarnings("deprecation")
public ItemCameraTransforms getItemCameraTransforms() { public ItemCameraTransforms getItemCameraTransforms() {
return original.getItemCameraTransforms(); return original.getItemCameraTransforms();
} }

View File

@@ -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> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer> MODE = IFilterable.createParameter(); public static final TileDataParameter<Integer> MODE = IFilterable.createParameter();
public static final TileDataParameter<Integer> TYPE = IType.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 @Override
public Boolean getValue(TileDestructor tile) { public Boolean getValue(TileDestructor tile) {
return tile.pickupItem; return tile.pickupItem;