Skip to content

Industrial Apiary#13

Merged
tier940 merged 12 commits intomainfrom
tier-apiary
Mar 15, 2026
Merged

Industrial Apiary#13
tier940 merged 12 commits intomainfrom
tier-apiary

Conversation

@tier940
Copy link
Member

@tier940 tier940 commented Mar 15, 2026

No description provided.

@tier940 tier940 self-assigned this Mar 15, 2026
@gemini-code-assist
Copy link

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces a significant expansion to the modpack's beekeeping capabilities by integrating Gendustry's Industrial Apiary as a GregTech meta-tile entity. The changes provide a robust framework for automated and advanced bee breeding, complete with detailed status feedback and configurable mechanics. This integration aims to streamline beekeeping operations within the GregTech progression, offering players more sophisticated tools for genetic manipulation and resource production.

Highlights

  • Industrial Apiary Integration: A new GregTech meta-tile entity, the Industrial Apiary, has been fully implemented, integrating Gendustry's advanced beekeeping mechanics into the GregTech ecosystem. This includes comprehensive support for bee housing, upgrade modifiers, and error handling.
  • Enhanced Bee Mechanics and UI: New utility classes and GUI elements have been added to manage bee climate, product distribution, and status display. This includes a Gendustry-style bee status widget and a The One Probe (TOP) provider to show bee queen health.
  • Configuration and Recipe Adjustments: Forestry and Gendustry machine configurations have been updated, defaulting several machines to uncraftable to align with modpack progression. New GregTech-style recipes for the Industrial Apiary and various Gendustry components have been introduced, replacing original recipes.
  • Dependency Update and Localization: The Binnie's Mods Patched dependency has been updated to version 2.5.1.213. New English and Japanese localization entries have been added for the Industrial Apiary and its associated GUI elements.
Changelog
  • dependencies.gradle
    • Updated Binnie's Mods Patched dependency to version 2.5.1.213.
  • src/main/java/com.github/gtexpert/gtbm/integration/gendustry/GendustryConfigHolder.java
    • Simplified uncraftable options to only Industrial Apiary, defaulting to true.
  • src/main/java/com/github/gtexpert/gtbm/api/gui/GTBMGuiTextures.java
    • Added new texture areas for bee information and slot overlays.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/ForestryConfigHolder.java
    • Changed default uncraftable status for several Forestry machines to true and added FarmBlock to the list.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/ForestryModule.java
    • Imported BeeHousingInfoProvider and registered it with The One Probe.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/ForestryUtility.java
    • Added utility methods for bee work cycle, effective ticks per health, and time formatting.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/recipes/FFMBlockRecipe.java
    • Added a conditional check for ForestryConfigHolder.FarmBlock before adding farm recipes.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ApiaryModifierBridge.java
    • Added a new class to bridge Gendustry's ApiaryModifiers with Forestry's IBeeModifier.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeClimateHelper.java
    • Added a new class for reusable climate calculation for bee housings.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeHousingInfoProvider.java
    • Added a new class to provide bee queen health information to The One Probe.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeProductHelper.java
    • Added a new class for reusable product distribution logic in bee housings.
  • src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/WidgetBeeStatus.java
    • Added a new class for a Gendustry-style bee status GUI widget.
  • src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/GendustryMetaTileEntities.java
    • Removed feature flag for Industrial Apiary registration and removed an unused import.
  • src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/IndustrialApiaryLogic.java
    • Implemented core logic for the Industrial Apiary, including bee root, beekeeping logic, modifier management, energy consumption, progress tracking, and princess auto-move.
  • src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java
    • Extended to implement IBeeHousing and IBeeHousingInventory, added upgrade inventory, NBT handling, and a comprehensive GUI with bee slots, status widget, progress bar, and controls.
  • src/main/java/com/github/gtexpert/gtbm/integration/gendustry/recipes/GendustryBlocksRecipe.java
    • Added recipes for the Industrial Apiary and a shapeless recipe to convert Gendustry's Industrial Apiary to the GTBM version.
  • src/main/java/com/github/gtexpert/gtbm/integration/gendustry/recipes/GendustryCraftingRecipe.java
    • Simplified recipe removal logic to only target the Industrial Apiary.
  • src/main/java/com/github/gtexpert/gtbm/integration/gendustry/recipes/GendustryItemsRecipe.java
    • Added new shaped recipes for various Gendustry components (Mutagen Tank, Bee Receptacle, Power Module, Genetics Processor, Environmental Processor, Upgrade Frame, Climate Module, Labware) and removed their original recipes.
  • src/main/resources/assets/gregtech/textures/blocks/machines/industrial_apiary/overlay_top_active.png.mcmeta
    • Added animation metadata for the active top overlay texture.
  • src/main/resources/assets/gregtech/textures/blocks/machines/industrial_apiary/overlay_top_active_emissive.png.mcmeta
    • Added animation metadata for the active emissive top overlay texture.
  • src/main/resources/assets/gtbm/lang/en_us.lang
    • Added English localization entries for Industrial Apiary names, tooltips, bee status widget labels, and auto-breeding GUI tooltip.
  • src/main/resources/assets/gtbm/lang/ja_jp.lang
    • Added Japanese localization entries for Industrial Apiary names, tooltips, bee status widget labels, and auto-breeding GUI tooltip.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces the Industrial Apiary, a new machine for bee processing, with deep integration into Forestry and Gendustry. It includes the machine's logic, GUI, recipes, and necessary utility classes. The implementation is quite comprehensive. My review focuses on improving code style, maintainability, and fixing a few minor issues. Key suggestions include adhering to Java naming conventions for configuration variables, replacing magic numbers with constants, simplifying some logic, and improving GUI consistency. I've also found a bug in the localization files where an incorrect newline character is used.

@tier940 tier940 merged commit 1917a3c into main Mar 15, 2026
2 checks passed
@tier940 tier940 deleted the tier-apiary branch March 15, 2026 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant