Skip to content

Commit c44f29e

Browse files
gustovafingjurrejelle
gustovafing
and
jurrejelle
authored
Remove IInteractedMachine (#4568)
Co-authored-by: Jurre Groenendijk <jurre@jilles.com>
1 parent 5a736a6 commit c44f29e

18 files changed

Lines changed: 94 additions & 133 deletions

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

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44
import com.gregtechceu.gtceu.api.data.RotationState;
55
import com.gregtechceu.gtceu.api.item.IGTTool;
66
import com.gregtechceu.gtceu.api.item.MetaMachineItem;
7-
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
8-
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
97
import com.gregtechceu.gtceu.api.machine.MachineDefinition;
108
import com.gregtechceu.gtceu.api.machine.MetaMachine;
119
import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
1210
import com.gregtechceu.gtceu.api.machine.feature.*;
13-
import com.gregtechceu.gtceu.api.machine.trait.feature.IInteractionTrait;
1411
import com.gregtechceu.gtceu.api.sync_system.ManagedSyncBlockEntity;
1512
import com.gregtechceu.gtceu.common.data.GTItems;
1613
import com.gregtechceu.gtceu.common.machine.owner.MachineOwner;
@@ -56,7 +53,6 @@
5653
import org.jetbrains.annotations.Nullable;
5754

5855
import java.util.List;
59-
import java.util.Set;
6056

6157
import javax.annotation.ParametersAreNonnullByDefault;
6258

@@ -277,18 +273,8 @@ public InteractionResult use(BlockState state, Level world, BlockPos pos, Player
277273
machine.setOwnerUUID(sPlayer.getUUID());
278274
}
279275

280-
Set<GTToolType> types = ToolHelper.getToolTypes(itemStack);
281-
if (!types.isEmpty() && ToolHelper.canUse(itemStack) || types.isEmpty() && player.isShiftKeyDown()) {
282-
var result = machine.onToolClick(types, itemStack, new UseOnContext(player, hand, hit));
283-
if (result.getSecond() == InteractionResult.CONSUME && player instanceof ServerPlayer serverPlayer) {
284-
ToolHelper.playToolSound(result.getFirst(), serverPlayer);
285-
286-
if (!serverPlayer.isCreative()) {
287-
ToolHelper.damageItem(itemStack, serverPlayer, 1);
288-
}
289-
}
290-
if (result.getSecond() != InteractionResult.PASS) return result.getSecond();
291-
}
276+
InteractionResult machineInteractResult = machine.onUse(state, world, pos, player, hand, hit);
277+
if (machineInteractResult != InteractionResult.PASS) return machineInteractResult;
292278

293279
if (itemStack.is(GTItems.PORTABLE_SCANNER.get())) {
294280
return itemStack.getItem().use(world, player, hand).getResult();
@@ -298,17 +284,6 @@ public InteractionResult use(BlockState state, Level world, BlockPos pos, Player
298284
shouldOpenUi = gtToolItem.definition$shouldOpenUIAfterUse(new UseOnContext(player, hand, hit));
299285
}
300286

301-
for (var trait : machine.getTraitHolder().getAllTraits()) {
302-
if (trait instanceof IInteractionTrait interactionTrait) {
303-
InteractionResult result = interactionTrait.onUse(state, world, pos, player, hand, hit);
304-
if (result != InteractionResult.PASS) return result;
305-
}
306-
}
307-
308-
if (machine instanceof IInteractedMachine interactedMachine) {
309-
var result = interactedMachine.onUse(state, world, pos, player, hand, hit);
310-
if (result != InteractionResult.PASS) return result;
311-
}
312287
if (shouldOpenUi && machine instanceof IUIMachine uiMachine &&
313288
MachineOwner.canOpenOwnerMachine(player, machine)) {
314289
return uiMachine.tryToOpenUI(player, hand, hit);

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.gregtechceu.gtceu.api.gui.fancy.IFancyTooltip;
1818
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
1919
import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight;
20+
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
2021
import com.gregtechceu.gtceu.api.machine.feature.*;
2122
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
2223
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMultiPart;
@@ -390,6 +391,46 @@ protected InteractionResult onScrewdriverClick(Player playerIn, InteractionHand
390391
return InteractionResult.PASS;
391392
}
392393

394+
/**
395+
* Called when a machine is right clicked.
396+
*/
397+
public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand,
398+
BlockHitResult hit) {
399+
ItemStack itemStack = player.getItemInHand(hand);
400+
401+
Set<GTToolType> types = ToolHelper.getToolTypes(itemStack);
402+
if (!types.isEmpty() && ToolHelper.canUse(itemStack) || types.isEmpty() && player.isShiftKeyDown()) {
403+
var result = onToolClick(types, itemStack, new UseOnContext(player, hand, hit));
404+
if (result.getSecond() == InteractionResult.CONSUME && player instanceof ServerPlayer serverPlayer) {
405+
ToolHelper.playToolSound(result.getFirst(), serverPlayer);
406+
407+
if (!serverPlayer.isCreative()) {
408+
ToolHelper.damageItem(itemStack, serverPlayer, 1);
409+
}
410+
}
411+
if (result.getSecond() != InteractionResult.PASS) return result.getSecond();
412+
}
413+
414+
for (var trait : getTraitHolder().getAllTraits()) {
415+
if (trait instanceof IInteractionTrait interactionTrait) {
416+
InteractionResult result = interactionTrait.onUse(state, world, pos, player, hand, hit);
417+
if (result != InteractionResult.PASS) return result;
418+
}
419+
}
420+
421+
return InteractionResult.PASS;
422+
}
423+
424+
/**
425+
* Called when a machine is left clicked.
426+
*
427+
* @return true to cancel the click event, false to continue processing
428+
*/
429+
public boolean onLeftClick(Player player, Level world, InteractionHand hand, BlockPos pos,
430+
@Nullable Direction face) {
431+
return false;
432+
}
433+
393434
//////////////////////////////////////
394435
// ********** MISC ***********//
395436
//////////////////////////////////////

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

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

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
package com.gregtechceu.gtceu.api.machine.feature.multiblock;
22

33
import com.gregtechceu.gtceu.api.capability.IParallelHatch;
4-
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
54
import com.gregtechceu.gtceu.api.machine.feature.IMachineFeature;
65
import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
76
import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
87
import com.gregtechceu.gtceu.api.pattern.BlockPattern;
98
import com.gregtechceu.gtceu.api.pattern.MultiblockState;
10-
import com.gregtechceu.gtceu.client.renderer.MultiblockInWorldPreviewRenderer;
11-
import com.gregtechceu.gtceu.config.ConfigHolder;
129

1310
import net.minecraft.core.BlockPos;
1411
import net.minecraft.core.Direction;
15-
import net.minecraft.world.InteractionHand;
16-
import net.minecraft.world.InteractionResult;
17-
import net.minecraft.world.entity.player.Player;
18-
import net.minecraft.world.level.Level;
1912
import net.minecraft.world.level.block.state.BlockState;
2013
import net.minecraft.world.level.block.state.properties.BooleanProperty;
21-
import net.minecraft.world.phys.BlockHitResult;
2214

2315
import org.jetbrains.annotations.NotNull;
2416
import org.jetbrains.annotations.Nullable;
@@ -28,7 +20,7 @@
2820
import java.util.Optional;
2921
import java.util.concurrent.locks.Lock;
3022

31-
public interface IMultiController extends IMachineFeature, IInteractedMachine {
23+
public interface IMultiController extends IMachineFeature {
3224

3325
BooleanProperty IS_FORMED_PROPERTY = GTMachineModelProperties.IS_FORMED;
3426

@@ -196,22 +188,6 @@ default Comparator<IMultiPart> getPartSorter() {
196188
return self().getDefinition().getPartSorter().apply(self());
197189
}
198190

199-
/**
200-
* Show the preview of structure.
201-
*/
202-
@Override
203-
default InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand,
204-
BlockHitResult hit) {
205-
if (!self().isFormed() && player.isShiftKeyDown() && player.getItemInHand(hand).isEmpty()) {
206-
if (world.isClientSide()) {
207-
MultiblockInWorldPreviewRenderer.showPreview(pos, self(),
208-
ConfigHolder.INSTANCE.client.inWorldPreviewDuration * 20);
209-
}
210-
return InteractionResult.SUCCESS;
211-
}
212-
return IInteractedMachine.super.onUse(state, world, pos, player, hand, hit);
213-
}
214-
215191
default boolean allowCircuitSlots() {
216192
return true;
217193
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@
1717
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
1818
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
1919
import com.gregtechceu.gtceu.client.model.machine.MachineRenderState;
20+
import com.gregtechceu.gtceu.client.renderer.MultiblockInWorldPreviewRenderer;
21+
import com.gregtechceu.gtceu.config.ConfigHolder;
2022

2123
import net.minecraft.MethodsReturnNonnullByDefault;
2224
import net.minecraft.core.BlockPos;
2325
import net.minecraft.core.Direction;
2426
import net.minecraft.server.level.ServerLevel;
27+
import net.minecraft.world.InteractionHand;
28+
import net.minecraft.world.InteractionResult;
29+
import net.minecraft.world.entity.player.Player;
30+
import net.minecraft.world.level.Level;
2531
import net.minecraft.world.level.block.state.BlockState;
32+
import net.minecraft.world.phys.BlockHitResult;
2633

2734
import lombok.Getter;
2835
import org.jetbrains.annotations.NotNull;
@@ -265,4 +272,17 @@ public void setFrontFacing(Direction facing) {
265272
checkPattern();
266273
}
267274
}
275+
276+
@Override
277+
public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand,
278+
BlockHitResult hit) {
279+
if (!isFormed() && player.isShiftKeyDown() && player.getItemInHand(hand).isEmpty()) {
280+
if (world.isClientSide()) {
281+
MultiblockInWorldPreviewRenderer.showPreview(pos, this,
282+
ConfigHolder.INSTANCE.client.inWorldPreviewDuration * 20);
283+
}
284+
return InteractionResult.SUCCESS;
285+
}
286+
return super.onUse(state, world, pos, player, hand, hit);
287+
}
268288
}

‎src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
1111
import com.gregtechceu.gtceu.api.machine.feature.IDataInfoProvider;
1212
import com.gregtechceu.gtceu.api.machine.feature.IExplosionMachine;
13-
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
1413
import com.gregtechceu.gtceu.api.machine.feature.IUIMachine;
1514
import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank;
1615
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
@@ -67,8 +66,7 @@
6766
@ParametersAreNonnullByDefault
6867
@MethodsReturnNonnullByDefault
6968
public abstract class SteamBoilerMachine extends SteamWorkableMachine
70-
implements IUIMachine, IExplosionMachine, IDataInfoProvider,
71-
IInteractedMachine {
69+
implements IUIMachine, IExplosionMachine, IDataInfoProvider {
7270

7371
@SaveField
7472
public final NotifiableFluidTank waterTank;
@@ -304,7 +302,7 @@ public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Play
304302
return InteractionResult.SUCCESS;
305303
}
306304
}
307-
return IInteractedMachine.super.onUse(state, world, pos, player, hand, hit);
305+
return super.onUse(state, world, pos, player, hand, hit);
308306
}
309307

