Miner #2170

Tictim · 2023-11-16T05:25:21Z

What

Just a small refactor PR haha, don't worry

ok i just rewrote everything

Implementation Details

All contents of MinerLogic class was revisited and refactored. It now has:

Less unused properties (lol),
New, improved tick logic,
More flexible mining area API support, and more.

Among all other, the ore search algorithm is greatly improved; now the ore checking is handled by BlockUtility#isOre, with significantly less overhead compared to previous approach. Additionally, API for adding custom ore blockstate (or, excluding specific blockstate from ore) is available. I've migrated prospector widget to the new API.

All miner implementations were revisited as well, and they feature numerous major changes both code-wise and gameplay-wise.

All miner-related classes, as well as new ones, were moved to gregtech.common.metatileentities.miner. Client-sided packages are located in appropriate client packages.

All miners (both singleblock and multiblock) have new toggleable feature that visualizes miner's operating area in the world, accessible in UI. This feature was implemented with transitive flag, meaning the area preview will disappear once the miner gets unloaded. I don't know if this is a good idea. Also do NOT look into the rendering code, as the code in question is classified as [DATA EXPUNGED]

All miners have new UI, with more helpful information (hopefully) and less garbage internal values dumped in text panel.

Multiblock miners have three new features:

An option to adjust amount of Y layers to operate before stopping. For example, Y limit of 3 means the miner will operate 3 blocks deep before stopping.
An option to repeat scan on stop. Note that the behavior of miners are changed so they do not consume resources on idle scan.
An option to disable ore replacement. Normally, the ore block is replaced with cobblestone (or other config-specified block) unless that block is on mining pipe column. If you have the ore replacement disabled, the ore will be replaced with plain air instead.

Mining pipe has been re-implemented using entities, to provide proper collision and prevent players from just falling off the pit. The new mining pipe rendering uses customizable vanilla model system, and they properly render lighting effects now.

Also the singleblock miners have new textures.

