Skip to content

Commit e4d35da

Browse files
committed
when the spotless is applied
1 parent 42f5935 commit e4d35da

File tree

6 files changed

+23
-14
lines changed

6 files changed

+23
-14
lines changed

src/main/java/com/gregtechceu/gtceu/common/cover/ender/EnderItemLinkCover.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public EnderItemLinkCover(CoverDefinition definition, ICoverable coverHolder, Di
4545
super(definition, coverHolder, attachedSide);
4646
itemsLeftToTransferLastSecond = TRANSFER_RATE * 20;
4747
filterHandler = FilterHandlers.item(this);
48-
if (!isRemote()) setEntry(VirtualEnderRegistry.getInstance().getOrCreateEntry(getOwner(), EntryTypes.ENDER_ITEM, getChannelName()));
48+
if (!isRemote()) setEntry(VirtualEnderRegistry.getInstance().getOrCreateEntry(getOwner(), EntryTypes.ENDER_ITEM,
49+
getChannelName()));
4950
}
5051

5152
@Override

src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public enum DisplayMode {
7373
SHOW_RECIPE_INFO("behavior.portable_scanner.mode.show_recipe_info"),
7474
SHOW_ENVIRONMENTAL_INFO("behavior.portable_scanner.mode.show_environmental_info"),
7575
SHOW_INTERNAL_JAVA_INFO("behavior.portable_scanner.mode.show_internal_info");
76+
7677
private final String langKey;
7778

7879
DisplayMode(String langKey) {
@@ -449,9 +450,10 @@ else if (machine instanceof IDataInfoProvider)
449450
}
450451
}
451452

