diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEPartData.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEPartData.java index 66a98eb..35384bf 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEPartData.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEPartData.java @@ -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; @@ -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; diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AbstractBuildable.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AbstractBuildable.java index 515fa35..66aa6b4 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AbstractBuildable.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AbstractBuildable.java @@ -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; @@ -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; diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/GTAnalysisResult.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/GTAnalysisResult.java index cf915b8..270d612 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/GTAnalysisResult.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/GTAnalysisResult.java @@ -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; @@ -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; diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/MMInventory.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/MMInventory.java index 3ebcad0..fbd89a2 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/MMInventory.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/MMInventory.java @@ -90,14 +90,10 @@ public BooleanObjectImmutablePair> tryConsumeItems(List 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(); diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/ItemMatterManipulator.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/ItemMatterManipulator.java index 7404d67..fbc99c8 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/ItemMatterManipulator.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/ItemMatterManipulator.java @@ -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; @@ -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; diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/InventoryAdapter.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/InventoryAdapter.java index 7314a34..b295d8c 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/InventoryAdapter.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/InventoryAdapter.java @@ -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); diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/ItemId.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/ItemId.java index 8df2782..62042f1 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/ItemId.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/ItemId.java @@ -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; } } diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/MMUtils.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/MMUtils.java index 1ff9b72..a940408 100644 --- a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/MMUtils.java +++ b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/MMUtils.java @@ -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; @@ -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; @@ -462,6 +462,7 @@ public static Object2LongOpenHashMap getItemStackHistogram(Iterable added = new Object2LongOpenHashMap<>(); public Object2LongOpenHashMap removed = new Object2LongOpenHashMap<>(); } @@ -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)");