Fixes
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ public class RecipeCategorySolderer implements IRecipeCategory {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) {
|
||||
IGuiItemStackGroup group = recipeLayout.getItemStacks();
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -163,6 +163,7 @@ public class BakedModelDiskDrive implements IBakedModel {
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public ItemCameraTransforms getItemCameraTransforms() {
|
||||
return base.getItemCameraTransforms();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -116,6 +116,7 @@ public class BakedModelTRSR implements IBakedModel {
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public ItemCameraTransforms getItemCameraTransforms() {
|
||||
return original.getItemCameraTransforms();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user