Skip to content

Implementation of Gregicality Multiblocks#369

Merged
screret merged 67 commits into
GregTechCEu:1.19.2from
Rundas01:gregicality-multiblocks
Sep 15, 2023
Merged

Implementation of Gregicality Multiblocks#369
screret merged 67 commits into
GregTechCEu:1.19.2from
Rundas01:gregicality-multiblocks

Conversation

@Rundas01

Copy link
Copy Markdown
Contributor

shoutouts to Screret for the Parallel Hatches

Rundas01 and others added 30 commits September 7, 2023 16:40
fix molten fluid texture (it was easy)
…-modes

# Conflicts:
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/WorkableTieredMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/MachineModeFancyConfigurator.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableMultiblockMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java
#	common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/PrimitiveWorkableMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamLiquidBoilerMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamSolidBoilerMachine.java
#	common/src/main/java/com/gregtechceu/gtceu/common/machine/trait/miner/MinerLogic.java
@Rundas01 Rundas01 requested a review from a team as a code owner September 15, 2023 13:32
.rotationState(RotationState.ALL)
.abilities(PartAbility.PARALLEL_HATCH)
.workableTieredHullRenderer(GTCEu.id("block/machines/parallel_hatch_mk" + (tier - 4)))
.tooltips(Component.translatable("gtceu.parallelhatch_mk"+tier))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is a typo, no?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

also for the lang key you could do "gtceu.tooltip.parallel_hatch_mk" + (tier - 4)

Comment thread common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java Outdated
Comment thread common/src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java Outdated
@Rundas01 Rundas01 requested a review from screret September 15, 2023 14:07
.langValue("Alloy Blast Smelter")
.tooltips(Component.translatable("gtceu.multiblock.parallelizable.tooltip"))
.tooltips(Component.translatable("gtceu.machine.available_recipe_map_1.tooltip", Component.translatable("gtceu.recipemap.blast_alloy")))
.tooltips(Component.translatable("gtceu.machine.available_recipe_map_1.tooltip", Component.translatable("gtceu.blast_alloy")))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i think this lang key should be gtceu.alloy_blast_smelter?

Comment thread common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java Outdated
screret
screret previously approved these changes Sep 15, 2023
@screret screret dismissed their stale review September 15, 2023 15:54

it broke

@TheAlaskanPhysicist TheAlaskanPhysicist left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

IT WORKED

@screret screret merged commit e3fd6b4 into GregTechCEu:1.19.2 Sep 15, 2023
screret added a commit that referenced this pull request Sep 15, 2023
* gcmb first additions

* fix ABS (no textures tho)

* slight refactor

* blast alloy changes

* fix molten fluid texture (it was easy)

* more refactoring

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest commit

* latest stuff

* change activerecipetype to int

* final touch + method rename

* dev QoL stuffs

* final commit

* run data

* js^3 support added

* final touch

* Update GTRecipeTypes.java

* Update GTMachines.java

* gcmb first additions

* slight refactor

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* more refactoring

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest stuff

* change activerecipetype to int

* final touch + method rename

* js^3 support added

* dev QoL stuffs

* run data

* gcmb first additions

* slight refactor

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* gcmb first additions

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* fix some KJS builders having issues in array indexing, rebase to upstream

* fix some KJS builders having issues in array indexing, rebase to upstream
HOLY SHIT THIS WAS PAINFUL

* add the parallel hatch, fix a lot of bugs, rename the casings to make sense, etc.
run data.

* parallel hatches + missing multis

* finalized

* requested fixes

* datagen

* more requested changes + datagen

* Update common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java

---------

