Skip to content

Commit

Permalink
spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
RecursivePineapple committed Feb 20, 2025
1 parent 49da9e3 commit 1244507
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.util.Arrays;
import java.util.Optional;
import java.util.stream.Collectors;

import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
Expand All @@ -26,7 +25,6 @@
import appeng.parts.p2p.PartP2PTunnel;
import appeng.parts.p2p.PartP2PTunnelNormal;

import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
import com.recursive_pineapple.matter_manipulator.common.utils.MMUtils;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.oredict.OreDictionary;

import com.recursive_pineapple.matter_manipulator.GlobalMMConfig.BuildingConfig;
import gregtech.api.interfaces.tileentity.IColoredTileEntity;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
Expand All @@ -49,6 +48,7 @@
import appeng.helpers.ICustomNameObject;
import appeng.parts.AEBasePart;

import com.recursive_pineapple.matter_manipulator.GlobalMMConfig.BuildingConfig;
import com.recursive_pineapple.matter_manipulator.asm.Optional;
import com.recursive_pineapple.matter_manipulator.common.items.manipulator.ItemMatterManipulator;
import com.recursive_pineapple.matter_manipulator.common.items.manipulator.ItemMatterManipulator.ManipulatorTier;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

import net.minecraftforge.common.util.ForgeDirection;

import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.VoidingMode;
import gregtech.api.interfaces.IConfigurationCircuitSupport;
Expand All @@ -38,6 +37,7 @@
import com.gtnewhorizon.structurelib.alignment.IAlignment;
import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
import com.recursive_pineapple.matter_manipulator.MMMod;
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
import com.recursive_pineapple.matter_manipulator.common.items.manipulator.Transform;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,10 @@ public BooleanObjectImmutablePair<List<BigItemStack>> tryConsumeItems(List<BigIt

// if we aren't allowed to partially consume items, make sure everything was consumed
if ((flags & CONSUME_PARTIAL) == 0) {
if (simulated.stream().anyMatch(s -> s.getStackSize() > 0)) {
return BooleanObjectImmutablePair.of(false, null);
}
if (simulated.stream().anyMatch(s -> s.getStackSize() > 0)) { return BooleanObjectImmutablePair.of(false, null); }
}

if ((flags & CONSUME_SIMULATED) != 0) {
return BooleanObjectImmutablePair.of(true, merge(extracted));
}
if ((flags & CONSUME_SIMULATED) != 0) { return BooleanObjectImmutablePair.of(true, merge(extracted)); }

visitedGrids.clear();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.entity.living.LivingDeathEvent;

import com.recursive_pineapple.matter_manipulator.GlobalMMConfig;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.InterfaceList;
Expand Down Expand Up @@ -80,6 +79,7 @@
import com.gtnewhorizons.modularui.common.widget.TextWidget;
import com.gtnewhorizons.modularui.common.widget.VanillaButtonWidget;
import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
import com.recursive_pineapple.matter_manipulator.GlobalMMConfig;
import com.recursive_pineapple.matter_manipulator.MMMod;
import com.recursive_pineapple.matter_manipulator.client.gui.DirectionDrawable;
import com.recursive_pineapple.matter_manipulator.client.gui.RadialMenuBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
import com.recursive_pineapple.matter_manipulator.MMMod;
import com.recursive_pineapple.matter_manipulator.asm.Optional;
import com.recursive_pineapple.matter_manipulator.common.utils.Mods.Names;
import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
import gregtech.common.tileentities.machines.MTEHatchOutputME;

import tectech.thing.metaTileEntity.hatch.MTEHatchRack;

public enum InventoryAdapter {

GTUnrestricted {

@Override
public boolean canHandle(IInventory inv) {
return GregTech.isModLoaded() && canHandleImpl(inv);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public boolean isSameAs(ItemStack stack) {
if (item() != stack.getItem()) return false;
if (metaData() != Items.feather.getDamage(stack)) return false;
if (!Objects.equals(nbt(), stack.getTagCompound())) return false;

return true;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidHandler;

import com.recursive_pineapple.matter_manipulator.MMMod;
import cpw.mods.fml.relauncher.ReflectionHelper;

import gregtech.api.GregTechAPI;
Expand Down Expand Up @@ -100,6 +99,7 @@
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.gtnewhorizon.structurelib.util.XSTR;
import com.recursive_pineapple.matter_manipulator.MMMod;
import com.recursive_pineapple.matter_manipulator.asm.Optional;
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer;
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
Expand Down Expand Up @@ -462,6 +462,7 @@ public static Object2LongOpenHashMap<ItemId> getItemStackHistogram(Iterable<Item
}

public static class StackMapDiff {

public Object2LongOpenHashMap<ItemId> added = new Object2LongOpenHashMap<>();
public Object2LongOpenHashMap<ItemId> removed = new Object2LongOpenHashMap<>();
}
Expand Down Expand Up @@ -866,7 +867,8 @@ public static boolean installUpgrades(
dest,
split,
slot,
new Exception());
new Exception()
);

if (src instanceof IBlockApplyContext ctx) {
ctx.error("Tried to install too many upgrades: voiding the rest (this is a bug, please report it)");
Expand Down

0 comments on commit 1244507

Please sign in to comment.