The great culling: Part Two

VazkiiMods · Dec 1, 2021 · 34cfb8c · 34cfb8c
1 parent 755f680
commit 34cfb8c
Show file tree

Hide file tree

Showing 340 changed files with 539 additions and 2,518 deletions.
diff --git a/src/main/java/vazkii/aurelienribon/tweenengine/Tween.java b/src/main/java/vazkii/aurelienribon/tweenengine/Tween.java
@@ -1,10 +1,10 @@
 package vazkii.aurelienribon.tweenengine;
 
-import vazkii.aurelienribon.tweenengine.equations.Quad;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import vazkii.aurelienribon.tweenengine.equations.Quad;
+
 /**
  * Core class of the Tween Engine. A Tween is basically an interpolation
  * between two values of an object attribute. However, the main interest of a

diff --git a/src/main/java/vazkii/quark/addons/oddities/block/MagnetBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/MagnetBlock.java
@@ -1,5 +1,10 @@
 package vazkii.quark.addons.oddities.block;
 
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -24,18 +29,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import vazkii.arl.util.RegistryHelper;
 import vazkii.quark.addons.oddities.magnetsystem.MagnetSystem;
 import vazkii.quark.addons.oddities.module.MagnetsModule;
 import vazkii.quark.addons.oddities.tile.MagnetTileEntity;
 import vazkii.quark.addons.oddities.tile.MagnetizedBlockTileEntity;
 import vazkii.quark.base.block.QuarkBlock;
 import vazkii.quark.base.module.QuarkModule;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.List;
-
 public class MagnetBlock extends QuarkBlock {
 
 	public static final DirectionProperty FACING = BlockStateProperties.FACING;
@@ -59,7 +59,6 @@ protected void fillStateContainer(Builder<Block, BlockState> builder) {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void neighborChanged(@Nonnull BlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, @Nonnull Block blockIn, @Nonnull BlockPos fromPos, boolean isMoving) {
 		super.neighborChanged(state, worldIn, pos, blockIn, fromPos, isMoving);
 

diff --git a/src/main/java/vazkii/quark/addons/oddities/block/PipeBlock.java b/src/main/java/vazkii/quark/addons/oddities/block/PipeBlock.java
@@ -30,7 +30,6 @@
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
 import net.minecraft.world.IBlockReader;
-import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
 import vazkii.quark.addons.oddities.tile.PipeTileEntity;
@@ -58,7 +57,6 @@ public class PipeBlock extends QuarkBlock implements IWaterLoggable {
 	public static final BooleanProperty EAST = BooleanProperty.create("east");
 	public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
 
-	@SuppressWarnings("unchecked")
 	private static final BooleanProperty[] CONNECTIONS = new BooleanProperty[] {
 			DOWN, UP, NORTH, SOUTH, WEST, EAST
 	};
@@ -134,7 +132,6 @@ public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockP
 
 	@Nonnull
 	@Override
-	@SuppressWarnings("deprecation")
 	public FluidState getFluidState(BlockState state) {
 		return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state);
 	}

diff --git a/...in/java/vazkii/quark/addons/oddities/client/render/MagnetizedBlockTileEntityRenderer.java b/...in/java/vazkii/quark/addons/oddities/client/render/MagnetizedBlockTileEntityRenderer.java
@@ -35,7 +35,6 @@ public MagnetizedBlockTileEntityRenderer(TileEntityRendererDispatcher d) {
 		super(d);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void render(MagnetizedBlockTileEntity tileEntityIn, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) {
 		World world = tileEntityIn.getWorld();
@@ -65,7 +64,6 @@ public void render(MagnetizedBlockTileEntity tileEntityIn, float partialTicks, M
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	private void renderStateModel(BlockPos p_228876_1_, BlockState p_228876_2_, MatrixStack p_228876_3_, IRenderTypeBuffer p_228876_4_, World p_228876_5_, boolean p_228876_6_, int p_228876_7_) {
 		RenderType.getBlockRenderTypes().stream().filter(t -> RenderTypeLookup.canRenderInLayer(p_228876_2_, t)).forEach(rendertype -> {
 			ForgeHooksClient.setRenderLayer(rendertype);

diff --git a/src/main/java/vazkii/quark/addons/oddities/client/render/PipeTileEntityRenderer.java b/src/main/java/vazkii/quark/addons/oddities/client/render/PipeTileEntityRenderer.java
@@ -21,7 +21,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.math.vector.Vector3f;
 import vazkii.quark.addons.oddities.tile.PipeTileEntity;
 import vazkii.quark.addons.oddities.tile.PipeTileEntity.ConnectionType;
@@ -57,7 +56,6 @@ public void render(PipeTileEntity te, float pticks, MatrixStack matrix, IRenderT
 		matrix.pop();
 	}
 
-	@SuppressWarnings("deprecation")
 	private void renderFlare(PipeTileEntity te, BlockRendererDispatcher disp, IBakedModel model, MatrixStack matrix, IRenderTypeBuffer buffer, float partial, int light, int overlay, Direction dir) {
 		ConnectionType type = PipeTileEntity.getConnectionTo(te.getWorld(), te.getPos(), dir);
 		if(type.isFlared) {

diff --git a/src/main/java/vazkii/quark/addons/oddities/client/screen/BackpackInventoryScreen.java b/src/main/java/vazkii/quark/addons/oddities/client/screen/BackpackInventoryScreen.java
@@ -1,9 +1,11 @@
 package vazkii.quark.addons.oddities.client.screen;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.inventory.InventoryScreen;
 import net.minecraft.client.gui.widget.Widget;
 import net.minecraft.client.gui.widget.button.Button;
@@ -20,9 +22,6 @@
 import vazkii.quark.base.network.QuarkNetwork;
 import vazkii.quark.base.network.message.HandleBackpackMessage;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class BackpackInventoryScreen extends InventoryScreen {
 
 	private static final ResourceLocation BACKPACK_INVENTORY_BACKGROUND = new ResourceLocation(Quark.MOD_ID, "textures/misc/backpack_gui.png");

diff --git a/src/main/java/vazkii/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java b/src/main/java/vazkii/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.audio.SimpleSound;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
@@ -21,8 +20,8 @@
 import net.minecraft.util.text.TranslationTextComponent;
 import vazkii.arl.util.ClientTicker;
 import vazkii.quark.addons.oddities.container.EnchantmentMatrix;
-import vazkii.quark.addons.oddities.container.MatrixEnchantingContainer;
 import vazkii.quark.addons.oddities.container.EnchantmentMatrix.Piece;
+import vazkii.quark.addons.oddities.container.MatrixEnchantingContainer;
 import vazkii.quark.addons.oddities.module.MatrixEnchantingModule;
 import vazkii.quark.addons.oddities.tile.MatrixEnchantingTableTileEntity;
 import vazkii.quark.base.Quark;

diff --git a/src/main/java/vazkii/quark/addons/oddities/container/MatrixEnchantingContainer.java b/src/main/java/vazkii/quark/addons/oddities/container/MatrixEnchantingContainer.java
@@ -3,7 +3,6 @@
 import javax.annotation.Nonnull;
 
 import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.block.Blocks;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.entity.player.ServerPlayerEntity;

diff --git a/src/main/java/vazkii/quark/addons/oddities/entity/TotemOfHoldingEntity.java b/src/main/java/vazkii/quark/addons/oddities/entity/TotemOfHoldingEntity.java
@@ -1,5 +1,10 @@
 package vazkii.quark.addons.oddities.entity;
 
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
@@ -21,10 +26,6 @@
 import net.minecraftforge.fml.network.NetworkHooks;
 import vazkii.quark.addons.oddities.module.TotemOfHoldingModule;
 
-import javax.annotation.Nonnull;
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * @author WireSegal
  * Created at 1:34 PM on 3/30/20.

diff --git a/src/main/java/vazkii/quark/addons/oddities/item/BackpackItem.java b/src/main/java/vazkii/quark/addons/oddities/item/BackpackItem.java
@@ -1,7 +1,6 @@
 package vazkii.quark.addons.oddities.item;
 
 import java.util.Map;
-import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 
 import javax.annotation.Nonnull;

diff --git a/src/main/java/vazkii/quark/addons/oddities/magnetsystem/DefaultMoveActions.java b/src/main/java/vazkii/quark/addons/oddities/magnetsystem/DefaultMoveActions.java
@@ -37,7 +37,6 @@ private static void stonecutterMoved(World world, BlockPos pos, Direction direct
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	private static void hopperMoved(World world, BlockPos pos, Direction direction, BlockState state, TileEntity tile) {
 		if(!world.isRemote && tile instanceof HopperTileEntity) {
 			HopperTileEntity hopper = (HopperTileEntity) tile;

diff --git a/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java b/src/main/java/vazkii/quark/addons/oddities/module/CrateModule.java
@@ -7,15 +7,11 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.extensions.IForgeContainerType;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
 import vazkii.arl.util.RegistryHelper;
 import vazkii.quark.addons.oddities.block.CrateBlock;
-import vazkii.quark.addons.oddities.client.render.PipeTileEntityRenderer;
 import vazkii.quark.addons.oddities.client.screen.CrateScreen;
 import vazkii.quark.addons.oddities.container.CrateContainer;
 import vazkii.quark.addons.oddities.tile.CrateTileEntity;
-import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.handler.RequiredModTooltipHandler;
 import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleCategory;
 import vazkii.quark.base.module.QuarkModule;

diff --git a/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java b/src/main/java/vazkii/quark/addons/oddities/module/MagnetsModule.java
@@ -15,11 +15,9 @@
 import vazkii.quark.addons.oddities.client.render.MagnetizedBlockTileEntityRenderer;
 import vazkii.quark.addons.oddities.tile.MagnetTileEntity;
 import vazkii.quark.addons.oddities.tile.MagnetizedBlockTileEntity;
-import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.handler.RequiredModTooltipHandler;
 import vazkii.quark.base.module.LoadModule;
-import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.ModuleCategory;
+import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.config.Config;
 
 @LoadModule(category = ModuleCategory.ODDITIES)

diff --git a/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java b/src/main/java/vazkii/quark/addons/oddities/module/PipesModule.java
@@ -13,10 +13,9 @@
 import vazkii.quark.addons.oddities.client.render.PipeTileEntityRenderer;
 import vazkii.quark.addons.oddities.tile.PipeTileEntity;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.handler.RequiredModTooltipHandler;
 import vazkii.quark.base.module.LoadModule;
-import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.ModuleCategory;
+import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.config.Config;
 
 @LoadModule(category = ModuleCategory.ODDITIES)

diff --git a/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java b/src/main/java/vazkii/quark/addons/oddities/module/TotemOfHoldingModule.java
@@ -28,10 +28,9 @@
 import vazkii.quark.addons.oddities.item.SoulCompassItem;
 import vazkii.quark.addons.oddities.render.TotemOfHoldingRenderer;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.client.handler.RequiredModTooltipHandler;
 import vazkii.quark.base.module.LoadModule;
-import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.ModuleCategory;
+import vazkii.quark.base.module.QuarkModule;
 import vazkii.quark.base.module.config.Config;
 
 /**

diff --git a/src/main/java/vazkii/quark/addons/oddities/render/TotemOfHoldingRenderer.java b/src/main/java/vazkii/quark/addons/oddities/render/TotemOfHoldingRenderer.java
@@ -1,6 +1,9 @@
 package vazkii.quark.addons.oddities.render;
 
+import javax.annotation.Nonnull;
+
 import com.mojang.blaze3d.matrix.MatrixStack;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Atlases;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
@@ -21,8 +24,6 @@
 import vazkii.quark.addons.oddities.entity.TotemOfHoldingEntity;
 import vazkii.quark.addons.oddities.module.TotemOfHoldingModule;
 
-import javax.annotation.Nonnull;
-
 /**
  * @author WireSegal
  * Created at 2:01 PM on 3/30/20.
@@ -34,7 +35,6 @@ public TotemOfHoldingRenderer(EntityRendererManager manager) {
         super(manager);
     }
 
-    @SuppressWarnings("deprecation")
 	@Override
     public void render(TotemOfHoldingEntity entity, float entityYaw, float partialTicks, @Nonnull MatrixStack matrixStackIn, @Nonnull IRenderTypeBuffer bufferIn, int packedLightIn) {
         int deathTicks = entity.getDeathTicks();

diff --git a/src/main/java/vazkii/quark/addons/oddities/tile/BaseEnchantingTableTile.java b/src/main/java/vazkii/quark/addons/oddities/tile/BaseEnchantingTableTile.java
@@ -1,5 +1,9 @@
 package vazkii.quark.addons.oddities.tile;
 
+import java.util.Random;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.InventoryHelper;
@@ -14,9 +18,6 @@
 import vazkii.arl.block.tile.TileSimpleInventory;
 import vazkii.quark.base.handler.MiscUtil;
 
-import javax.annotation.Nonnull;
-import java.util.Random;
-
 public abstract class BaseEnchantingTableTile extends TileSimpleInventory implements ITickableTileEntity, INameable {
 
 	public int tickCount;

diff --git a/src/main/java/vazkii/quark/addons/oddities/tile/MagnetizedBlockTileEntity.java b/src/main/java/vazkii/quark/addons/oddities/tile/MagnetizedBlockTileEntity.java
@@ -271,7 +271,6 @@ public void clearMagnetTileEntity() {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public void tick() {
         if (this.world == null)
             return;

diff --git a/src/main/java/vazkii/quark/addons/oddities/tile/MatrixEnchantingTableTileEntity.java b/src/main/java/vazkii/quark/addons/oddities/tile/MatrixEnchantingTableTileEntity.java
@@ -29,8 +29,8 @@
 import net.minecraft.world.World;
 import vazkii.arl.util.ItemNBTHelper;
 import vazkii.quark.addons.oddities.container.EnchantmentMatrix;
-import vazkii.quark.addons.oddities.container.MatrixEnchantingContainer;
 import vazkii.quark.addons.oddities.container.EnchantmentMatrix.Piece;
+import vazkii.quark.addons.oddities.container.MatrixEnchantingContainer;
 import vazkii.quark.addons.oddities.module.MatrixEnchantingModule;
 import vazkii.quark.api.IEnchantmentInfluencer;
 import vazkii.quark.api.IModifiableEnchantmentInfluencer;

diff --git a/src/main/java/vazkii/quark/addons/oddities/tile/PipeTileEntity.java b/src/main/java/vazkii/quark/addons/oddities/tile/PipeTileEntity.java
@@ -18,7 +18,6 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.item.ItemEntity;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
@@ -37,12 +36,7 @@
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
-import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemHandlerHelper;
-import net.minecraftforge.items.wrapper.InvWrapper;
-import net.minecraftforge.items.wrapper.SidedInvWrapper;
 import vazkii.arl.block.tile.TileSimpleInventory;
 import vazkii.quark.addons.oddities.block.PipeBlock;
 import vazkii.quark.addons.oddities.module.PipesModule;

diff --git a/src/main/java/vazkii/quark/api/IModifiableEnchantmentInfluencer.java b/src/main/java/vazkii/quark/api/IModifiableEnchantmentInfluencer.java
@@ -1,13 +1,13 @@
 package vazkii.quark.api;
 
+import java.util.List;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 
-import java.util.List;
-
 public interface IModifiableEnchantmentInfluencer extends IEnchantmentInfluencer {
     List<Enchantment> getModifiedEnchantments(IBlockReader world, BlockPos pos, BlockState state, ItemStack stack, List<Enchantment> influencedEnchants);
 

diff --git a/src/main/java/vazkii/quark/base/block/IQuarkBlock.java b/src/main/java/vazkii/quark/base/block/IQuarkBlock.java
@@ -1,5 +1,9 @@
 package vazkii.quark.base.block;
 
+import java.util.function.BooleanSupplier;
+
+import javax.annotation.Nullable;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.block.material.Material;
 import net.minecraft.state.properties.BlockStateProperties;
@@ -9,9 +13,6 @@
 import net.minecraftforge.common.extensions.IForgeBlock;
 import vazkii.quark.base.module.QuarkModule;
 
-import javax.annotation.Nullable;
-import java.util.function.BooleanSupplier;
-
 /**
  * @author WireSegal
  * Created at 1:14 PM on 9/19/19.

diff --git a/src/main/java/vazkii/quark/base/block/QuarkBlock.java b/src/main/java/vazkii/quark/base/block/QuarkBlock.java
@@ -10,7 +10,6 @@
 import net.minecraft.util.NonNullList;
 import vazkii.arl.block.BasicBlock;
 import vazkii.arl.util.RegistryHelper;
-import vazkii.quark.base.Quark;
 import vazkii.quark.base.client.handler.RequiredModTooltipHandler;
 import vazkii.quark.base.module.QuarkModule;
 

diff --git a/src/main/java/vazkii/quark/base/block/QuarkFenceGateBlock.java b/src/main/java/vazkii/quark/base/block/QuarkFenceGateBlock.java
@@ -1,15 +1,16 @@
 package vazkii.quark.base.block;
 
+import java.util.function.BooleanSupplier;
+
+import javax.annotation.Nullable;
+
 import net.minecraft.block.FenceGateBlock;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import vazkii.arl.util.RegistryHelper;
 import vazkii.quark.base.module.QuarkModule;
 
-import javax.annotation.Nullable;
-import java.util.function.BooleanSupplier;
-
 /**
  * @author WireSegal
  * Created at 9:14 PM on 10/8/19.