Oh. Also the steam miner is gone. Rest in peas my bro ;((

Outcome

New recipe for all miners (both singleblock and multiblock).
Chunk mode does not have area 1 tile shorter than non-chunk mode area. (Well, it's the other way actually, non-chunk mode area was 1 tile longer than chunk mode area. Now they have identical ranges.)
Fixed bug that made miners void block on certain conditions, potentially resulting in removal of unbreakable/important block.

Additional Information

There's number of implementation details and behavior changes that need to be discussed before the PR gets accepted.

The update logic change introduces a good bit of delay to mining task. Previously the column block was deleted whenever the pipe needed to go there, and the new logic actually accounts mining pipe columns and applies delay to miner extending pipe / clearing out space for the pipe to go down. This behavior change will most likely slow down all miner's operation.
Miners no longer consume resources on idle scan. I don't know if this bit was a mistake, or intended design, but miners doing nothing while simultaneously eating away drilling fluid is kind of nonsense so here we go.
With the new changes the EV multiblock miner has less range than HV singleblock miner (48 vs 49). Idk I just find it funny
I just deleted entirety of screwdriver interaction, because you can adjust ranges using UI now, which is always better.

The method GTUtility#isOre was deprecated in favor of BlockUtility#isOre.

I'm planning to make standalone addon that adds back steam miner so anyone using it can keep the machine. I have few more ideas for the mod so I'll post about it on Discord or sth once it's done.

Potential Compatibility Issues

Existing words shouldn't blow up or anything, but the miner code is pretty much incompatible with previous one so most likely all configurations (maybe chunk mode/silktouch would be fine?) will reset and the miner will start over. Can't say much. Would appreciate if someone tests it.

A number of recipe and lang entry changes will need some work. Resource packs need to override new machine overlay for single miners.

If somebody says they're using miner code, they're not real. Don't trust a word.

…ssages, it's not funny, it's rather annoying and doesn't convey any meaningful information to outsiders. Just because you don't understand what you did in last 5 days doesn't mean you are exempted from your duties of explaining your works to your collaborators. Anyways, here's a small refactor.

# Conflicts: # build.gradle # src/main/java/gregtech/client/renderer/texture/Textures.java # src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java # src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeMiner.java # src/main/resources/assets/gregtech/lang/en_us.lang

…😭😭😭😭😭😭😭😭😭😭😭😭

serenibyss · 2023-11-16T15:58:23Z

src/main/java/gregtech/common/metatileentities/MetaTileEntities.java

@@ -314,8 +316,6 @@ public static void init() {
        STEAM_ROCK_BREAKER_BRONZE = registerMetaTileEntity(19, new SteamRockBreaker(gregtechId("steam_rock_breaker_bronze"), false));
        STEAM_ROCK_BREAKER_STEEL = registerMetaTileEntity(20, new SteamRockBreaker(gregtechId("steam_rock_breaker_steel"), true));

-        STEAM_MINER = registerMetaTileEntity(21, new SteamMiner(gregtechId("steam_miner"), 320, 4, 0));


Can you leave a comment saying that this ID is reserved for the steam miner addon, if you are going to use this id

src/main/java/gregtech/common/metatileentities/miner/LargeMinerTypes.java

serenibyss · 2023-11-16T16:02:01Z

src/main/java/gregtech/common/metatileentities/miner/MetaTileEntityLargeMiner.java

+
+    @Override
+    public boolean drainMiningResources(@Nonnull MinedBlockType minedBlockType, boolean pipeExtended, boolean simulate) {
+        if (minedBlockType == MinedBlockType.NOTHING) return true;


Does this mean that no energy is used in the scanning period while running a multiblock?

serenibyss · 2023-11-16T16:10:03Z

src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityCleanroom.java

@@ -26,6 +26,7 @@
 import gregtech.common.blocks.BlockGlassCasing;
 import gregtech.common.blocks.MetaBlocks;
 import gregtech.common.metatileentities.MetaTileEntities;
+import gregtech.common.metatileentities.miner.MetaTileEntityLargeMiner;


# Conflicts: # src/main/java/gregtech/api/capability/GregtechDataCodes.java # src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java # src/main/java/gregtech/api/util/GTUtility.java # src/main/java/gregtech/client/ClientProxy.java # src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java # src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeMiner.java # src/main/java/gregtech/common/metatileentities/steam/SteamMiner.java # src/main/resources/assets/gregtech/lang/en_us.lang

ALongStringOfNumbers

The Large Miner GUI should remember if you were on the information or configuration screen when you last closed the screen.

Also, the mining preview seems to go all the way to bedrock, but it might be better just to render it on the level that the controller is on.

Can this PR deal with all the stuff brought up in #1751, if it is even still applicable?

Having some issues with the Buttons for Silk Touch Mode, Chunk Mode, and Repeat After Finished. I am only able to change the button display when clicking on the Repeat After Finished button, which toggles all three buttons. At other times, clicking on the other two buttons does nothing (in GUI at least)

Thoughts on having the final multiblock miner require the Assembly Line for its recipe?

ALongStringOfNumbers · 2023-11-25T03:33:44Z

src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java

+                this.isHighPressure ? 12 : 6, true,
+                ConfigHolder.machines.machineSounds && !this.metaTileEntity.isMuffled())) {
+            setNeedsVenting(false);
+        } else {


Should this setVentingStuck here still first check !ventingStuck?

ALongStringOfNumbers · 2023-11-25T04:20:12Z

src/main/java/gregtech/common/metatileentities/miner/MetaTileEntityLargeMiner.java

+        long resultEnergy = energyContainer.getEnergyStored() - energyToDrain;
+        if (resultEnergy >= 0L && resultEnergy <= energyContainer.getEnergyCapacity()) {
+            if (!simulate) {
+                energyContainer.changeEnergy(-energyToDrain);


There is energyContainer.removeEnergy btw, if you want the additional clarity at all in the method calls

ALongStringOfNumbers · 2023-11-25T04:33:19Z

src/main/java/gregtech/common/metatileentities/miner/MetaTileEntityLargeMiner.java

+            state.getBlock().getDrops(drops, world, pos, state, 0); // fallback
+        }
+        boolean result = GTTransferUtils.addItemsToItemHandler(inventory, true, drops);
+        this.inventoryFull = result;


Is this correct? Just because we can add something to the inventory does not mean that the inventory will necessarily be full.

ALongStringOfNumbers · 2023-11-25T05:05:40Z

src/main/java/gregtech/common/metatileentities/miner/MetaTileEntityLargeMiner.java

+            int yLimit = this.minerLogic.getYLimit();
+            ITextComponent value;
+            ITextComponent hoverText;
+            if (yLimit > 0) {


This needs to be limited by the height of the multiblock above bedrock, or something that just prevents it from increasing forever

ALongStringOfNumbers · 2023-11-25T05:14:39Z

src/main/java/gregtech/common/metatileentities/miner/Miner.java

+     * @param simulate       If {@code true}, this action will not affect the state of the game
+     * @return Whether the action was successful
+     */
+    boolean drainMiningResources(@Nonnull MinedBlockType minedBlockType, boolean pipeExtended, boolean simulate);


The boolean for pipeExtended does not seem to be used in any of the implementations of this method. Was it left over from an old implementation?

# Conflicts: # src/main/java/gregtech/api/capability/IMiner.java # src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java # src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java # src/main/java/gregtech/api/capability/impl/miner/MultiblockMinerLogic.java # src/main/java/gregtech/api/capability/impl/miner/SteamMinerLogic.java # src/main/java/gregtech/api/gui/GuiTextures.java # src/main/java/gregtech/api/util/BlockUtility.java # src/main/java/gregtech/api/util/GTUtility.java # src/main/java/gregtech/client/ClientProxy.java # src/main/java/gregtech/client/renderer/texture/Textures.java # src/main/java/gregtech/common/MetaEntities.java # src/main/java/gregtech/common/metatileentities/MetaTileEntities.java # src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java # src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeMiner.java # src/main/java/gregtech/common/metatileentities/steam/SteamMiner.java # src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetProspectingMap.java # src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java

M-W-K · 2023-12-07T03:06:51Z

src/main/java/gregtech/common/metatileentities/miner/MetaTileEntityLargeMiner.java

+                            MinerUtil.DISPLAY_CLICK_CHUNK_MODE_ENABLE, MinerUtil.DISPLAY_CLICK_CHUNK_MODE_DISABLE)));
+
+            textList.add(new TextComponentTranslation("gregtech.machine.miner.display.silk_touch",
+                    toggleButton(this.minerLogic.isRepeat(), this.minerLogic.isWorking(),


Looks like all the GUI buttons are passing in this.minerLogic.isRepeat() for whether they are on or off, instead of their unique booleans.

# Conflicts: # src/main/java/gregtech/api/util/BlockUtility.java

# Conflicts: # src/main/java/gregtech/common/metatileentities/MetaTileEntities.java

Tictim added 19 commits September 26, 2023 22:05

Small refactor

c6a3a02

Smaller Refactor

6b1b652

Smallest Refactor

1df0cdc

Actually small this time

6199a55

Smallester miner retexture

48c0d1d

Smallestest refactor

55d55ee

Medium sized refactor

fad4158

Suspiciously sized refactor

87f39b9

Recipe tweak (first actually helpful commit message, this is shocking)

4f8cd7d

Rest in piss steam miner 😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭…

302193d

…😭😭😭😭😭😭😭😭😭😭😭😭

Relocate mining pipe model classes to client package

f028a3e

Relocate miner render helper class to client package

6747b3b

Fuck

51db077

?

0270073

Don't lie

783bb40

Fuck

a73ff6a

Lang cleanup

01c5058

Tictim requested a review from a team as a code owner November 16, 2023 05:25

Tictim added type: feature New feature or request type: refactor Suggestion to refactor a section of code labels Nov 16, 2023

serenibyss reviewed Nov 16, 2023

View reviewed changes

Tictim added 2 commits November 19, 2023 12:25

More GUI shenanigans

2b0350c

oops

427c106

serenibyss added this to the 2.8 milestone Nov 19, 2023

Tictim added 3 commits November 23, 2023 16:59

me and my boys merging

e7cac6d

review

7fe538c

ALongStringOfNumbers reviewed Nov 25, 2023

View reviewed changes

serenibyss removed this from the 2.8 milestone Nov 25, 2023

Tictim added 3 commits November 28, 2023 21:02

Merge branch 'master' into miner

8af6d50

change annotations

336ecc9

Tictim requested a review from a team as a code owner December 1, 2023 02:54

Merge branch 'master' into miner

528d5d7

M-W-K reviewed Dec 7, 2023

View reviewed changes

serenibyss removed the request for review from a team December 7, 2023 03:34

Tictim added 6 commits December 7, 2023 12:38

Merge branch 'master' into miner

94221d6

# Conflicts: # src/main/java/gregtech/api/util/BlockUtility.java

amo

d5293b5

fix button

6de4916

Merge branch 'master' into miner

5abe237

# Conflicts: # src/main/java/gregtech/common/metatileentities/MetaTileEntities.java

holy shit so many spots

b5047f3

Fuck you spotless

f31f2d1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Miner #2170

Miner #2170

Tictim commented Nov 16, 2023

serenibyss Nov 16, 2023

serenibyss Nov 16, 2023

serenibyss Nov 16, 2023

ALongStringOfNumbers left a comment

ALongStringOfNumbers Nov 25, 2023

ALongStringOfNumbers Nov 25, 2023

ALongStringOfNumbers Nov 25, 2023

ALongStringOfNumbers Nov 25, 2023

ALongStringOfNumbers Nov 25, 2023

M-W-K Dec 7, 2023

Miner #2170

Are you sure you want to change the base?

Miner #2170

Conversation

Tictim commented Nov 16, 2023

What

Implementation Details

Outcome

Additional Information

Potential Compatibility Issues

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ALongStringOfNumbers left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment