Skip to content

Commit fb2b4e2

Browse files
gustovafinggustovafing
committed
remove a bunch of unnecessary calls to IMachineFeature.self
1 parent 102d3b9 commit fb2b4e2

28 files changed

Lines changed: 68 additions & 68 deletions

‎src/main/java/com/gregtechceu/gtceu/api/machine/feature/IMachineFeature.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.gregtechceu.gtceu.api.machine.feature;
22

3+
import com.gregtechceu.gtceu.api.blockentity.IGregtechBlockEntity;
34
import com.gregtechceu.gtceu.api.machine.MetaMachine;
45

5-
public interface IMachineFeature {
6+
public interface IMachineFeature extends IGregtechBlockEntity {
67

78
default MetaMachine self() {
89
return (MetaMachine) this;

‎src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/MultiblockControllerMachine.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import net.minecraft.server.TickTask;
3131
import net.minecraft.server.level.ServerLevel;
3232
import net.minecraft.world.InteractionResult;
33+
import net.minecraft.world.level.block.entity.BlockEntity;
3334
import net.minecraft.world.level.block.state.BlockState;
3435

3536
import brachy.modularui.api.widget.IWidget;
@@ -154,7 +155,7 @@ public <T extends MachineTrait> List<T> getTraitsFromParts(MachineTraitType<T> t
154155

155156
protected void updatePartPositions() {
156157
this.partPositions = this.parts.isEmpty() ? new BlockPos[0] :
157-
this.parts.stream().map(part -> part.self().getBlockPos()).toArray(BlockPos[]::new);
158+
this.parts.stream().map(BlockEntity::getBlockPos).toArray(BlockPos[]::new);
158159
syncDataHolder.markClientSyncFieldDirty("partPositions");
159160
}
160161

@@ -188,7 +189,7 @@ public Optional<ParallelHatchPartMachine> getParallelHatch() {
188189

189190
public void checkAndFormStructure() {
190191
if (!(getLevel() instanceof ServerLevel serverLevel)) return;
191-
if (self().isRemoved()) return;
192+
if (isRemoved()) return;
192193
for (var entry : patternStates.entrySet()) {
193194
String name = entry.getKey();
194195
PatternState patternState = getPatternState(name);
@@ -440,7 +441,7 @@ protected void forEachFormed(String name, BiConsumer<BlockInfo, BlockPos.Mutable
440441
* {@link PatternState#onBlockStateChanged(BlockPos, BlockState, BlockState)}
441442
*/
442443
public void onPartUnload() {
443-
parts.removeIf(part -> part.self().isRemoved());
444+
parts.removeIf(BlockEntity::isRemoved);
444445
updatePartPositions();
445446
}
446447

‎src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public final GTRecipe doModifyRecipe(GTRecipe recipe) {
212212

213213
@Nullable
214214
protected GTRecipe getRealRecipe(GTRecipe recipe) {
215-
return self().getDefinition().getRecipeModifier().applyModifier(self(), recipe);
215+
return getDefinition().getRecipeModifier().applyModifier(this, recipe);
216216
}
217217

218218
public void updateActiveBlocks(boolean active) {
@@ -238,9 +238,9 @@ public void recipeLogicStatusChanged(RecipeLogic.Status oldStatus, RecipeLogic.S
238238
}
239239
for (MultiblockPartMachine part : getParts()) {
240240
part.recipeLogicStatusChanged(oldStatus, newStatus);
241-
MachineRenderState state = part.self().getRenderState();
241+
MachineRenderState state = part.getRenderState();
242242
if (state.hasProperty(GTMachineModelProperties.RECIPE_LOGIC_STATUS)) {
243-
part.self().setRenderState(state.setValue(GTMachineModelProperties.RECIPE_LOGIC_STATUS, newStatus));
243+
part.setRenderState(state.setValue(GTMachineModelProperties.RECIPE_LOGIC_STATUS, newStatus));
244244
}
245245
}
246246
}

‎src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/part/MultiblockPartMachine.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void onUnload() {
139139
toIter = new ObjectOpenHashSet<>(controllers);
140140
}
141141
for (MultiblockControllerMachine controller : toIter) {
142-
if (serverLevel.isLoaded(controller.self().getBlockPos())) {
142+
if (serverLevel.isLoaded(controller.getBlockPos())) {
143143
removedFromController(controller);
144144
controller.onPartUnload();
145145
}

‎src/main/java/com/gregtechceu/gtceu/api/machine/trait/notifiable/NotifiableComputationContainer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public int requestCWUt(int cwut, boolean simulate, Collection<IOpticalComputatio
7777
if (controller instanceof IOpticalComputationProvider provider) {
7878
return provider.requestCWUt(cwut, simulate, seen);
7979
}
80-
for (MachineTrait trait : controller.self().getAllTraits()) {
80+
for (MachineTrait trait : controller.getAllTraits()) {
8181
if (trait instanceof IOpticalComputationProvider provider) {
8282
return provider.requestCWUt(cwut, simulate, seen);
8383
}
@@ -122,7 +122,7 @@ public int getMaxCWUt(Collection<IOpticalComputationProvider> seen) {
122122
if (controller instanceof IOpticalComputationProvider provider) {
123123
return provider.getMaxCWUt(seen);
124124
}
125-
for (MachineTrait trait : controller.self().getAllTraits()) {
125+
for (MachineTrait trait : controller.getAllTraits()) {
126126
if (trait instanceof IOpticalComputationProvider provider) {
127127
return provider.getMaxCWUt(seen);
128128
}
@@ -166,7 +166,7 @@ public boolean canBridge(Collection<IOpticalComputationProvider> seen) {
166166
if (controller instanceof IOpticalComputationProvider provider) {
167167
return provider.canBridge(seen);
168168
}
169-
for (MachineTrait trait : controller.self().getAllTraits()) {
169+
for (MachineTrait trait : controller.getAllTraits()) {
170170
if (trait instanceof IOpticalComputationProvider provider) {
171171
return provider.canBridge(seen);
172172
}

‎src/main/java/com/gregtechceu/gtceu/api/mui/factory/MachineUIFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ private MachineUIFactory() {
3535
public void open(ServerPlayer player, IMuiMachine machine) {
3636
Objects.requireNonNull(player);
3737
Objects.requireNonNull(machine);
38-
if (machine.self().isRemoved()) {
38+
if (machine.isRemoved()) {
3939
throw new IllegalArgumentException("Can't open invalid MetaMachine GUI!");
4040
}
41-
if (player.level() != machine.self().getLevel()) {
41+
if (player.level() != machine.getLevel()) {
4242
throw new IllegalArgumentException("MetaMachine must be in same dimension as the player!");
4343
}
44-
BlockPos pos = machine.self().getBlockPos();
44+
BlockPos pos = machine.getBlockPos();
4545
PosGuiData data = new PosGuiData(player, pos);
4646
GuiManager.open(this, data, player);
4747
}

‎src/main/java/com/gregtechceu/gtceu/api/multiblock/pattern/PatternState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void setErrors(@Nullable List<PatternError> error) {
8181
public void onBlockStateChanged(BlockPos pos, BlockState oldState, BlockState newState) {
8282
if (!(currentBlockInfo.getLevel() instanceof ServerLevel serverLevel)) return;
8383
if (pos.equals(controllerPos)) {
84-
if (controller != null && !newState.is(controller.self().getBlockState().getBlock())) {
84+
if (controller != null && !newState.is(controller.getBlockState().getBlock())) {
8585
controller.invalidateStructure(MultiblockControllerMachine.DEFAULT_STRUCTURE);
8686
MultiblockWorldSavedData.getOrCreate(serverLevel).removeMapping(this);
8787
}

‎src/main/java/com/gregtechceu/gtceu/api/multiblock/util/RelativeDirection.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ public ToIntFunction<MultiblockPartMachine> getMultiSorter(Direction frontFacing
8888

8989
// Determined by Direction.Axis + Direction.AxisDirection
9090
return switch (sorterDirection) {
91-
case UP -> p -> p.self().getBlockPos().getY();
92-
case DOWN -> p -> -p.self().getBlockPos().getY();
93-
case EAST -> p -> p.self().getBlockPos().getX();
94-
case WEST -> p -> -p.self().getBlockPos().getX();
95-
case NORTH -> p -> -p.self().getBlockPos().getZ();
96-
case SOUTH -> p -> p.self().getBlockPos().getZ();
91+
case UP -> p -> p.getBlockPos().getY();
92+
case DOWN -> p -> -p.getBlockPos().getY();
93+
case EAST -> p -> p.getBlockPos().getX();
94+
case WEST -> p -> -p.getBlockPos().getX();
95+
case NORTH -> p -> -p.getBlockPos().getZ();
96+
case SOUTH -> p -> p.getBlockPos().getZ();
9797
};
9898
}
9999

‎src/main/java/com/gregtechceu/gtceu/client/model/machine/IMachineRendererModel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface IMachineRendererModel<T extends IMachineFeature> {
3434
default @NotNull List<BakedQuad> getRenderQuads(@Nullable T machine, @Nullable BlockAndTintGetter level,
3535
@Nullable BlockPos pos, @Nullable BlockState blockState,
3636
@Nullable Direction side, RandomSource rand,
37-
@NotNull ModelData modelData, @Nullable RenderType renderType) {
37+
ModelData modelData, @Nullable RenderType renderType) {
3838
return Collections.emptyList();
3939
}
4040

@@ -51,15 +51,15 @@ default boolean shouldRenderOffScreen(T machine) {
5151
}
5252

5353
default boolean shouldRender(T machine, Vec3 cameraPos) {
54-
return Vec3.atCenterOf(machine.self().getBlockPos()).closerThan(cameraPos, this.getViewDistance());
54+
return Vec3.atCenterOf(machine.getBlockPos()).closerThan(cameraPos, this.getViewDistance());
5555
}
5656

5757
default int getViewDistance() {
5858
return 64;
5959
}
6060

6161
default AABB getRenderBoundingBox(T machine) {
62-
BlockPos pos = machine.self().getBlockPos();
62+
BlockPos pos = machine.getBlockPos();
6363
return new AABB(pos.offset(-1, 0, -1), pos.offset(2, 2, 2));
6464
}
6565

‎src/main/java/com/gregtechceu/gtceu/client/renderer/machine/impl/BoilerMultiPartRender.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.mojang.serialization.Codec;
3232
import com.mojang.serialization.codecs.RecordCodecBuilder;
3333
import lombok.Getter;
34-
import org.jetbrains.annotations.NotNull;
3534
import org.jetbrains.annotations.Nullable;
3635

3736
import java.util.List;
@@ -95,7 +94,7 @@ public boolean isBlockEntityRenderer() {
9594
public void renderPartModel(List<BakedQuad> quads, MultiblockControllerMachine controller,
9695
MultiblockPartMachine part,
9796
Direction frontFacing, @Nullable Direction side, RandomSource rand,
98-
@NotNull ModelData modelData, @Nullable RenderType renderType) {
97+
ModelData modelData, @Nullable RenderType renderType) {
9998
if (this.fireboxIdleModel == null) {
10099
this.fireboxIdleModel = RenderUtil.getModelForState(fireboxIdle);
101100
}
@@ -106,7 +105,7 @@ public void renderPartModel(List<BakedQuad> quads, MultiblockControllerMachine c
106105
this.casingModel = RenderUtil.getModelForState(casing);
107106
}
108107

109-
BlockPos partPos = part.self().getBlockPos();
108+
BlockPos partPos = part.getBlockPos();
110109

111110
BlockPos controllerPos = controller.getBlockPos();
112111
Direction multiFront = controller.getFrontFacing();

0 commit comments

Comments
 (0)