From dc976486677197e2df9223067347043a5c22dfa7 Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Sat, 8 Jun 2024 02:44:03 +0800 Subject: Maintenance cleanup (#2632) * cleanup * waila * fix & compatibility --------- Co-authored-by: Martin Robertz --- .../multi/drone/GT_MetaTileEntity_DroneCentre.java | 10 +++++----- .../drone/GT_MetaTileEntity_Hatch_DroneDownLink.java | 15 ++------------- 2 files changed, 7 insertions(+), 18 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/multi/drone') diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java index 2bb224cdb7..6580047b9c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_DroneCentre.java @@ -278,7 +278,6 @@ public class GT_MetaTileEntity_DroneCentre extends @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { - fixAll(); if (aTick % 20 == 0) { if (switch (droneLevel) { case 1 -> getBaseMetaTileEntity().getRandomNumber(28800); @@ -484,10 +483,6 @@ public class GT_MetaTileEntity_DroneCentre extends .setBlock((int) (x + xOffset), (int) (y + yOffset), (int) (z + zOffset), Blocks.air); } - private void fixAll() { - this.mWrench = this.mScrewdriver = this.mSoftHammer = this.mHardHammer = this.mCrowbar = this.mSolderingTool = true; - } - @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); @@ -909,4 +904,9 @@ public class GT_MetaTileEntity_DroneCentre extends public static HashMultimap getCentreMap() { return droneMap; } + + @Override + public boolean getDefaultHasMaintenanceChecks() { + return false; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java index 959b6874ba..33dad93d52 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/GT_MetaTileEntity_Hatch_DroneDownLink.java @@ -113,7 +113,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat doNormalMaintain(); } else { // Centre offline? ...do nothing. - // doRandomIssue(); + // machine.causeMaintenanceIssue(); } } else { // If the connection invalid, set it to null. @@ -123,7 +123,7 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat tryFindConnection(); // Let's have some "surprise". Sorry, surprise party is over. // if (this.machine != null && this.machine.isValid()) { - // doRandomIssue(); + // machine.causeMaintenanceIssue(); } } } @@ -201,17 +201,6 @@ public class GT_MetaTileEntity_Hatch_DroneDownLink extends GT_MetaTileEntity_Hat } } - private void doRandomIssue() { - switch (getBaseMetaTileEntity().getRandomNumber(6)) { - case 0 -> machine.mWrench = !machine.mWrench; - case 1 -> machine.mScrewdriver = !machine.mScrewdriver; - case 2 -> machine.mSoftHammer = !machine.mSoftHammer; - case 3 -> machine.mCrowbar = !machine.mCrowbar; - case 4 -> machine.mSolderingTool = !connection.machine.mSolderingTool; - case 5 -> machine.mHardHammer = !connection.machine.mHardHammer; - } - } - // Find mainframe. Mainly from a method in GT_API——This will cause performance issue! Do not call it frequently. private GT_MetaTileEntity_MultiBlockBase tryFindCoreGTMultiBlock() { Queue tQueue = new LinkedList<>(); -- cgit