Skip to content

Commit 1244507

Browse files
spotless
1 parent 49da9e3 commit 1244507

File tree

8 files changed

+12
-16
lines changed

8 files changed

+12
-16
lines changed

src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AEPartData.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Arrays;
44
import java.util.Optional;
5-
import java.util.stream.Collectors;
65

76
import net.minecraft.inventory.IInventory;
87
import net.minecraft.item.ItemStack;
@@ -26,7 +25,6 @@
2625
import appeng.parts.p2p.PartP2PTunnel;
2726
import appeng.parts.p2p.PartP2PTunnelNormal;
2827

29-
import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
3028
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
3129
import com.recursive_pineapple.matter_manipulator.common.utils.MMUtils;
3230

src/main/java/com/recursive_pineapple/matter_manipulator/common/building/AbstractBuildable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import net.minecraftforge.fluids.IFluidHandler;
2727
import net.minecraftforge.oredict.OreDictionary;
2828

29-
import com.recursive_pineapple.matter_manipulator.GlobalMMConfig.BuildingConfig;
3029
import gregtech.api.interfaces.tileentity.IColoredTileEntity;
3130
import gregtech.api.interfaces.tileentity.ICoverable;
3231
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -49,6 +48,7 @@
4948
import appeng.helpers.ICustomNameObject;
5049
import appeng.parts.AEBasePart;
5150

51+
import com.recursive_pineapple.matter_manipulator.GlobalMMConfig.BuildingConfig;
5252
import com.recursive_pineapple.matter_manipulator.asm.Optional;
5353
import com.recursive_pineapple.matter_manipulator.common.items.manipulator.ItemMatterManipulator;
5454
import com.recursive_pineapple.matter_manipulator.common.items.manipulator.ItemMatterManipulator.ManipulatorTier;

src/main/java/com/recursive_pineapple/matter_manipulator/common/building/GTAnalysisResult.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import net.minecraftforge.common.util.ForgeDirection;
1515

16-
import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
1716
import gregtech.api.enums.ItemList;
1817
import gregtech.api.enums.VoidingMode;
1918
import gregtech.api.interfaces.IConfigurationCircuitSupport;
@@ -38,6 +37,7 @@
3837
import com.gtnewhorizon.structurelib.alignment.IAlignment;
3938
import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
4039
import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
40+
import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
4141
import com.recursive_pineapple.matter_manipulator.MMMod;
4242
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
4343
import com.recursive_pineapple.matter_manipulator.common.items.manipulator.Transform;

src/main/java/com/recursive_pineapple/matter_manipulator/common/building/MMInventory.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,10 @@ public BooleanObjectImmutablePair<List<BigItemStack>> tryConsumeItems(List<BigIt
9090

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

98-
if ((flags & CONSUME_SIMULATED) != 0) {
99-
return BooleanObjectImmutablePair.of(true, merge(extracted));
100-
}
96+
if ((flags & CONSUME_SIMULATED) != 0) { return BooleanObjectImmutablePair.of(true, merge(extracted)); }
10197

10298
visitedGrids.clear();
10399

src/main/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/ItemMatterManipulator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import net.minecraftforge.common.util.ForgeDirection;
4242
import net.minecraftforge.event.entity.living.LivingDeathEvent;
4343

44-
import com.recursive_pineapple.matter_manipulator.GlobalMMConfig;
4544
import cpw.mods.fml.common.FMLCommonHandler;
4645
import cpw.mods.fml.common.Optional.Interface;
4746
import cpw.mods.fml.common.Optional.InterfaceList;
@@ -80,6 +79,7 @@
8079
import com.gtnewhorizons.modularui.common.widget.TextWidget;
8180
import com.gtnewhorizons.modularui.common.widget.VanillaButtonWidget;
8281
import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
82+
import com.recursive_pineapple.matter_manipulator.GlobalMMConfig;
8383
import com.recursive_pineapple.matter_manipulator.MMMod;
8484
import com.recursive_pineapple.matter_manipulator.client.gui.DirectionDrawable;
8585
import com.recursive_pineapple.matter_manipulator.client.gui.RadialMenuBuilder;

src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/InventoryAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import com.recursive_pineapple.matter_manipulator.MMMod;
2222
import com.recursive_pineapple.matter_manipulator.asm.Optional;
2323
import com.recursive_pineapple.matter_manipulator.common.utils.Mods.Names;
24-
import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
25-
import gregtech.common.tileentities.machines.MTEHatchOutputME;
24+
2625
import tectech.thing.metaTileEntity.hatch.MTEHatchRack;
2726

2827
public enum InventoryAdapter {
2928

3029
GTUnrestricted {
30+
3131
@Override
3232
public boolean canHandle(IInventory inv) {
3333
return GregTech.isModLoaded() && canHandleImpl(inv);

src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/ItemId.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public boolean isSameAs(ItemStack stack) {
176176
if (item() != stack.getItem()) return false;
177177
if (metaData() != Items.feather.getDamage(stack)) return false;
178178
if (!Objects.equals(nbt(), stack.getTagCompound())) return false;
179-
179+
180180
return true;
181181
}
182182
}

src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/MMUtils.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
import net.minecraftforge.common.util.ForgeDirection;
7373
import net.minecraftforge.fluids.IFluidHandler;
7474

75-
import com.recursive_pineapple.matter_manipulator.MMMod;
7675
import cpw.mods.fml.relauncher.ReflectionHelper;
7776

7877
import gregtech.api.GregTechAPI;
@@ -100,6 +99,7 @@
10099
import com.google.gson.JsonParseException;
101100
import com.google.gson.JsonPrimitive;
102101
import com.gtnewhorizon.structurelib.util.XSTR;
102+
import com.recursive_pineapple.matter_manipulator.MMMod;
103103
import com.recursive_pineapple.matter_manipulator.asm.Optional;
104104
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer;
105105
import com.recursive_pineapple.matter_manipulator.common.building.BlockAnalyzer.IBlockApplyContext;
@@ -462,6 +462,7 @@ public static Object2LongOpenHashMap<ItemId> getItemStackHistogram(Iterable<Item
462462
}
463463

464464
public static class StackMapDiff {
465+
465466
public Object2LongOpenHashMap<ItemId> added = new Object2LongOpenHashMap<>();
466467
public Object2LongOpenHashMap<ItemId> removed = new Object2LongOpenHashMap<>();
467468
}
@@ -866,7 +867,8 @@ public static boolean installUpgrades(
866867
dest,
867868
split,
868869
slot,
869-
new Exception());
870+
new Exception()
871+
);
870872

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

0 commit comments

Comments
 (0)