Add Apimancers Drainer #34

Quantumlyy · 2023-12-07T16:35:52Z

This PR does the following:

slightly cleans up the TileMagicApiary class
introduces a new block called the Phialing Cabinet as well as te Essentia bee to accompany it.

The Phialing cabinet is a block which when placed under any IBeeHousing implementing block will generate essentia (it will only generate the one it is attuned to; attuning is done the same way as on Essentia Hatches from GG).
It also has some conditions that need to be met before essentia is generated:

attuned
not full
placed under an Apiary, Bee House, Magic Apiary, Alviar, etc...
has a queen that can work (all conditions of the bee have to be met)
the queen is a Essentia bee

All aspects of the cabinet are configurable via the config file.
To note: the generated amount is multiplied by the production multiplier of the housing, bee, and frames.

gh.mp4

(bitrate is quite bad as the max size for GitHub is 10MB, a better version can be found in the magic-dev channel)
The video above is running the cabinet with the following parameters: the cabinet will generate 2 essentia every 10 ticks (multiplied by the production multiplier).

The PR still has a few steps left:

Texture/model for Phialing cabinet (to be provided by @Alastors)
localization strings for Essentia bee (en_US)
localization strings for Phialing cabinet (en_US)
Phialing Cabinet research text (en_US)
Phialing Cabinet infusion recipe
better wording in message provided when attuned
cleaner config option names

src/main/java/magicbees/bees/BeeSpecies.java

src/main/java/magicbees/client/gui/ContainerMagicApiary.java

src/main/java/magicbees/block/BlockPhialingCabinet.java

Alastors · 2024-01-21T19:39:24Z

Hi @Quantumlyy, Dream asked me to come and review this in Alastor's place, but I see that it currently fails to build, and while there is a big conversation there are still some unticked TODO checkboxes in the description and the preview video hosts some missing textures.
If you still want to get this in the pack, please make sure everything up to date again and then ping me on discord, I'll have a closer look at the changes then. Since Alastor's been all over it already I don't think there'll be much left to code review for me.

If you have any better naming ideas for the following config options please do tell me since personally, this is what I settled on but it could most certainly be improved: Same goes for the following message:

honestly the names look fine, since they have descriptions it shouldn't be an issue

combusterf · 2024-01-21T19:40:27Z

Apart from Apiamancer -> Apimancer ;)

combusterf

Indeed, very little left for me to have an opinion on.

combusterf · 2024-01-21T19:44:50Z

src/main/java/magicbees/main/Config.java

+                CATEGORY_GENERAL,
+                "drainerTimeBetween",
+                200,
+                "The time in ticks between Apiamancer's Drainer essentia generation",


Spelling: Apiamancer -> Apimancer

But the block is named the Apiamancer's Drainer.

It's quite annoying to not be able to find something in NEI because it's not spelled as expected.

src/main/java/magicbees/tileentity/TileEntityApiamancersDrainerGT.java

Quantumlyy · 2024-01-21T19:56:39Z

@combusterf @Alastors should the block be renamed to "Apimancer's drainer"?

Alastors · 2024-01-21T19:57:55Z

How does the rest of the mod spell it? Honestly I mostly don't care (see Intercepter vs Interceptor) but if the rest of the mod spells it without an a it might be worth for consistency I suppose

combusterf · 2024-01-21T20:02:59Z

How does the rest of the mod spell it? Honestly I mostly don't care (see Intercepter vs Interceptor) but if the rest of the mod spells it without an a it might be worth for consistency I suppose

Everything in the current thaumonomicon is Apimancer this, Apimancy that

Quantumlyy · 2024-01-21T20:05:05Z

How does the rest of the mod spell it? Honestly I mostly don't care (see Intercepter vs Interceptor) but if the rest of the mod spells it without an a it might be worth for consistency I suppose

Everything in the current thaumonomicon is Apimancer this, Apimancy that

Already renamed in every possible place.
I guess that the core mod PR will also need modifications now.

Alastors · 2024-01-21T21:42:46Z

~~give me a moment to test it again and I'll merge~~

forgot about "changes balance"

Alastors