Co-authored-by: screret <68943070+screret@users.noreply.github.com>
screret added a commit that referenced this pull request Sep 15, 2023
* add a KJS block type for renderer blocks. (#353)

* add ability to create renderer blocks from KJS, make the simple machines' arrays match the tier indexes

* do the same to KJS machine builders

* Implementation of Machine Modes (#359)

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest commit

* latest stuff

* change activerecipetype to int

* final touch + method rename

* dev QoL stuffs

* final commit

* run data

* js^3 support added

---------

Co-authored-by: screret <joona.v.stenberg@gmail.com>

* shit. these should stack.

* Implementation of Gregicality Multiblocks (#369)

* gcmb first additions

* fix ABS (no textures tho)

* slight refactor

* blast alloy changes

* fix molten fluid texture (it was easy)

* more refactoring

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest commit

* latest stuff

* change activerecipetype to int

* final touch + method rename

* dev QoL stuffs

* final commit

* run data

* js^3 support added

* final touch

* Update GTRecipeTypes.java

* Update GTMachines.java

* gcmb first additions

* slight refactor

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* more refactoring

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest stuff

* change activerecipetype to int

* final touch + method rename

* js^3 support added

* dev QoL stuffs

* run data

* gcmb first additions

* slight refactor

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* gcmb first additions

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* fix some KJS builders having issues in array indexing, rebase to upstream

* fix some KJS builders having issues in array indexing, rebase to upstream
HOLY SHIT THIS WAS PAINFUL

* add the parallel hatch, fix a lot of bugs, rename the casings to make sense, etc.
run data.

* parallel hatches + missing multis

* finalized

* requested fixes

* datagen

* more requested changes + datagen

* Update common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java

---------

Co-authored-by: screret <68943070+screret@users.noreply.github.com>

* it didnt build lol

---------

Co-authored-by: Rundas <38040866+Rundas01@users.noreply.github.com>
@Rundas01 Rundas01 deleted the gregicality-multiblocks branch September 15, 2023 18:21
screret added a commit that referenced this pull request Nov 23, 2023
* add a KJS block type for renderer blocks. (#353)

* add ability to create renderer blocks from KJS, make the simple machines' arrays match the tier indexes

* do the same to KJS machine builders

* Implementation of Machine Modes (#359)

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest commit

* latest stuff

* change activerecipetype to int

* final touch + method rename

* dev QoL stuffs

* final commit

* run data

* js^3 support added

---------

Co-authored-by: screret <joona.v.stenberg@gmail.com>

* shit. these should stack.

* Implementation of Gregicality Multiblocks (#369)

* gcmb first additions

* fix ABS (no textures tho)

* slight refactor

* blast alloy changes

* fix molten fluid texture (it was easy)

* more refactoring

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest commit

* latest stuff

* change activerecipetype to int

* final touch + method rename

* dev QoL stuffs

* final commit

* run data

* js^3 support added

* final touch

* Update GTRecipeTypes.java

* Update GTMachines.java

* gcmb first additions

* slight refactor

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* more refactoring

* first attempt at implementing machine modes

screret pls help

* fix the issue

* next attempt for the configurator

* latest stuff

* change activerecipetype to int

* final touch + method rename

* js^3 support added

* dev QoL stuffs

* run data

* gcmb first additions

* slight refactor

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* gcmb first additions

* fix ABS (no textures tho)

* blast alloy changes

* fix molten fluid texture (it was easy)

* fix some KJS builders having issues in array indexing, rebase to upstream

* fix some KJS builders having issues in array indexing, rebase to upstream
HOLY SHIT THIS WAS PAINFUL

* add the parallel hatch, fix a lot of bugs, rename the casings to make sense, etc.
run data.

* parallel hatches + missing multis

* finalized

* requested fixes

* datagen

* more requested changes + datagen

* Update common/src/main/java/com/gregtechceu/gtceu/common/data/GCyMMachines.java

---------

Co-authored-by: screret <68943070+screret@users.noreply.github.com>

* it didnt build lol

---------

Co-authored-by: Rundas <38040866+Rundas01@users.noreply.github.com>
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.

Creative mode crash when trying to access GTCE Tabs KJS Multiblocks cannot overclock Deepslate ores unable to be processed in ATM9

4 participants