File tree 8 files changed +12
-16
lines changed
src/main/java/com/recursive_pineapple/matter_manipulator/common
8 files changed +12
-16
lines changed Original file line number Diff line number Diff line change 2
2
3
3
import java .util .Arrays ;
4
4
import java .util .Optional ;
5
- import java .util .stream .Collectors ;
6
5
7
6
import net .minecraft .inventory .IInventory ;
8
7
import net .minecraft .item .ItemStack ;
26
25
import appeng .parts .p2p .PartP2PTunnel ;
27
26
import appeng .parts .p2p .PartP2PTunnelNormal ;
28
27
29
- import com .gtnewhorizon .gtnhlib .util .map .ItemStackMap ;
30
28
import com .recursive_pineapple .matter_manipulator .common .building .BlockAnalyzer .IBlockApplyContext ;
31
29
import com .recursive_pineapple .matter_manipulator .common .utils .MMUtils ;
32
30
Original file line number Diff line number Diff line change 26
26
import net .minecraftforge .fluids .IFluidHandler ;
27
27
import net .minecraftforge .oredict .OreDictionary ;
28
28
29
- import com .recursive_pineapple .matter_manipulator .GlobalMMConfig .BuildingConfig ;
30
29
import gregtech .api .interfaces .tileentity .IColoredTileEntity ;
31
30
import gregtech .api .interfaces .tileentity .ICoverable ;
32
31
import gregtech .api .interfaces .tileentity .IGregTechTileEntity ;
49
48
import appeng .helpers .ICustomNameObject ;
50
49
import appeng .parts .AEBasePart ;
51
50
51
+ import com .recursive_pineapple .matter_manipulator .GlobalMMConfig .BuildingConfig ;
52
52
import com .recursive_pineapple .matter_manipulator .asm .Optional ;
53
53
import com .recursive_pineapple .matter_manipulator .common .items .manipulator .ItemMatterManipulator ;
54
54
import com .recursive_pineapple .matter_manipulator .common .items .manipulator .ItemMatterManipulator .ManipulatorTier ;
Original file line number Diff line number Diff line change 13
13
14
14
import net .minecraftforge .common .util .ForgeDirection ;
15
15
16
- import com .gtnewhorizon .structurelib .alignment .enumerable .Flip ;
17
16
import gregtech .api .enums .ItemList ;
18
17
import gregtech .api .enums .VoidingMode ;
19
18
import gregtech .api .interfaces .IConfigurationCircuitSupport ;
38
37
import com .gtnewhorizon .structurelib .alignment .IAlignment ;
39
38
import com .gtnewhorizon .structurelib .alignment .IAlignmentProvider ;
40
39
import com .gtnewhorizon .structurelib .alignment .enumerable .ExtendedFacing ;
40
+ import com .gtnewhorizon .structurelib .alignment .enumerable .Flip ;
41
41
import com .recursive_pineapple .matter_manipulator .MMMod ;
42
42
import com .recursive_pineapple .matter_manipulator .common .building .BlockAnalyzer .IBlockApplyContext ;
43
43
import com .recursive_pineapple .matter_manipulator .common .items .manipulator .Transform ;
Original file line number Diff line number Diff line change @@ -90,14 +90,10 @@ public BooleanObjectImmutablePair<List<BigItemStack>> tryConsumeItems(List<BigIt
90
90
91
91
// if we aren't allowed to partially consume items, make sure everything was consumed
92
92
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 ); }
96
94
}
97
95
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 )); }
101
97
102
98
visitedGrids .clear ();
103
99
Original file line number Diff line number Diff line change 41
41
import net .minecraftforge .common .util .ForgeDirection ;
42
42
import net .minecraftforge .event .entity .living .LivingDeathEvent ;
43
43
44
- import com .recursive_pineapple .matter_manipulator .GlobalMMConfig ;
45
44
import cpw .mods .fml .common .FMLCommonHandler ;
46
45
import cpw .mods .fml .common .Optional .Interface ;
47
46
import cpw .mods .fml .common .Optional .InterfaceList ;
80
79
import com .gtnewhorizons .modularui .common .widget .TextWidget ;
81
80
import com .gtnewhorizons .modularui .common .widget .VanillaButtonWidget ;
82
81
import com .gtnewhorizons .modularui .common .widget .textfield .NumericWidget ;
82
+ import com .recursive_pineapple .matter_manipulator .GlobalMMConfig ;
83
83
import com .recursive_pineapple .matter_manipulator .MMMod ;
84
84
import com .recursive_pineapple .matter_manipulator .client .gui .DirectionDrawable ;
85
85
import com .recursive_pineapple .matter_manipulator .client .gui .RadialMenuBuilder ;
Original file line number Diff line number Diff line change 21
21
import com .recursive_pineapple .matter_manipulator .MMMod ;
22
22
import com .recursive_pineapple .matter_manipulator .asm .Optional ;
23
23
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
+
26
25
import tectech .thing .metaTileEntity .hatch .MTEHatchRack ;
27
26
28
27
public enum InventoryAdapter {
29
28
30
29
GTUnrestricted {
30
+
31
31
@ Override
32
32
public boolean canHandle (IInventory inv ) {
33
33
return GregTech .isModLoaded () && canHandleImpl (inv );
Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ public boolean isSameAs(ItemStack stack) {
176
176
if (item () != stack .getItem ()) return false ;
177
177
if (metaData () != Items .feather .getDamage (stack )) return false ;
178
178
if (!Objects .equals (nbt (), stack .getTagCompound ())) return false ;
179
-
179
+
180
180
return true ;
181
181
}
182
182
}
Original file line number Diff line number Diff line change 72
72
import net .minecraftforge .common .util .ForgeDirection ;
73
73
import net .minecraftforge .fluids .IFluidHandler ;
74
74
75
- import com .recursive_pineapple .matter_manipulator .MMMod ;
76
75
import cpw .mods .fml .relauncher .ReflectionHelper ;
77
76
78
77
import gregtech .api .GregTechAPI ;
100
99
import com .google .gson .JsonParseException ;
101
100
import com .google .gson .JsonPrimitive ;
102
101
import com .gtnewhorizon .structurelib .util .XSTR ;
102
+ import com .recursive_pineapple .matter_manipulator .MMMod ;
103
103
import com .recursive_pineapple .matter_manipulator .asm .Optional ;
104
104
import com .recursive_pineapple .matter_manipulator .common .building .BlockAnalyzer ;
105
105
import com .recursive_pineapple .matter_manipulator .common .building .BlockAnalyzer .IBlockApplyContext ;
@@ -462,6 +462,7 @@ public static Object2LongOpenHashMap<ItemId> getItemStackHistogram(Iterable<Item
462
462
}
463
463
464
464
public static class StackMapDiff {
465
+
465
466
public Object2LongOpenHashMap <ItemId > added = new Object2LongOpenHashMap <>();
466
467
public Object2LongOpenHashMap <ItemId > removed = new Object2LongOpenHashMap <>();
467
468
}
@@ -866,7 +867,8 @@ public static boolean installUpgrades(
866
867
dest ,
867
868
split ,
868
869
slot ,
869
- new Exception ());
870
+ new Exception ()
871
+ );
870
872
871
873
if (src instanceof IBlockApplyContext ctx ) {
872
874
ctx .error ("Tried to install too many upgrades: voiding the rest (this is a bug, please report it)" );
You can’t perform that action at this time.
0 commit comments