From fbc0f91c0ab8509250f0bbf1d71db227dfe33eb6 Mon Sep 17 00:00:00 2001 From: TechLord22 <37029404+TechLord22@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:32:19 -0400 Subject: [PATCH] remove usages of NonNullList (#2581) --- .../api/block/machines/BlockMachine.java | 2 +- .../capability/impl/AbstractRecipeLogic.java | 5 ++-- .../capability/impl/BoilerRecipeLogic.java | 9 ++---- .../api/capability/impl/miner/MinerLogic.java | 4 +-- .../java/gregtech/api/cover/CoverBase.java | 6 ++-- .../api/gui/impl/FakeModularGuiContainer.java | 8 ++--- .../api/metatileentity/MetaTileEntity.java | 7 +++-- .../SimpleMachineMetaTileEntity.java | 3 +- .../java/gregtech/api/recipes/Recipe.java | 14 ++++----- .../gregtech/api/recipes/RecipeBuilder.java | 17 ++++------- .../api/unification/OreDictUnifier.java | 4 +-- .../java/gregtech/api/util/BlockUtility.java | 5 ++-- .../java/gregtech/api/util/GTUtility.java | 29 +++++++++---------- .../impl/FakeModularUIContainerClipboard.java | 6 ++-- .../MetaTileEntityClipboard.java | 4 +-- .../electric/MetaTileEntityFisher.java | 5 ++-- .../electric/MetaTileEntityMiner.java | 2 +- .../MetaTileEntityMaintenanceHatch.java | 2 +- .../MetaTileEntityMufflerHatch.java | 4 +-- .../MetaTileEntityObjectHolder.java | 3 +- .../MetaTileEntityPassthroughHatchItem.java | 3 +- .../MetaTileEntityRotorHolder.java | 3 +- .../appeng/MetaTileEntityAEHostablePart.java | 4 +-- .../hpca/MetaTileEntityHPCAComponent.java | 3 +- .../steam/boiler/SteamBoiler.java | 2 +- .../storage/CraftingRecipeLogic.java | 7 ++--- .../storage/MetaTileEntityBuffer.java | 4 +-- .../storage/MetaTileEntityCrate.java | 4 +-- .../storage/MetaTileEntityQuantumChest.java | 3 +- .../storage/MetaTileEntityWorkbench.java | 3 +- 30 files changed, 74 insertions(+), 101 deletions(-) diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java index 94cb7f24fbf..b6baf911627 100644 --- a/src/main/java/gregtech/api/block/machines/BlockMachine.java +++ b/src/main/java/gregtech/api/block/machines/BlockMachine.java @@ -341,7 +341,7 @@ public void breakBlock(@NotNull World worldIn, @NotNull BlockPos pos, @NotNull I MetaTileEntity metaTileEntity = getMetaTileEntity(worldIn, pos); if (metaTileEntity != null) { if (!metaTileEntity.keepsInventory()) { - NonNullList inventoryContents = NonNullList.create(); + List inventoryContents = new ArrayList<>(); metaTileEntity.clearMachineInventory(inventoryContents); for (ItemStack itemStack : inventoryContents) { Block.spawnAsEntity(worldIn, pos, itemStack); diff --git a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java index b0916e6917a..c1ca110c2ef 100644 --- a/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java @@ -30,7 +30,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants; @@ -71,7 +70,7 @@ public abstract class AbstractRecipeLogic extends MTETrait implements IWorkable, protected int maxProgressTime; protected long recipeEUt; protected List fluidOutputs; - protected NonNullList itemOutputs; + protected List itemOutputs; protected boolean isActive; protected boolean workingEnabled = true; @@ -1227,7 +1226,7 @@ public void deserializeNBT(@NotNull NBTTagCompound compound) { this.maxProgressTime = compound.getInteger("MaxProgress"); this.recipeEUt = compound.getLong("RecipeEUt"); NBTTagList itemOutputsList = compound.getTagList("ItemOutputs", Constants.NBT.TAG_COMPOUND); - this.itemOutputs = NonNullList.create(); + this.itemOutputs = new ArrayList<>(itemOutputsList.tagCount()); for (int i = 0; i < itemOutputsList.tagCount(); i++) { this.itemOutputs.add(new ItemStack(itemOutputsList.getCompoundTagAt(i))); } diff --git a/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java index dd42dd54aee..28b2ee7afd0 100644 --- a/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -30,7 +29,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Collections; -import java.util.List; import static gregtech.api.capability.GregtechDataCodes.BOILER_HEAT; import static gregtech.api.capability.GregtechDataCodes.BOILER_LAST_TICK_STEAM; @@ -51,7 +49,7 @@ public class BoilerRecipeLogic extends AbstractRecipeLogic implements ICategoryO public BoilerRecipeLogic(MetaTileEntityLargeBoiler tileEntity) { super(tileEntity, null); this.fluidOutputs = Collections.emptyList(); - this.itemOutputs = NonNullList.create(); + this.itemOutputs = Collections.emptyList(); } @Override @@ -80,7 +78,6 @@ protected void trySearchNewRecipe() { // can optimize with an override of checkPreviousRecipe() and a check here IMultipleTankHandler importFluids = boiler.getImportFluids(); - List dummyList = NonNullList.create(); boolean didStartRecipe = false; for (IFluidTank fluidTank : importFluids.getFluidTanks()) { @@ -88,7 +85,7 @@ protected void trySearchNewRecipe() { if (fuelStack == null || CommonFluidFilters.BOILER_FLUID.test(fuelStack)) continue; Recipe dieselRecipe = RecipeMaps.COMBUSTION_GENERATOR_FUELS.findRecipe( - GTValues.V[GTValues.MAX], dummyList, Collections.singletonList(fuelStack)); + GTValues.V[GTValues.MAX], Collections.emptyList(), Collections.singletonList(fuelStack)); // run only if it can apply a certain amount of "parallel", this is to mitigate int division if (dieselRecipe != null && fuelStack.amount >= dieselRecipe.getFluidInputs().get(0).getAmount() * FLUID_DRAIN_MULTIPLIER) { @@ -102,7 +99,7 @@ protected void trySearchNewRecipe() { } Recipe denseFuelRecipe = RecipeMaps.SEMI_FLUID_GENERATOR_FUELS.findRecipe( - GTValues.V[GTValues.MAX], dummyList, Collections.singletonList(fuelStack)); + GTValues.V[GTValues.MAX], Collections.emptyList(), Collections.singletonList(fuelStack)); // run only if it can apply a certain amount of "parallel", this is to mitigate int division if (denseFuelRecipe != null && fuelStack.amount >= denseFuelRecipe.getFluidInputs().get(0).getAmount() * FLUID_DRAIN_MULTIPLIER) { diff --git a/src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java b/src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java index 3439aca4a57..2565c02a7a5 100644 --- a/src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java +++ b/src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java @@ -180,7 +180,7 @@ public void performMining() { blockState = metaTileEntity.getWorld().getBlockState(blocksToMine.getFirst()); } // When we are here we have an ore to mine! I'm glad we aren't threaded - if (!blocksToMine.isEmpty() & GTUtility.isOre(GTUtility.toItem(blockState))) { + if (!blocksToMine.isEmpty() && GTUtility.isOre(GTUtility.toItem(blockState))) { // get the small ore drops, if a small ore getSmallOreBlockDrops(blockDrops, world, blocksToMine.getFirst(), blockState); // get the block's drops. @@ -280,7 +280,7 @@ protected void getRegularBlockDrops(NonNullList blockDrops, WorldServ * @param blockDrops the List of items to insert * @param world the {@link WorldServer} the miner is in */ - private void mineAndInsertItems(NonNullList blockDrops, WorldServer world) { + private void mineAndInsertItems(List blockDrops, WorldServer world) { // If the block's drops can fit in the inventory, move the previously mined position to the block // replace the ore block with cobblestone instead of breaking it to prevent mob spawning // remove the ore block's position from the mining queue diff --git a/src/main/java/gregtech/api/cover/CoverBase.java b/src/main/java/gregtech/api/cover/CoverBase.java index 49a3429f842..8382a8a1d4b 100644 --- a/src/main/java/gregtech/api/cover/CoverBase.java +++ b/src/main/java/gregtech/api/cover/CoverBase.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; @@ -21,6 +20,9 @@ import codechicken.lib.vec.Matrix4; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.List; + public abstract class CoverBase implements Cover { private final CoverDefinition definition; @@ -55,7 +57,7 @@ public CoverBase(@NotNull CoverDefinition definition, @NotNull CoverableView cov * @param inventory the inventory to clear */ protected void dropInventoryContents(@NotNull IItemHandlerModifiable inventory) { - NonNullList drops = NonNullList.create(); + List drops = new ArrayList<>(); MetaTileEntity.clearInventory(drops, inventory); for (ItemStack itemStack : drops) { Block.spawnAsEntity(getWorld(), getPos(), itemStack); diff --git a/src/main/java/gregtech/api/gui/impl/FakeModularGuiContainer.java b/src/main/java/gregtech/api/gui/impl/FakeModularGuiContainer.java index 150a28c245f..574b010e1f8 100644 --- a/src/main/java/gregtech/api/gui/impl/FakeModularGuiContainer.java +++ b/src/main/java/gregtech/api/gui/impl/FakeModularGuiContainer.java @@ -8,16 +8,14 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; - -import com.google.common.collect.Lists; +import java.util.ArrayList; import java.util.List; public abstract class FakeModularGuiContainer implements WidgetUIAccess { - protected final NonNullList inventoryItemStacks = NonNullList.create(); - public final List inventorySlots = Lists.newArrayList(); + protected final List inventoryItemStacks = new ArrayList<>(); + public final List inventorySlots = new ArrayList<>(); public final ModularUI modularUI; protected int windowId; diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 0369acfd850..d2a3f5b4597 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -915,7 +915,7 @@ private void updateSound() { * @param dropsList list of meta tile entity drops * @param harvester harvester of this meta tile entity, or null */ - public void getDrops(NonNullList dropsList, @Nullable EntityPlayer harvester) {} + public void getDrops(@NotNull List<@NotNull ItemStack> dropsList, @Nullable EntityPlayer harvester) {} public final ItemStack getPickItem(CuboidRayTraceResult result, EntityPlayer player) { IndexedCuboid6 hitCuboid = result.cuboid6; @@ -1325,12 +1325,13 @@ public boolean isValid() { return getHolder() != null && getHolder().isValid(); } - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { clearInventory(itemBuffer, importItems); clearInventory(itemBuffer, exportItems); } - public static void clearInventory(NonNullList itemBuffer, IItemHandlerModifiable inventory) { + public static void clearInventory(@NotNull List<@NotNull ItemStack> itemBuffer, + @NotNull IItemHandlerModifiable inventory) { for (int i = 0; i < inventory.getSlots(); i++) { ItemStack stackInSlot = inventory.getStackInSlot(i); if (!stackInSlot.isEmpty()) { diff --git a/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java index ac0896d0305..64b8d3c86eb 100644 --- a/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java @@ -37,7 +37,6 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; @@ -475,7 +474,7 @@ public boolean isAllowInputFromOutputSideFluids() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { super.clearMachineInventory(itemBuffer); clearInventory(itemBuffer, chargerInventory); } diff --git a/src/main/java/gregtech/api/recipes/Recipe.java b/src/main/java/gregtech/api/recipes/Recipe.java index a367ca68445..923c463e0c4 100644 --- a/src/main/java/gregtech/api/recipes/Recipe.java +++ b/src/main/java/gregtech/api/recipes/Recipe.java @@ -16,7 +16,6 @@ import gregtech.integration.groovy.GroovyScriptModule; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; @@ -59,8 +58,6 @@ */ public class Recipe { - private static final NonNullList EMPTY = NonNullList.create(); - /** * This method was deprecated in 2.8 and will be removed in 2.9 * @@ -73,7 +70,7 @@ public static int getMaxChancedValue() { } private final List inputs; - private final NonNullList outputs; + private final List outputs; /** * A chance of 10000 equals 100% @@ -122,10 +119,9 @@ public Recipe(@NotNull List inputs, recipePropertyStorage; this.inputs = GTRecipeInputCache.deduplicateInputs(inputs); if (outputs.isEmpty()) { - this.outputs = EMPTY; + this.outputs = Collections.emptyList(); } else { - this.outputs = NonNullList.create(); - this.outputs.addAll(outputs); + this.outputs = new ArrayList<>(outputs); } this.chancedOutputs = chancedOutputs; this.chancedFluidOutputs = chancedFluidOutputs; @@ -457,7 +453,7 @@ public List getInputs() { return inputs; } - public NonNullList getOutputs() { + public List getOutputs() { return outputs; } @@ -475,7 +471,7 @@ public NonNullList getOutputs() { * @return A list of all resulting ItemStacks from the recipe, after chance has been applied to any chanced outputs */ public List getResultItemOutputs(int recipeTier, int machineTier, RecipeMap recipeMap) { - List outputs = new ArrayList<>(GTUtility.copyStackList(getOutputs())); + List outputs = new ArrayList<>(getOutputs()); ChanceBoostFunction function = recipeMap.getChanceFunction(); List chancedOutputsList = getChancedOutputs().roll(function, recipeTier, machineTier); diff --git a/src/main/java/gregtech/api/recipes/RecipeBuilder.java b/src/main/java/gregtech/api/recipes/RecipeBuilder.java index 8ca69043551..b57b8c25db4 100644 --- a/src/main/java/gregtech/api/recipes/RecipeBuilder.java +++ b/src/main/java/gregtech/api/recipes/RecipeBuilder.java @@ -35,7 +35,6 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.Optional; @@ -89,8 +88,8 @@ public class RecipeBuilder> { protected boolean recipePropertyStorageErrored = false; protected RecipeBuilder() { - this.inputs = NonNullList.create(); - this.outputs = NonNullList.create(); + this.inputs = new ArrayList<>(); + this.outputs = new ArrayList<>(); this.chancedOutputs = new ArrayList<>(); this.fluidInputs = new ArrayList<>(); this.fluidOutputs = new ArrayList<>(); @@ -99,10 +98,8 @@ protected RecipeBuilder() { public RecipeBuilder(Recipe recipe, RecipeMap recipeMap) { this.recipeMap = recipeMap; - this.inputs = NonNullList.create(); - this.inputs.addAll(recipe.getInputs()); - this.outputs = NonNullList.create(); - this.outputs.addAll(GTUtility.copyStackList(recipe.getOutputs())); + this.inputs = new ArrayList<>(recipe.getInputs()); + this.outputs = new ArrayList<>(recipe.getOutputs()); this.chancedOutputs = new ArrayList<>(recipe.getChancedOutputs().getChancedEntries()); this.fluidInputs = new ArrayList<>(recipe.getFluidInputs()); this.fluidOutputs = GTUtility.copyFluidList(recipe.getFluidOutputs()); @@ -120,10 +117,8 @@ public RecipeBuilder(Recipe recipe, RecipeMap recipeMap) { @SuppressWarnings("CopyConstructorMissesField") protected RecipeBuilder(RecipeBuilder recipeBuilder) { this.recipeMap = recipeBuilder.recipeMap; - this.inputs = NonNullList.create(); - this.inputs.addAll(recipeBuilder.getInputs()); - this.outputs = NonNullList.create(); - this.outputs.addAll(GTUtility.copyStackList(recipeBuilder.getOutputs())); + this.inputs = new ArrayList<>(recipeBuilder.getInputs()); + this.outputs = new ArrayList<>(recipeBuilder.getOutputs()); this.chancedOutputs = new ArrayList<>(recipeBuilder.chancedOutputs); this.fluidInputs = new ArrayList<>(recipeBuilder.getFluidInputs()); this.fluidOutputs = GTUtility.copyFluidList(recipeBuilder.getFluidOutputs()); diff --git a/src/main/java/gregtech/api/unification/OreDictUnifier.java b/src/main/java/gregtech/api/unification/OreDictUnifier.java index aeaf123cdb2..76e6c376086 100644 --- a/src/main/java/gregtech/api/unification/OreDictUnifier.java +++ b/src/main/java/gregtech/api/unification/OreDictUnifier.java @@ -13,7 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.oredict.OreDictionary; @@ -87,8 +86,7 @@ public static void registerOre(ItemStack itemStack, String oreDict) { public static void init() { for (String registeredOreName : OreDictionary.getOreNames()) { - NonNullList theseOres = OreDictionary.getOres(registeredOreName); - for (ItemStack itemStack : theseOres) { + for (ItemStack itemStack : OreDictionary.getOres(registeredOreName)) { onItemRegistration(new OreRegisterEvent(registeredOreName, itemStack)); } } diff --git a/src/main/java/gregtech/api/util/BlockUtility.java b/src/main/java/gregtech/api/util/BlockUtility.java index 77b816da15a..daa6e382e2d 100644 --- a/src/main/java/gregtech/api/util/BlockUtility.java +++ b/src/main/java/gregtech/api/util/BlockUtility.java @@ -47,9 +47,8 @@ public BlockWrapper() { super(Material.AIR); } - @NotNull @Override - public NonNullList captureDrops(boolean start) { + public @NotNull NonNullList captureDrops(boolean start) { return super.captureDrops(start); } } @@ -58,7 +57,7 @@ public static void startCaptureDrops() { WRAPPER.captureDrops(true); } - public static NonNullList stopCaptureDrops() { + public static @NotNull NonNullList stopCaptureDrops() { return WRAPPER.captureDrops(false); } diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java index 1d5658dcce6..cc54a5a2d49 100644 --- a/src/main/java/gregtech/api/util/GTUtility.java +++ b/src/main/java/gregtech/api/util/GTUtility.java @@ -54,7 +54,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; -import com.google.common.collect.Lists; import com.google.common.util.concurrent.AtomicDouble; import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet; import org.apache.commons.lang3.ArrayUtils; @@ -64,6 +63,7 @@ import org.jetbrains.annotations.Nullable; import java.util.AbstractList; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -446,18 +446,20 @@ public static NBTTagCompound getOrCreateNbtCompound(ItemStack stack) { return compound; } - public static NonNullList copyStackList(List itemStacks) { - ItemStack[] stacks = new ItemStack[itemStacks.size()]; - for (int i = 0; i < itemStacks.size(); i++) { - stacks[i] = copy(itemStacks.get(i)); + public static @NotNull List<@NotNull ItemStack> copyStackList(@NotNull List<@NotNull ItemStack> itemStacks) { + List list = new ArrayList<>(itemStacks.size()); + for (ItemStack itemStack : itemStacks) { + list.add(copy(itemStack)); } - return NonNullList.from(ItemStack.EMPTY, stacks); + return list; } - public static List copyFluidList(List fluidStacks) { - FluidStack[] stacks = new FluidStack[fluidStacks.size()]; - for (int i = 0; i < fluidStacks.size(); i++) stacks[i] = fluidStacks.get(i).copy(); - return Lists.newArrayList(stacks); + public static @NotNull List<@NotNull FluidStack> copyFluidList(@NotNull List<@NotNull FluidStack> fluidStacks) { + List list = new ArrayList<>(fluidStacks.size()); + for (FluidStack stack : fluidStacks) { + list.add(stack.copy()); + } + return list; } /** @@ -466,8 +468,7 @@ public static List copyFluidList(List fluidStacks) { * @param stack item stack for copying * @return a copy of ItemStack, or {@link ItemStack#EMPTY} if the stack is empty */ - @NotNull - public static ItemStack copy(@NotNull ItemStack stack) { + public static @NotNull ItemStack copy(@NotNull ItemStack stack) { return stack.isEmpty() ? ItemStack.EMPTY : stack.copy(); } @@ -820,9 +821,7 @@ public static Set getAllSubItems(@NotNull Item item) { if (tab == null || tab == CreativeTabs.SEARCH) continue; item.getSubItems(tab, subItems); } - Set set = new ObjectOpenCustomHashSet<>(ItemStackHashStrategy.comparingItemDamageCount()); - set.addAll(subItems); - return set; + return new ObjectOpenCustomHashSet<>(subItems, ItemStackHashStrategy.comparingItemDamageCount()); } /** diff --git a/src/main/java/gregtech/common/gui/impl/FakeModularUIContainerClipboard.java b/src/main/java/gregtech/common/gui/impl/FakeModularUIContainerClipboard.java index af569788b80..e7c4b8dad09 100644 --- a/src/main/java/gregtech/common/gui/impl/FakeModularUIContainerClipboard.java +++ b/src/main/java/gregtech/common/gui/impl/FakeModularUIContainerClipboard.java @@ -10,10 +10,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; import net.minecraft.util.Tuple; -import com.google.common.collect.Lists; import io.netty.buffer.Unpooled; import java.util.ArrayList; @@ -24,8 +22,8 @@ public class FakeModularUIContainerClipboard extends FakeModularGuiContainer { - private final NonNullList inventoryItemStacks = NonNullList.create(); - public final List inventorySlots = Lists.newArrayList(); + private final List inventoryItemStacks = new ArrayList<>(); + public final List inventorySlots = new ArrayList<>(); public int windowId; public MetaTileEntityClipboard clipboard; diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java index 64ea0d7ffcf..e0a728238c8 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java @@ -219,7 +219,7 @@ public void setClipboard(ItemStack stack) { } @Override - public void getDrops(NonNullList dropsList, @Nullable EntityPlayer harvester) { + public void getDrops(@NotNull List<@NotNull ItemStack> dropsList, @Nullable EntityPlayer harvester) { dropsList.clear(); dropsList.add(this.getClipboard()); } @@ -258,7 +258,7 @@ private void breakClipboard(@Nullable EntityPlayer player) { BlockPos pos = this.getPos(); // Saving this for later so it doesn't get mangled World world = this.getWorld(); // Same here - NonNullList drops = NonNullList.create(); + List drops = new ArrayList<>(); getDrops(drops, player); Block.spawnAsEntity(getWorld(), pos, drops.get(0)); diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java index 2b8aa936f42..076cc395674 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java @@ -18,7 +18,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -99,8 +98,8 @@ public void update() { } if (waterCount == WATER_CHECK_SIZE) { LootTable table = world.getLootTableManager().getLootTableFromLocation(LootTableList.GAMEPLAY_FISHING); - NonNullList itemStacks = NonNullList.create(); - itemStacks.addAll(table.generateLootForPools(world.rand, new LootContext.Builder(world).build())); + List itemStacks = table.generateLootForPools(world.rand, + new LootContext.Builder(world).build()); if (GTTransferUtils.addItemsToItemHandler(exportItems, true, itemStacks)) { GTTransferUtils.addItemsToItemHandler(exportItems, false, itemStacks); energyContainer.removeEnergy(energyAmountPerFish); diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java index 91fd07df207..78603f145d1 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java @@ -278,7 +278,7 @@ public T getCapability(Capability capability, EnumFacing side) { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { super.clearMachineInventory(itemBuffer); clearInventory(itemBuffer, chargerInventory); } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMaintenanceHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMaintenanceHatch.java index dda660e024f..31c87a58251 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMaintenanceHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMaintenanceHatch.java @@ -112,7 +112,7 @@ protected void initializeInventory() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { super.clearMachineInventory(itemBuffer); clearInventory(itemBuffer, itemStackHandler); } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java index 5bc07d2e793..4634293686a 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMufflerHatch.java @@ -24,7 +24,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -35,6 +34,7 @@ import codechicken.lib.render.pipeline.IVertexOperation; import codechicken.lib.vec.Matrix4; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -75,7 +75,7 @@ public void update() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { clearInventory(itemBuffer, inventory); } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java index efb526a0616..c55fcbfeaa8 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java @@ -24,7 +24,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; @@ -75,7 +74,7 @@ private boolean isSlotBlocked() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { clearInventory(itemBuffer, heldItems); } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java index b60a9781bed..febd79c80d6 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityPassthroughHatchItem.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; @@ -141,7 +140,7 @@ protected boolean shouldSerializeInventories() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { clearInventory(itemBuffer, itemStackHandler); } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java index d78b7fe5042..1fd863b864f 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityRotorHolder.java @@ -28,7 +28,6 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -295,7 +294,7 @@ public void onLeftClick(EntityPlayer player, EnumFacing facing, CuboidRayTraceRe } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { super.clearMachineInventory(itemBuffer); clearInventory(itemBuffer, inventory); } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostablePart.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostablePart.java index 9084eeed969..c71b4acf74e 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostablePart.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityAEHostablePart.java @@ -8,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import appeng.api.AEApi; @@ -30,6 +29,7 @@ import java.io.IOException; import java.util.EnumSet; +import java.util.List; import static gregtech.api.capability.GregtechDataCodes.UPDATE_ONLINE_STATUS; @@ -61,7 +61,7 @@ public void update() { * So there is no need to drop them. */ @Override - public void clearMachineInventory(NonNullList itemBuffer) {} + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) {} @Override public void writeInitialSyncData(PacketBuffer buf) { diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/hpca/MetaTileEntityHPCAComponent.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/hpca/MetaTileEntityHPCAComponent.java index 4a8da7d2234..35a257ad2cf 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/hpca/MetaTileEntityHPCAComponent.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/hpca/MetaTileEntityHPCAComponent.java @@ -25,7 +25,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -236,7 +235,7 @@ public boolean shouldDropWhenDestroyed() { } @Override - public void getDrops(NonNullList dropsList, @Nullable EntityPlayer harvester) { + public void getDrops(@NotNull List<@NotNull ItemStack> dropsList, @Nullable EntityPlayer harvester) { if (canBeDamaged() && isDamaged()) { if (isAdvanced()) { dropsList.add(MetaBlocks.COMPUTER_CASING diff --git a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java index a39ebdfff58..b88dd4e658d 100644 --- a/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java +++ b/src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java @@ -372,7 +372,7 @@ public SoundEvent getSound() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { super.clearMachineInventory(itemBuffer); clearInventory(itemBuffer, containerInventory); } diff --git a/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeLogic.java b/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeLogic.java index f5efc438a37..035b741ef76 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeLogic.java +++ b/src/main/java/gregtech/common/metatileentities/storage/CraftingRecipeLogic.java @@ -14,7 +14,6 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -24,6 +23,7 @@ import com.google.common.collect.Lists; import java.util.Collections; +import java.util.List; import java.util.Map; public class CraftingRecipeLogic { @@ -111,9 +111,8 @@ public boolean performRecipe(EntityPlayer player) { return false; } ForgeHooks.setCraftingPlayer(player); - NonNullList remainingItems = cachedRecipe.getRemainingItems(inventoryCrafting); // todo right here is - // where tools get - // damaged (in UI) + // todo right here is where tools get damaged (in UI) + List remainingItems = cachedRecipe.getRemainingItems(inventoryCrafting); ForgeHooks.setCraftingPlayer(null); for (int i = 0; i < remainingItems.size(); i++) { ItemStack itemStack = remainingItems.get(i); diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java index a7fa403e9db..855b0501edf 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.items.ItemStackHandler; @@ -29,6 +28,7 @@ import codechicken.lib.vec.Matrix4; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Pair; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -147,7 +147,7 @@ public void addToolUsages(ItemStack stack, @Nullable World world, List t } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { clearInventory(itemBuffer, itemStackHandler); } } diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java index 235ea73f8c3..1f00f06818b 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCrate.java @@ -19,7 +19,6 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -40,6 +39,7 @@ import com.cleanroommc.modularui.widgets.ItemSlot; import com.cleanroommc.modularui.widgets.layout.Grid; import org.apache.commons.lang3.tuple.Pair; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -87,7 +87,7 @@ protected void initializeInventory() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { if (!isTaped) { clearInventory(itemBuffer, inventory); } diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java index bd6dca83fb8..085ca35b1fa 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java @@ -31,7 +31,6 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.ITextComponent; @@ -513,7 +512,7 @@ public boolean isAllowInputFromOutputSideFluids() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { clearInventory(itemBuffer, importItems); } diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java index 93dc559bb11..879c657d6fe 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java @@ -31,7 +31,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.items.ItemStackHandler; @@ -182,7 +181,7 @@ private CraftingRecipeLogic getCraftingRecipeLogic() { } @Override - public void clearMachineInventory(NonNullList itemBuffer) { + public void clearMachineInventory(@NotNull List<@NotNull ItemStack> itemBuffer) { super.clearMachineInventory(itemBuffer); clearInventory(itemBuffer, internalInventory); clearInventory(itemBuffer, toolInventory);