has a glitch that needs to be fixed, probably could be handled with forge directions, you can't place blocks on the top of the block unless you're shifting, it's in the phial use catch, so just use forge directions to make this interaction not happen when you're looking at the top block.

Dream-Master · 2024-01-22T14:27:12Z

@Alastors just let me know when it is done and can be merged.

Alastors · 2024-01-28T07:40:53Z

src/main/java/magicbees/bees/BeeMutation.java

@@ -488,6 +488,11 @@ public static void setupMutations() {
                    BeeSpecies.SUPERNATURAL.getSpecies(),
                    BeeSpecies.TC_CHAOS.getGenome(),
                    8).requireResource(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.CHAOS.ordinal());
+            beeMutationFactory.createMutation(
+                    BeeSpecies.TC_ORDER.getSpecies(),


Alastors · 2024-01-28T07:41:37Z

src/main/java/magicbees/bees/BeeSpecies.java

@@ -186,6 +186,8 @@ public enum BeeSpecies {
            EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
    TC_CHAOS("TCChaos", "tenebrarum", BeeClassification.THAUMIC, 0xCCCCCC, BodyColours.THAUMCRAFT_SHARD,
            EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
+    TC_ESSENTIA("TCEssentia", "defaultium essentia apis", BeeClassification.THAUMIC, 0xCCCCCC,
+            BodyColours.THAUMCRAFT_SHARD, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),


there's a part of me that wishes it had a unique texture, but eh, no point for it, lotta work when all of the bees practically already look the same.

Alastors · 2024-01-28T07:49:29Z

src/main/resources/assets/magicbees/lang/en_US.lang

@@ -403,6 +404,8 @@ magicbees.speciesTCOrder=Ordered
 magicbees.speciesTCOrder.description=Their combs are nearly perfect, each part mirroring the pattern of the whole.|Apinomicon
 magicbees.speciesTCChaos=Chaotic
 magicbees.speciesTCChaos.description=The social structure of their hives seems to vary day by day, making it more flexible and resillient than others, but significantly more unpredictable.|Apinomicon
+magicbees.speciesTCEssentia=Essentia
+magicbees.speciesTCEssentia.description="Why spam Essentia Condensers when you can just use bees?"|Quantumly, Condenser Enjoyer


Alastors

Yeah, looks good, check it, works in at least both the apiary and magic apiary, quantumly says likewise it works in the alveary as well so I'm sure it works in pretty much everything if not everything.

My only comment is that I wish the drainer itself displayed its internal vis storage when wearing goggles as it originally did, but frankly it's not a large enough thing to keep holding it back. Nice work man.

Quantumlyy added 7 commits December 7, 2023 16:49

use apiary inventory and beelistener

481c22a

remove unused methods

5e912b6

remove pointless arithmetic

7345669

edit frame and product slots

c8aaeba

extract MagicApiaryInventory into file

ae246d8

revert slot move

bdd7630

why was that there?

4c47f77

Quantumlyy changed the title ~~The great unf***ing of the bees~~ Bring MagicApiary closer to Apiary Dec 7, 2023

Quantumlyy marked this pull request as ready for review December 7, 2023 21:51

Quantumlyy marked this pull request as draft December 8, 2023 10:21

Quantumlyy changed the title ~~Bring MagicApiary closer to Apiary~~ Add Phialing cabinet Dec 8, 2023

Quantumlyy added 12 commits December 8, 2023 11:36

add basics for phialing cabinet

e03d4da

add tc essentia bee

c23401e

differentiate essentia based on first inserted

07a9871

check for beehousing instead of apiary

0578441

sa

d3ad57a

use config for phialing cabinet values

7416d21

sa

02c7fc7

make phialing cabinet capacity configurable

29e72ed

correctly check for the species

6529e72

remove stubs

c79503d

read and write nbt

e7e5292

finish up cabinet logic

f366dcd

Quantumlyy marked this pull request as ready for review December 9, 2023 17:26

oops

974e459

Dream-Master requested a review from a team December 9, 2023 18:22

Alastors added the ongoing freeze - don't merge Not just a bug fix and thus affected by a current freeze for a upcoming version label Dec 9, 2023

Alastors reviewed Dec 9, 2023

View reviewed changes

src/main/java/magicbees/bees/BeeSpecies.java Show resolved Hide resolved

Alastors reviewed Dec 9, 2023

View reviewed changes

src/main/java/magicbees/client/gui/ContainerMagicApiary.java Outdated Show resolved Hide resolved

Alastors reviewed Dec 9, 2023

View reviewed changes

src/main/java/magicbees/block/BlockPhialingCabinet.java Outdated Show resolved Hide resolved

GTu no transitive

b011688

combusterf requested changes Jan 21, 2024

View reviewed changes

Quantumlyy added 2 commits January 21, 2024 20:55

sa

e2080bc

requested changes

67dfeb7

Quantumlyy marked this pull request as draft January 21, 2024 19:57

Quantumlyy changed the title ~~Add Apiamancers Drainer~~ Add Apimancers Drainer Jan 21, 2024

the grand rename

9d2c667

Quantumlyy marked this pull request as ready for review January 21, 2024 20:02

combusterf approved these changes Jan 21, 2024

View reviewed changes

Alastors suggested changes Jan 21, 2024

View reviewed changes

Dream-Master mentioned this pull request Jan 27, 2024

Add GT version checks to avoid crash with GT6 #36

Merged

Quantumlyy added 2 commits January 27, 2024 11:22

fix: check for gtnh coremod to determine drainer functionality

fb43f46

check that block side is not top

a64bd5f

Dream-Master requested a review from Alastors January 27, 2024 11:02

fixing the block side

38bc8a1

Alastors reviewed Jan 28, 2024

View reviewed changes

minor cleanup

99c3cb6

Alastors approved these changes Jan 28, 2024

View reviewed changes

Dream-Master merged commit 3a4e4dc into GTNewHorizons:master Jan 28, 2024
1 check passed

Quantumlyy deleted the bring-closer-to-forestry branch January 28, 2024 11:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Apimancers Drainer #34

Add Apimancers Drainer #34

Quantumlyy commented Dec 7, 2023 •

edited

Loading

Alastors commented Jan 21, 2024

combusterf commented Jan 21, 2024

combusterf left a comment

combusterf Jan 21, 2024

Quantumlyy Jan 21, 2024

combusterf Jan 21, 2024

combusterf Jan 21, 2024

Quantumlyy commented Jan 21, 2024

Alastors commented Jan 21, 2024

combusterf commented Jan 21, 2024

Quantumlyy commented Jan 21, 2024

Alastors commented Jan 21, 2024 •

edited

Loading

Alastors left a comment

Dream-Master commented Jan 22, 2024

Alastors Jan 28, 2024

Alastors Jan 28, 2024

Alastors Jan 28, 2024

Alastors left a comment

Add Apimancers Drainer #34

Add Apimancers Drainer #34

Conversation

Quantumlyy commented Dec 7, 2023 • edited Loading

Alastors commented Jan 21, 2024

combusterf commented Jan 21, 2024

combusterf left a comment

Choose a reason for hiding this comment

combusterf Jan 21, 2024

Choose a reason for hiding this comment

Quantumlyy Jan 21, 2024

Choose a reason for hiding this comment

combusterf Jan 21, 2024

Choose a reason for hiding this comment

combusterf Jan 21, 2024

Choose a reason for hiding this comment

Quantumlyy commented Jan 21, 2024

Alastors commented Jan 21, 2024

combusterf commented Jan 21, 2024

Quantumlyy commented Jan 21, 2024

Alastors commented Jan 21, 2024 • edited Loading

Alastors left a comment

Choose a reason for hiding this comment

Dream-Master commented Jan 22, 2024

Alastors Jan 28, 2024

Choose a reason for hiding this comment

Alastors Jan 28, 2024

Choose a reason for hiding this comment

Alastors Jan 28, 2024

Choose a reason for hiding this comment

Alastors left a comment

Choose a reason for hiding this comment

Quantumlyy commented Dec 7, 2023 •

edited

Loading

Alastors commented Jan 21, 2024 •

edited

Loading