310308
//////////////////////////////////////

‎src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/MaintenanceHatchPartMachine.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
99
import com.gregtechceu.gtceu.api.item.tool.ToolHelper;
1010
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
11-
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
1211
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine;
1312
import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine;
1413
import com.gregtechceu.gtceu.api.machine.property.GTMachineModelProperties;
@@ -55,7 +54,7 @@
5554
@ParametersAreNonnullByDefault
5655
@MethodsReturnNonnullByDefault
5756
public class MaintenanceHatchPartMachine extends TieredPartMachine
58-
implements IMaintenanceMachine, IInteractedMachine {
57+
implements IMaintenanceMachine {
5958

6059
private static final float MAX_DURATION_MULTIPLIER = 1.1f;
6160
private static final float MIN_DURATION_MULTIPLIER = 0.9f;
@@ -330,7 +329,7 @@ public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Play
330329
return InteractionResult.SUCCESS;
331330
}
332331
}
333-
return InteractionResult.PASS;
332+
return super.onUse(state, world, pos, player, hand, hit);
334333
}
335334

336335
//////////////////////////////////////

‎src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.gregtechceu.gtceu.api.gui.GuiTextures;
88
import com.gregtechceu.gtceu.api.gui.widget.BlockableSlotWidget;
99
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
10-
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
1110
import com.gregtechceu.gtceu.api.machine.feature.ITieredMachine;
1211
import com.gregtechceu.gtceu.api.machine.feature.multiblock.*;
1312
import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredPartMachine;
@@ -43,7 +42,7 @@
4342
@ParametersAreNonnullByDefault
4443
@MethodsReturnNonnullByDefault
4544
public class RotorHolderPartMachine extends TieredPartMachine
46-
implements IRotorHolderMachine, IInteractedMachine {
45+
implements IRotorHolderMachine {
4746

4847
@SaveField
4948
public final NotifiableItemStackHandler inventory;
@@ -217,8 +216,11 @@ public void setRotorStack(ItemStack rotorStack) {
217216
inventory.onContentsChanged();
218217
}
219218

219+
@Override
220220
public InteractionResult onUse(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
221221
BlockHitResult hit) {
222+
var superResult = super.onUse(state, level, pos, player, hand, hit);
223+
if (superResult != InteractionResult.PASS) return superResult;
222224
if (!isRemote() && getRotorSpeed() > 0 && !player.isCreative()) {
223225
TurbineRotorBehaviour behaviour = TurbineRotorBehaviour.getBehaviour(getRotorStack());
224226
if (behaviour != null) {

‎src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/monitor/AdvancedMonitorPartMachine.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo;
44
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
5-
import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
65
import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection;
76
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
87

@@ -19,8 +18,11 @@
1918
import lombok.Getter;
2019
import org.jetbrains.annotations.Nullable;
2120

21+
import javax.annotation.ParametersAreNonnullByDefault;
22+
2223
@MethodsReturnNonnullByDefault
23-
public class AdvancedMonitorPartMachine extends MonitorPartMachine implements IInteractedMachine {
24+
@ParametersAreNonnullByDefault
25+
public class AdvancedMonitorPartMachine extends MonitorPartMachine {
2426

2527
@Getter
2628
@SaveField
@@ -44,8 +46,7 @@ public AdvancedMonitorPartMachine(BlockEntityCreationInfo info) {
4446
@Override
4547
public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand,
4648
BlockHitResult hit) {
47-
if (hit.getDirection() != getFrontFacing())
48-
return IInteractedMachine.super.onUse(state, world, pos, player, hand, hit);
49+
if (hit.getDirection() != getFrontFacing()) return super.onUse(state, world, pos, player, hand, hit);
4950
clicked = true;
5051
clickPosX = hit.getLocation()
5152
.get(RelativeDirection.RIGHT.getRelative(getFrontFacing(), getUpwardsFacing(), false).getAxis());

‎src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamLiquidBoilerMachine.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,9 @@ protected void randomDisplayTick(RandomSource random, float x, float y, float z)
9797
public InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand,
9898
BlockHitResult hit) {
9999
if (!isRemote()) {
100-
if (super.onUse(state, world, pos, player, hand, hit) == InteractionResult.SUCCESS) {
101-
return InteractionResult.SUCCESS;
102-
}
103100
if (FluidUtil.interactWithFluidHandler(player, hand, fuelTank)) {
104101
return InteractionResult.SUCCESS;
105102
}
106-
return InteractionResult.PASS;
107103
}
108104
return super.onUse(state, world, pos, player, hand, hit);
109105
}

0 commit comments

Comments
 (0)