Skip to content

Commit 8244e82

Browse files
gustovafinggustovafing
committed
spotless stuff, create IGregtechBlockEntity
1 parent 9e6d600 commit 8244e82

File tree

96 files changed

+378
-530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+378
-530
lines changed

‎src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void onNeighborChange(BlockState state, LevelReader level, BlockPos pos,
168168
pipeTile.setConnection(facing, true, false);
169169
if (open && !canConnect)
170170
pipeTile.setConnection(facing, false, false);
171-
updateActiveNodeStatus(pipeTile.getPipeLevel(), pos, pipeTile);
171+
updateActiveNodeStatus(pipeTile.getLevel(), pos, pipeTile);
172172
}
173173
PipeNet<NodeDataType> net = pipeTile.getPipeNet();
174174
if (net != null) {
@@ -198,7 +198,7 @@ public IPipeNode<PipeType, NodeDataType> getPipeTile(BlockGetter level, BlockPos
198198
protected void onActiveModeChange(Level world, BlockPos pos, boolean isActiveNow, boolean isInitialChange) {}
199199

200200
public boolean canConnect(IPipeNode<PipeType, NodeDataType> selfTile, Direction facing) {
201-
if (selfTile.getPipeLevel().getBlockState(selfTile.getPipePos().relative(facing)).getBlock() == Blocks.AIR)
201+
if (selfTile.getLevel().getBlockState(selfTile.getBlockPos().relative(facing)).getBlock() == Blocks.AIR)
202202
return false;
203203
CoverBehavior cover = selfTile.getCoverContainer().getCoverAtSide(facing);
204204
if (cover != null && !cover.canPipePassThrough()) {

‎src/main/java/com/gregtechceu/gtceu/api/blockentity/IGregtechBlockEntity.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.gregtechceu.gtceu.api.blockentity;
2+
3+
import com.gregtechceu.gtceu.GTCEu;
4+
import com.gregtechceu.gtceu.syncsystem.ISyncManaged;
5+
6+
import net.minecraft.core.BlockPos;
7+
import net.minecraft.core.Direction;
8+
import net.minecraft.world.level.Level;
9+
import net.minecraft.world.level.block.Block;
10+
import net.minecraft.world.level.block.entity.BlockEntity;
11+
import net.minecraft.world.level.block.state.BlockState;
12+
import net.minecraftforge.common.extensions.IForgeBlockEntity;
13+
14+
public interface IGregtechBlockEntity extends ISyncManaged, ITickSubscription, IForgeBlockEntity {
15+
16+
Level getLevel();
17+
18+
BlockPos getBlockPos();
19+
20+
BlockState getBlockState();
21+
22+
long getOffsetTimer();
23+
24+
boolean isRemoved();
25+
26+
void notifyBlockUpdate();
27+
28+
void scheduleNeighborShapeUpdate();
29+
30+
void markAsChanged();
31+
32+
default boolean isRemote() {
33+
return getLevel() == null ? GTCEu.isClientThread() : getLevel().isClientSide;
34+
}
35+
36+
default void scheduleRenderUpdate() {
37+
var pos = getBlockPos();
38+
var level = getLevel();
39+
if (level != null) {
40+
var state = getLevel().getBlockState(pos);
41+
if (level.isClientSide) {
42+
level.sendBlockUpdated(pos, state, state, Block.UPDATE_IMMEDIATE);
43+
requestModelDataUpdate();
44+
} else {
45+
level.blockEvent(pos, state.getBlock(), 1, 0);
46+
}
47+
}
48+
}
49+
50+
default BlockEntity getNeighbor(Direction direction) {
51+
return getLevel().getBlockEntity(getBlockPos().relative(direction));
52+
}
53+
}

‎src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.gregtechceu.gtceu.api.pipenet.*;
1515
import com.gregtechceu.gtceu.common.data.GTMaterialBlocks;
1616
import com.gregtechceu.gtceu.common.data.GTMaterials;
17-
import com.gregtechceu.gtceu.common.datafixers.TagFixer;
1817
import com.gregtechceu.gtceu.syncsystem.ManagedSyncBlockEntity;
1918
import com.gregtechceu.gtceu.syncsystem.annotations.RerenderOnChanged;
2019
import com.gregtechceu.gtceu.syncsystem.annotations.SaveField;
@@ -27,7 +26,6 @@
2726
import net.minecraft.core.BlockPos;
2827
import net.minecraft.core.Direction;
2928
import net.minecraft.core.particles.ParticleTypes;
30-
import net.minecraft.nbt.CompoundTag;
3129
import net.minecraft.server.level.ServerLevel;
3230
import net.minecraft.world.InteractionResult;
3331
import net.minecraft.world.entity.player.Player;
@@ -99,10 +97,6 @@ public PipeBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState blockSt
9997
//////////////////////////////////////
10098
// ***** Initialization ******//
10199
//////////////////////////////////////
102-
public void scheduleRenderUpdate() {
103-
IPipeNode.super.scheduleRenderUpdate();
104-
}
105-
106100
@Override
107101
public long getOffsetTimer() {
108102
return level == null ? offset : (level.getServer().getTickCount() + offset);
@@ -283,7 +277,7 @@ private void syncPipeConnections(Direction side, IPipeNode<?, ?> pipe) {
283277

284278
private void updateNetworkConnection(Direction side, boolean connected) {
285279
LevelPipeNet<?, ?> worldPipeNet = getPipeBlock().getWorldPipeNet((ServerLevel) getLevel());
286-
worldPipeNet.updateBlockedConnections(getPipePos(), side, !connected);
280+
worldPipeNet.updateBlockedConnections(this.getBlockPos(), side, !connected);
287281
}
288282

289283
protected int withSideConnection(int blockedConnections, Direction side, boolean connected) {
@@ -398,7 +392,7 @@ public Pair<GTToolType, InteractionResult> onToolClick(Set<GTToolType> toolTypes
398392
}
399393
} else {
400394
if (!frameMaterial.isNull()) {
401-
Block.popResource(getLevel(), getPipePos(),
395+
Block.popResource(getLevel(), this.getBlockPos(),
402396
GTMaterialBlocks.MATERIAL_BLOCKS.get(TagPrefix.frameGt, frameMaterial).asStack());
403397
frameMaterial = GTMaterials.NULL;
404398
return Pair.of(GTToolType.CROWBAR, InteractionResult.sidedSuccess(playerIn.level().isClientSide));
@@ -420,13 +414,14 @@ public int getDefaultPaintingColor() {
420414
}
421415

422416
public void doExplosion(float explosionPower) {
423-
getLevel().removeBlock(getPipePos(), false);
417+
getLevel().removeBlock(this.getBlockPos(), false);
424418
if (!getLevel().isClientSide) {
425-
((ServerLevel) getLevel()).sendParticles(ParticleTypes.LARGE_SMOKE, getPipePos().getX() + 0.5,
426-
getPipePos().getY() + 0.5, getPipePos().getZ() + 0.5,
419+
((ServerLevel) getLevel()).sendParticles(ParticleTypes.LARGE_SMOKE, this.getBlockPos().getX() + 0.5,
420+
this.getBlockPos().getY() + 0.5, this.getBlockPos().getZ() + 0.5,
427421
10, 0.2, 0.2, 0.2, 0.0);
428422
}
429-
getLevel().explode(null, getPipePos().getX() + 0.5, getPipePos().getY() + 0.5, getPipePos().getZ() + 0.5,
423+
getLevel().explode(null, this.getBlockPos().getX() + 0.5, this.getBlockPos().getY() + 0.5,
424+
this.getBlockPos().getZ() + 0.5,
430425
explosionPower, Level.ExplosionInteraction.NONE);
431426
}
432427

‎src/main/java/com/gregtechceu/gtceu/api/capability/ICoverable.java‎

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.gregtechceu.gtceu.api.capability;
22

33
import com.gregtechceu.gtceu.GTCEu;
4+
import com.gregtechceu.gtceu.api.blockentity.IGregtechBlockEntity;
45
import com.gregtechceu.gtceu.api.blockentity.ITickSubscription;
56
import com.gregtechceu.gtceu.api.cover.CoverBehavior;
67
import com.gregtechceu.gtceu.api.cover.CoverDefinition;
8+
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
79
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
10+
import com.gregtechceu.gtceu.syncsystem.ISyncManaged;
811
import com.gregtechceu.gtceu.utils.GTUtil;
912

1013
import net.minecraft.core.BlockPos;
@@ -31,23 +34,56 @@
3134
import java.util.Objects;
3235
import java.util.stream.Collectors;
3336

34-
public interface ICoverable extends ITickSubscription {
37+
public interface ICoverable extends ITickSubscription, ISyncManaged {
3538

36-
Level getLevel();
39+
IGregtechBlockEntity getHolder();
3740

38-
BlockPos getPos();
41+
default Level getLevel() {
42+
return getHolder().getLevel();
43+
}
44+
45+
default BlockPos getBlockPos() {
46+
return getHolder().getBlockPos();
47+
}
48+
49+
default BlockState getState() {
50+
return getHolder().getBlockState();
51+
}
52+
53+
default long getOffsetTimer() {
54+
return getHolder().getOffsetTimer();
55+
}
56+
57+
default boolean isRemoved() {
58+
return getHolder().isRemoved();
59+
}
3960

40-
BlockState getState();
61+
default void notifyBlockUpdate() {
62+
getHolder().notifyBlockUpdate();
63+
}
4164

42-
long getOffsetTimer();
65+
default void scheduleRenderUpdate() {
66+
getHolder().notifyBlockUpdate();
67+
}
4368

44-
boolean isInValid();
69+
default void scheduleNeighborShapeUpdate() {
70+
getHolder().scheduleNeighborShapeUpdate();
71+
}
4572

46-
void notifyBlockUpdate();
73+
default void markAsChanged() {
74+
getHolder().markAsChanged();
75+
}
4776

48-
void scheduleRenderUpdate();
77+
@Nullable
78+
@Override
79+
default TickableSubscription subscribeServerTick(Runnable runnable) {
80+
return getHolder().subscribeServerTick(runnable);
81+
}
4982

50-
void scheduleNeighborShapeUpdate();
83+
@Override
84+
default void unsubscribe(@Nullable TickableSubscription current) {
85+
getHolder().unsubscribe(current);
86+
}
5187

5288
boolean canPlaceCoverOnSide(CoverDefinition definition, Direction side);
5389

@@ -109,7 +145,7 @@ default boolean removeCover(boolean dropItself, Direction side, @Nullable Player
109145
if (player != null && player.getInventory().add(dropStack))
110146
continue;
111147

112-
Block.popResource(getLevel(), getPos(), dropStack);
148+
Block.popResource(getLevel(), getBlockPos(), dropStack);
113149

114150
}
115151
notifyBlockUpdate();

‎src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void markAsChanged() {
9292
*/
9393
@MustBeInvokedByOverriders
9494
public boolean canAttach() {
95-
var machine = MetaMachine.getMachine(coverHolder.getLevel(), coverHolder.getPos());
95+
var machine = MetaMachine.getMachine(coverHolder.getLevel(), coverHolder.getBlockPos());
9696
return machine == null ||
9797
(machine.getDefinition().isAllowCoverOnFront() || !machine.hasFrontFacing() ||
9898
coverHolder.getFrontFacing() != attachedSide);

‎src/main/java/com/gregtechceu/gtceu/api/cover/IUICover.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ default CoverBehavior self() {
1818

1919
@Override
2020
default boolean isInvalid() {
21-
return self().coverHolder.isInValid() || self().coverHolder.getCoverAtSide(self().attachedSide) != self();
21+
return self().coverHolder.isRemoved() || self().coverHolder.getCoverAtSide(self().attachedSide) != self();
2222
}
2323

2424
@Override

‎src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void loadFilterFromItem() {
160160
if (filter instanceof SmartItemFilter smart &&
161161
container instanceof CoverBehavior cover &&
162162
cover.coverHolder instanceof MachineCoverContainer mcc) {
163-
var machine = MetaMachine.getMachine(mcc.getLevel(), mcc.getPos());
163+
var machine = MetaMachine.getMachine(mcc.getLevel(), mcc.getBlockPos());
164164
if (machine != null) {
165165
smart.setModeFromMachine(machine.getDefinition().getName());
166166
}

‎src/main/java/com/gregtechceu/gtceu/api/gui/factory/CoverUIFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected CoverBehavior readHolderFromSyncData(FriendlyByteBuf syncData) {
4848

4949
@Override
5050
protected void writeHolderToSyncData(FriendlyByteBuf syncData, CoverBehavior holder) {
51-
syncData.writeBlockPos(holder.coverHolder.getPos());
51+
syncData.writeBlockPos(holder.coverHolder.getBlockPos());
5252
syncData.writeEnum(holder.attachedSide);
5353
}
5454
}

‎src/main/java/com/gregtechceu/gtceu/api/gui/widget/PatternPreviewWidget.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.gregtechceu.gtceu.GTCEu;
44
import com.gregtechceu.gtceu.api.block.MetaMachineBlock;
55
import com.gregtechceu.gtceu.api.gui.GuiTextures;
6-
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
76
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
87
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiController;
98
import com.gregtechceu.gtceu.api.pattern.BlockPattern;

‎src/main/java/com/gregtechceu/gtceu/api/machine/IMachineBlockEntity.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)