More deprecated code missed in the last compilation

KnightMiner · Nov 17, 2019 · 0c97e98 · 0c97e98
1 parent 74d980e
commit 0c97e98
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/knightminer/inspirations/building/block/ChainBlock.java b/src/main/java/knightminer/inspirations/building/block/ChainBlock.java
@@ -57,6 +57,7 @@ public ChainBlock(Item rungsItem, Properties props) {
 		SHAPE_BOTTOM[Rungs.Z.ordinal()] = VoxelShapes.or(chain_core_bottom, chain_rungs_z);
 	}
 
+	@Deprecated
 	@Nonnull
 	@Override
 	public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {

diff --git a/src/main/java/knightminer/inspirations/recipes/block/EnhancedCauldronBlock.java b/src/main/java/knightminer/inspirations/recipes/block/EnhancedCauldronBlock.java
@@ -232,6 +232,7 @@ public int getLevel(BlockState state) {
 		return state.get(LEVEL);
 	}
 
+	@Deprecated
 	@Override
 	public int getComparatorInputOverride(BlockState state, World world, BlockPos pos) {
 		return getLevel(state);

diff --git a/src/main/java/knightminer/inspirations/shared/client/TextureModel.java b/src/main/java/knightminer/inspirations/shared/client/TextureModel.java
@@ -1,13 +1,5 @@
 package knightminer.inspirations.shared.client;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.collect.ImmutableMap;
 import knightminer.inspirations.library.util.TagUtil;
 import knightminer.inspirations.library.util.TextureBlockUtil;
@@ -33,6 +25,14 @@
 import net.minecraftforge.client.model.data.ModelProperty;
 import slimeknights.mantle.client.ModelHelper;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.function.Function;
+
 public class TextureModel extends BakedModelWrapper<IBakedModel> {
 	private final Map<String, IBakedModel> cache = new HashMap<>();
 	private IModel model;
@@ -58,7 +58,7 @@ public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction
 		if(texture != null) {
 			bakedModel = getCachedTextureModel(texture);
 		}
-		return bakedModel.getQuads(state, side, rand);
+		return bakedModel.getQuads(state, side, rand, extraData);
 	}
 
 	protected IBakedModel getTexturedModel(ImmutableMap<String, String> textures) {

diff --git a/src/main/java/knightminer/inspirations/tweaks/TweaksEvents.java b/src/main/java/knightminer/inspirations/tweaks/TweaksEvents.java
@@ -4,13 +4,12 @@
 import knightminer.inspirations.common.network.InspirationsNetwork;
 import knightminer.inspirations.common.network.MilkablePacket;
 import knightminer.inspirations.library.InspirationsRegistry;
-import knightminer.inspirations.library.Util;
 import knightminer.inspirations.shared.SharedEvents;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.BushBlock;
 import net.minecraft.block.CropsBlock;
-import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.passive.CowEntity;
@@ -29,7 +28,6 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.World;
-import net.minecraftforge.event.LootTableLoadEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.player.BonemealEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -50,7 +48,7 @@ public static void unsaddlePig(EntityInteract event) {
 			return;
 		}
 
-		PlayerEntity player = event.getEntityPlayer();
+		PlayerEntity player = event.getPlayer();
 		ItemStack stack = player.getHeldItem(event.getHand());
 		// must be sneaking and holding nothing
 		if(player.isSneaking() && stack.isEmpty()) {
@@ -337,7 +335,7 @@ public static void milkCow(EntityInteract event) {
 		}
 
 		// must be holding a milk container
-		ItemStack stack = event.getEntityPlayer().getHeldItem(event.getHand());
+		ItemStack stack = event.getPlayer().getHeldItem(event.getHand());
 		if(stack.getItem().isIn(InspirationsRegistry.TAG_MILK_CONTAINERS)) {
 			// if has tag, cannot be milked
 			CompoundNBT tags = target.getPersistentData();

diff --git a/src/main/java/knightminer/inspirations/utility/UtilityEvents.java b/src/main/java/knightminer/inspirations/utility/UtilityEvents.java
@@ -54,7 +54,7 @@ public static void placeCarpetOnPressurePlate(RightClickBlock event) {
 		state = state.updatePostPlacement(Direction.DOWN, world.getBlockState(pos.down()), world, pos, pos.down());
 
 		// play sound
-		PlayerEntity player = event.getEntityPlayer();
+		PlayerEntity player = event.getPlayer();
 		SoundType sound = state.getBlock().getSoundType(state, world, pos, player);
 		world.playSound(player, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, (sound.getVolume() + 1.0F) / 2.0F, sound.getPitch() * 0.8F);