452-
if (mode == DisplayMode.SHOW_INTERNAL_JAVA_INFO && tileEntity instanceof ManagedSyncBlockEntity syncBlockEntity) {
453+
if (mode == DisplayMode.SHOW_INTERNAL_JAVA_INFO &&
454+
tileEntity instanceof ManagedSyncBlockEntity syncBlockEntity) {
453455
MetaMachineBlockEntity mmbe = (syncBlockEntity instanceof MetaMachineBlockEntity m) ? m : null;
454-
PipeBlockEntity<?, ?> pipe = (syncBlockEntity instanceof PipeBlockEntity<?,?> p) ? p : null;
456+
PipeBlockEntity<?, ?> pipe = (syncBlockEntity instanceof PipeBlockEntity<?, ?> p) ? p : null;
455457

456458
list.add(Component.literal(syncBlockEntity.toString()));
457459
if (mmbe != null) list.add(Component.literal(mmbe.getMetaMachine().toString()));
@@ -462,14 +464,15 @@ else if (machine instanceof IDataInfoProvider)
462464
list.add(Component.translatable("behavior.portable_scanner.divider"));
463465

464466
list.add(Component.literal("Covers"));
465-
ICoverable coverable = mmbe != null ? mmbe.getMetaMachine().getCoverContainer() : (pipe != null ? pipe.getCoverContainer() : null);
467+
ICoverable coverable = mmbe != null ? mmbe.getMetaMachine().getCoverContainer() :
468+
(pipe != null ? pipe.getCoverContainer() : null);
466469
if (coverable != null) {
467-
for (var dir: GTUtil.DIRECTIONS) {
470+
for (var dir : GTUtil.DIRECTIONS) {
468471
var cover = coverable.getCoverAtSide(dir);
469472
list.add(Component.literal(dir.getName() + ": " + (cover != null ? cover.toString() : "null")));
470473
}
471474
}
472-
475+
473476
list.add(Component.translatable("behavior.portable_scanner.divider"));
474477
list.add(Component.literal("Save data"));
475478
nbtFormat(list, syncBlockEntity.getSyncDataHolder().serializeNBT(false));

src/main/java/com/gregtechceu/gtceu/syncsystem/SyncDataHolder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ public void deserializeNBT(CompoundTag tag, boolean readingClientFields) {
134134
}
135135
} catch (Throwable e) {
136136
if (e instanceof WrongMethodTypeException) {
137-
throw new IllegalArgumentException("Invalid method signature for change listener for field %s %s".formatted(field.fieldName, holder.getClass().getCanonicalName()));
137+
throw new IllegalArgumentException(
138+
"Invalid method signature for change listener for field %s %s"
139+
.formatted(field.fieldName, holder.getClass().getCanonicalName()));
138140
}
139141
GTCEu.LOGGER.error("Sync: Error while invoking change listener for field {}", field.fieldName);
140142
GTCEu.LOGGER.error(e);

src/main/java/com/gregtechceu/gtceu/syncsystem/data_transformers/CoverBehaviorTransformer.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import net.minecraft.nbt.CompoundTag;
1212
import net.minecraft.nbt.Tag;
1313
import net.minecraft.resources.ResourceLocation;
14-
1514
import net.minecraft.world.item.ItemStack;
15+
1616
import org.jetbrains.annotations.Nullable;
1717

1818
import java.util.Objects;
@@ -64,15 +64,13 @@ private CompoundTag serialize(CoverBehavior cover, ICoverable holder, boolean is
6464

6565
public CoverBehavior deserialize(CompoundTag tag, ICoverable holder, @Nullable CoverBehavior cover,
6666
boolean isSync) {
67-
6867
/// Ldlib backwards compat
6968
if (tag.contains("payload") && tag.contains("uid")) {
7069
tag.putInt("side", tag.getCompound("uid").getInt("side"));
7170
tag.putString("coverType", tag.getCompound("uid").getString("id"));
7271
tag.put("data", tag.getCompound("payload").getCompound("d"));
7372
}
7473

75-
7674
Direction side = Direction.values()[tag.getInt("side")];
7775

7876
if (tag.isEmpty() || tag.getString("coverType").isEmpty()) {
@@ -90,7 +88,8 @@ public CoverBehavior deserialize(CompoundTag tag, ICoverable holder, @Nullable C
9088
holder.setCoverAtSide(coverReg.createCoverBehavior(holder, side), side);
9189
}
9290

93-
Objects.requireNonNull(holder.getCoverAtSide(side)).getSyncDataHolder().deserializeNBT(tag.getCompound("data"), isSync);
91+
Objects.requireNonNull(holder.getCoverAtSide(side)).getSyncDataHolder().deserializeNBT(tag.getCompound("data"),
92+
isSync);
9493

9594
if (!isSync && holder.getCoverAtSide(side).getAttachItem() == ItemStack.EMPTY) {
9695
GTCEu.LOGGER.error("Invalid cover save state, this should never happen unless loading corrupted data.");

src/main/java/com/gregtechceu/gtceu/syncsystem/data_transformers/collections/ListTransformer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public Tag serializeNBT(List<T> value, ISyncManaged holder) {
3030
public List<T> deserializeNBT(Tag tag, ISyncManaged holder, List<T> current) {
3131
if (!(tag instanceof ListTag listTag) || elementTransformer == null) return List.of();
3232

33-
return listTag.stream().map((t) -> elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(t), null, null)).toList();
33+
return listTag.stream()
34+
.map((t) -> elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(t), null, null))
35+
.toList();
3436
}
3537
}

src/main/java/com/gregtechceu/gtceu/syncsystem/data_transformers/collections/ObjectArrayTransformer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ public T[] deserializeNBT(Tag tag, ISyncManaged holder, T[] currentVal) {
4040

4141
for (int i = 0; i < listTag.size(); i++) {
4242
if (elementTransformer.mustProvideObject())
43-
elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(listTag.get(i)), null, currentVal[i]);
44-
else currentVal[i] = elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(listTag.get(i)), null, null);
43+
elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(listTag.get(i)), null,
44+
currentVal[i]);
45+
else currentVal[i] = elementTransformer.deserializeNBT(IValueTransformer.stripLdlibWrapper(listTag.get(i)),
46+
null, null);
4547
}
4648
return currentVal;
4749
}

0 commit comments

Comments
 (0)