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.

Sign up for GitHub

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

Jump to bottom

Beamline fixes 4 #3504

Merged
merged 40 commits into from
Nov 23, 2024
Merged

Beamline fixes 4 #3504

merged 40 commits into from
Nov 23, 2024

Conversation

Elisis
Copy link
Member

@Elisis Elisis commented Nov 16, 2024 •
edited
Loading

Additions

  • Adds hot super coolant fluid for Synchrotron and LINAC coolant output, can be cooled back to regular super coolant in VF
  • Add Prepared Masks for CPU, NCPU, PIC, HPIC. CR mask-to-mask recipes are replaced with mask-to-prepared mask, and prepared mask-to-mask engraver recipes are added. E.g. CPU-(CR)->PrCPU-(PLE)->NCPU.
  • Adds beamline recipes for crystal chips, along with associated masks.

Balancing

  • Reduces UHPIC minimum TC energy to 190eV.
  • Adds subticking to TC.
  • TC recipe time save per increase in wafer tier improved by ~20%
  • Synchrotron allowed to use laser/multiamp energy hatches.

Fixes

  • Fixes LINAC energy handling, now takes full amperage with two energy hatches.
  • Fixes TC IOOB exception caused by empty focus input bus.
  • Makes NPIC max energy sane.
  • Increases LINAC coolant usage, now equal to length kL/s.
  • Fixes OBOE with focus durability vs. max uses.
  • Fixes equal amount values across different wafer tiers in TC recipes.
  • Fixes tricoder NPEing on all multis that don't yet have beamline input hatches.
  • Fixes empty Reactive-Ion Etching Mixture centrifuge recipe

QoL

  • Adds max number of uses of foci to their tooltips.
  • Casing and item textures updated (Credit goes to BlueHero233)

Elisis and others added 21 commits October 7, 2024 17:51
@Elisis
Add hot super coolant fluid for Synchrotron and LINAC coolant output
c4492db
@Elisis
Rename 'Input amount too low' Synchrotron error message, fix LINAC po…
5f209db 
…wer consumption
@Elisis
Add Prepared Mask step to mask recipes, add textures for Prepared Masks
9714aa6
@Elisis
Remove todo comments
740a6d3
@Elisis
Add crystal chip masks, TC recipes, make QPIC attainable at ZPM
6b9ad17
@Elisis
Reduce UHPIC minimum TC energy, add recipe for blank crystal mask
4ed45eb
@Elisis
Add LuAG CC recipe, make focus for CC recipes more reasonable
ba36e91
@Elisis
Fix LINAC amperage usage, make math take into account 4x amperage wit…
6ba5d43 
…h two hatches
@Elisis
Add subticking to TC, fix focus input IIOB
eb05fad
@Elisis
Reduce NPIC max energy from 3 million eV
8b25275
@Elisis
Fix LINAC coolant usage, no longer consumes 1kL less than expected
7901797
@Elisis
Fix OBOE with focus durability, add maximum number of uses to focus t…
f8a5901 
…ooltips
@Elisis
Improve the TC recipe time save per increase in wafer tier by ~20%, f…
078d890 
…ix repeated Amount value in recipes
@Elisis
Add exotic energy hatch support to Synchrotron, fix tricorder NPE iss…
c5052d4 
…ue on all multis
@Elisis
Fix wrong masks having 'Max Uses' tooltip
b50a829
@Elisis
Add cblank, temporary ccpu textures
80f1fc2
@BlueHero233
Add crystal Masks, Better mask and casing textures
5f2c537
@BlueHero233
Merge remote-tracking branch 'origin/beamline-fixes-4' into beamline-…
14ee504 
…fixes-4

# Conflicts:
#	src/main/resources/assets/gtnhlanth/textures/items/photomask/cblank.png
#	src/main/resources/assets/gtnhlanth/textures/items/photomask/ccpu.png
@Elisis
Update fake GT shielded acc. machine casing texture
07a3c6c
@Elisis
Spotless, as always
b925b8e
@Elisis
Merge branch 'master' into beamline-fixes-4
838f8ef
@Elisis Elisis added enhancement Improve an existing mechanic. Please explain the change with a before/after comparison. Affects Balance Change affecting balance. Requires admin approval before merging. bug fix Fix a bug. Please link it in the PR. labels Nov 16, 2024
@boubou19 boubou19 added the ongoing freeze - do not merge PR tagged with this do not meet the requirement to be merged during a freeze. label Nov 16, 2024
@Dream-Master
Copy link
Member

@boubou19 if it contain more fixes than changes I would add it to 2.7 . Thoughts ?

@Dream-Master Dream-Master requested a review from a team November 16, 2024 13:53
@Ruling-0
Copy link
Contributor

@boubou19 if it contain more fixes than changes I would add it to 2.7 . Thoughts ?

This really should get in - these are some pretty important fixes and balance changes.

@Elisis
Copy link
Member Author

Elisis commented Nov 17, 2024

@Elisis this one also will be nice if fixed GTNewHorizons/GT-New-Horizons-Modpack#17710

Ah, that was the IOOB I mentioned

@Elisis Elisis mentioned this pull request Nov 17, 2024
Closed
3 tasks
@Dream-Master Dream-Master removed the ongoing freeze - do not merge PR tagged with this do not meet the requirement to be merged during a freeze. label Nov 18, 2024
@Elisis Elisis mentioned this pull request Nov 19, 2024
Closed
3 tasks
@github-actions GitHub Actions
Copy link
Contributor

Warning: 2 uncommitted changes
#3523

@github-actions github-actions bot mentioned this pull request Nov 19, 2024
Merged
Ethryan
Ethryan requested changes Nov 23, 2024
View reviewed changes
Copy link
Contributor

@Ethryan Ethryan left a comment

Choose a reason for hiding this comment

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

Should the debug code still be there?, Might want to remove it if this is to be merged.

It also contains a few new items, but that's fine if its for balancing stuff imo.

PS: I just did a quick glance of this, and did no further testing.

src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java Show resolved Hide resolved
src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link
Contributor

Warning: 2 uncommitted changes
#3546

@github-actions github-actions bot mentioned this pull request Nov 23, 2024
Merged
@github-actions
Spotless apply for branch beamline-fixes-4 for #3504 (#3546)
1aaa677 
Co-authored-by: GitHub GTNH Actions <>
Ethryan
Ethryan approved these changes Nov 23, 2024
View reviewed changes
Copy link
Contributor

@Ethryan Ethryan left a comment

Choose a reason for hiding this comment

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

Looks good imo.

@Dream-Master Dream-Master enabled auto-merge (squash) November 23, 2024 22:53
@Dream-Master Dream-Master merged commit 9ce867e into master Nov 23, 2024
5 checks passed
@Dream-Master Dream-Master deleted the beamline-fixes-4 branch November 23, 2024 23:14
@Elisis Elisis mentioned this pull request Nov 24, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ethryan Ethryan Ethryan approved these changes

Assignees
No one assigned
Labels
Affects Balance Change affecting balance. Requires admin approval before merging. bug fix Fix a bug. Please link it in the PR. enhancement Improve an existing mechanic. Please explain the change with a before/after comparison.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Elisis @Dream-Master @FireWarrior2 @Ruling-0 @Ethryan @boubou19 @BlueHero233