diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2023-10-18 15:50:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-18 15:50:16 +0800 |
| commit | b5cfc6cb5c7a783970fdeccb5b4cd4dc593874a9 (patch) | |
| tree | 625ff52c5ceb172e3c7d01fa9e9c96756d73756b /src/main | |
| parent | aca0387fbc3390d4327f6ba980a42d83bac77ecb (diff) | |
| download | GT5-Unofficial-b5cfc6cb5c7a783970fdeccb5b4cd4dc593874a9.tar.gz GT5-Unofficial-b5cfc6cb5c7a783970fdeccb5b4cd4dc593874a9.tar.bz2 GT5-Unofficial-b5cfc6cb5c7a783970fdeccb5b4cd4dc593874a9.zip | |
fix ofBlocksTiered notSet misuse (#248)
Diffstat (limited to 'src/main')
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 347f323243..103a375926 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -682,7 +682,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl 'A', ofBlocksTiered( (block, meta) -> block == TT_Container_Casings.SpacetimeCompressionFieldGenerators ? meta - : -1, + : null, ImmutableList.of( Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 0), Pair.of(TT_Container_Casings.SpacetimeCompressionFieldGenerators, 1), @@ -699,7 +699,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addElement( 'S', ofBlocksTiered( - (block, meta) -> block == TT_Container_Casings.StabilisationFieldGenerators ? meta : -1, + (block, meta) -> block == TT_Container_Casings.StabilisationFieldGenerators ? meta : null, ImmutableList.of( Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 0), Pair.of(TT_Container_Casings.StabilisationFieldGenerators, 1), @@ -722,7 +722,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl .addElement( 'E', ofBlocksTiered( - (block, meta) -> block == TT_Container_Casings.TimeAccelerationFieldGenerator ? meta : -1, + (block, meta) -> block == TT_Container_Casings.TimeAccelerationFieldGenerator ? meta : null, ImmutableList.of( Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 0), Pair.of(TT_Container_Casings.TimeAccelerationFieldGenerator, 1), diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index a28cb98274..5284555921 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -205,7 +205,8 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock .addElement( 'D', ofBlocksTiered( - (block, meta) -> block != sBlockCasingsBA0 ? -1 : meta <= 5 ? meta : meta == 9 ? 6 : -1, + (block, meta) -> block != sBlockCasingsBA0 ? null + : meta <= 5 ? Integer.valueOf(meta) : meta == 9 ? 6 : null, IntStream.range(0, 7).map(tier -> tier == 6 ? 9 : tier) .mapToObj(meta -> Pair.of(sBlockCasingsBA0, meta)).collect(Collectors.toList()), -1, |