Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wiremill Circuit Recipes #1004

Merged
merged 3 commits into from
Mar 27, 2024
Merged

Wiremill Circuit Recipes #1004

merged 3 commits into from
Mar 27, 2024

Conversation

ReclipseTheOne
Copy link
Contributor

Nothing should be broken (copium)

@ReclipseTheOne ReclipseTheOne requested a review from a team as a code owner March 24, 2024 11:13
@mikerooni
Copy link
Member

Looks good so far, should be able to include this in the next release after 1.1.4

@mikerooni mikerooni added the Do Not Merge DO NOT MERGE THIS PR YET! label Mar 24, 2024
Comment on lines 86 to 130
.inputItems(prefix, material)
.circuitMeta(1)
.outputItems(wireGtSingle, material, 2)
.duration((int) material.getMass())
.EUt(getVoltageMultiplier(material))
.save(provider);

WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_2")
.inputItems(prefix, material)
.circuitMeta(2)
.outputItems(wireGtDouble, material, 1)
.duration((int) material.getMass())
.EUt(getVoltageMultiplier(material))
.save(provider);

WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_4")
.inputItems(prefix, material, 2)
.circuitMeta(4)
.outputItems(wireGtQuadruple, material, 1)
.duration((int) material.getMass() * 2)
.EUt(getVoltageMultiplier(material))
.save(provider);

WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_8")
.inputItems(prefix, material, 4)
.circuitMeta(8)
.outputItems(wireGtOctal, material, 1)
.duration((int) material.getMass() * 4)
.EUt(getVoltageMultiplier(material))
.save(provider);

WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_16")
.inputItems(prefix, material, 8)
.circuitMeta(16)
.outputItems(wireGtHex, material, 1)
.duration((int) material.getMass() * 8)
.EUt(getVoltageMultiplier(material))
.save(provider);

if (material.hasFlag(GENERATE_FINE_WIRE)) {
WIREMILL_RECIPES.recipeBuilder("mill_" + material.getName() + "_wire_fine")
.inputItems(prefix, material, 1)
.circuitMeta(3)
.outputItems(wireFine, material, 8)
.duration((int) material.getMass() * 3)
Copy link
Member

Choose a reason for hiding this comment

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

1.12 had a loop for this yk?

Copy link
Member

Choose a reason for hiding this comment

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

would be cleaner :)

Copy link
Member

Choose a reason for hiding this comment

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

@screret screret removed the Do Not Merge DO NOT MERGE THIS PR YET! label Mar 26, 2024
@screret screret merged commit 559c2b6 into GregTechCEu:1.20.1 Mar 27, 2024
screret pushed a commit that referenced this pull request Mar 30, 2024
* Wiremill Circuit Recipes

* Ported the 1.12.2 Wiremill Circuit recipes
screret added a commit that referenced this pull request Mar 30, 2024
* Port multi-amp energy hatches not giving overclocks. (#1009)

* port 1.12#2139, 1.12#1741

* run data

* fix crash

* requested change part 1

Co-authored-by: Mikerooni <[email protected]>

* requested changes part 2

---------

Co-authored-by: Mikerooni <[email protected]>

* Default predicated buttons to hidden, so buttons don't appear before checking their predicate (#1015)

* Fix bucket model (#1008) (#1014)

* Fix: processing array accepting multiblock machines  (#1013)

* fix: Enhance ProcessingArrayMachine no longer use MultiBlock machine controller.

* fix: Enhance ProcessingArrayMachine no longer use MultiBlock machine controller.

* Optimize access widener and convert to access transformer (#1012)

* fix fluid pipes converting an empty fluidstack to an (illegal) null (#1010)

* Ordered large distillery outputs (#1021)

Defaulted to distillation tower recipes instead of distillery
Require 1x output hatches

Co-authored-by: sirjoekcb <[email protected]>

* Wiremill Circuit Recipes (#1004)

* Wiremill Circuit Recipes

* Ported the 1.12.2 Wiremill Circuit recipes

* Keep wooden form in crafting table after recipe (#923)

* fix: always apply OC logic even if amount of OC is 0 so that pyrolyse oven penalties apply. (#1017)

* feat: make rubber saplings, leaves compostable (#1018)

* fix crash in case of somehow pathing air (#1019)

* NO, we DO want to keep the PA deprecated. (#1023)

* move to event for data loading so it shows up in datapack list (TURNS OUT THE SERVER DOESN'T CALL THIS WTF) (#1024)

* Allow the spray can to paint a chain of blocks at once (#1025)

* Allow the spray can to paint a chain of blocks at once

* Use MutableBlockPos for chain spray painting

* Changed return type of getDurabilityForDisplay from int to float (#1026)

* Fixes PA voltage stack overflow on load (#1027)

Co-authored-by: sirjoekcb <[email protected]>

* add ability to use block/fluid tags in multiblock patterns (#1030)

* update, update LDlib, changelog (#1031)

* update, update LDlib, changelog

* more changelog

* Grid UI in multiblock part switcher (#1032)

* feat: use a grid UI in the multiblock part switcher

* chore: version & changelog

* fix errors

* don't get resource from mod, return null instead.

---------

Co-authored-by: Mikerooni <[email protected]>
Co-authored-by: ctrlaltmilk <[email protected]>
Co-authored-by: Alendill <[email protected]>
Co-authored-by: sirjoekcb <[email protected]>
Co-authored-by: sirjoekcb <[email protected]>
Co-authored-by: Reclipse <[email protected]>
Co-authored-by: Maxim <[email protected]>
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.

3 participants