Skip to content

Untangle the mess in biolab items/recipes#5721

Draft
boubou19 wants to merge 32 commits intomasterfrom
clean/bartworks/BioLab
Draft

Untangle the mess in biolab items/recipes#5721
boubou19 wants to merge 32 commits intomasterfrom
clean/bartworks/BioLab

Conversation

@boubou19
Copy link
Member

This PR aims to do the following:

  • register statically each item
  • use a new enum to register the properties of each item type involved

With this, we will be able to finally fine tune the recipe chances in a followup PR, so stuff like xenoxene culture will be less of a pain to obtain :D

@boubou19 boubou19 marked this pull request as draft January 17, 2026 11:55
@github-actions
Copy link
Contributor

#5722

@boubou19 boubou19 added Refactor For PRs rewriting a part of the code to have a nicer code overall. Chore Buildscript update, dep update, adaptation to trivial breaking changes, etc. labels Jan 17, 2026
@boubou19
Copy link
Member Author

result of the GTLog from the logging done in the daily 331:

BioData(name=beta-Lactamase, id=0, rarity=uncommon, chance=10000, tier=0)
BioData(name=Saccharomyces cerevisiae, id=1, rarity=common, chance=7500, tier=0)
BioData(name=, id=2, rarity=epic, chance=7500, tier=0)
BioDNA(name=, id=2, rarity=epic)
BioData(name=Saccharomyces cerevisiae var bayanus, id=3, rarity=uncommon, chance=7500, tier=0)
BioDNA(name=Saccharomyces cerevisiae var bayanus, id=3, rarity=uncommon)
BioData(name=Saccharomyces cerevisiae var cerevisiae, id=4, rarity=uncommon, chance=7500, tier=0)
BioDNA(name=Saccharomyces cerevisiae var cerevisiae, id=4, rarity=uncommon)
BioData(name=Escherichia koli, id=5, rarity=uncommon, chance=10000, tier=0)
BioData(name=Pseudomonas Veronii, id=6, rarity=uncommon, chance=7500, tier=0)
BioDNA(name=Pseudomonas Veronii, id=6, rarity=uncommon)
BioData(name=Pseudomonas Veronii, id=7, rarity=uncommon, chance=5000, tier=1)
BioCulture(color=java.awt.Color[r=0,g=0,b=255], name=, id=0, plasmid=BioPlasmid(name=, id=2, rarity=epic, dDNA=BioDNA(name=, id=2, rarity=epic), rarity=epic, bBreedable=false)
BioCulture(color=java.awt.Color[r=255,g=248,b=200], name=Saccharomyces cerevisiae, id=1, plasmid=BioPlasmid(name=Saccharomyces cerevisiae, id=1, rarity=common, dDNA=BioDNA(name=Saccharomyces cerevisiae, id=1, rarity=common), rarity=common, bBreedable=true)
BioCulture(color=java.awt.Color[r=255,g=248,b=200], name=Saccharomyces cerevisiae var bayanus, id=2, plasmid=BioPlasmid(name=Saccharomyces cerevisiae var bayanus, id=3, rarity=uncommon, dDNA=BioDNA(name=Saccharomyces cerevisiae var bayanus, id=3, rarity=uncommon), rarity=uncommon, bBreedable=true)
BioCulture(color=java.awt.Color[r=255,g=248,b=200], name=Saccharomyces cerevisiae var cerevisiae, id=3, plasmid=BioPlasmid(name=Saccharomyces cerevisiae var cerevisiae, id=4, rarity=uncommon, dDNA=BioDNA(name=Saccharomyces cerevisiae var cerevisiae, id=4, rarity=uncommon), rarity=uncommon, bBreedable=true)
BioCulture(color=java.awt.Color[r=110,g=40,b=25], name=Escherichia cadaver, id=4, plasmid=BioPlasmid(name=beta-Lactamase, id=0, rarity=uncommon, dDNA=BioDNA(name=beta-Lactamase, id=0, rarity=uncommon), rarity=uncommon, bBreedable=false)
BioCulture(color=java.awt.Color[r=149,g=132,b=75], name=Escherichia koli, id=5, plasmid=BioPlasmid(name=Escherichia koli, id=5, rarity=uncommon, dDNA=BioDNA(name=Escherichia koli, id=5, rarity=uncommon), rarity=uncommon, bBreedable=true)
BioCulture(color=java.awt.Color[r=0,g=0,b=0], name=Pseudomonas Veronii, id=6, plasmid=BioPlasmid(name=Pseudomonas Veronii, id=6, rarity=uncommon, dDNA=BioDNA(name=Pseudomonas Veronii, id=7, rarity=uncommon), rarity=uncommon, bBreedable=true)
BioCulture(color=java.awt.Color[r=127,g=69,b=26], name=Saccharomyces escherichia, id=7, plasmid=BioPlasmid(name=Saccharomyces cerevisiae, id=1, rarity=common, dDNA=BioDNA(name=Escherichia koli, id=5, rarity=uncommon), rarity=epic, bBreedable=true)
BioData(name=Barnadafis Arboriatoris, id=8, rarity=rare, chance=750, tier=2)
BioCulture(color=java.awt.Color[r=133,g=0,b=128], name=Barnadafis Arboriatoris, id=8, plasmid=BioPlasmid(name=Barnadafis Arboriatoris, id=8, rarity=rare, dDNA=BioDNA(name=Barnadafis Arboriatoris, id=8, rarity=rare), rarity=rare, bBreedable=true)
BioData(name=TCetiEis Fucus Serratus, id=9, rarity=rare, chance=750, tier=2)
BioCulture(color=java.awt.Color[r=27,g=153,b=94], name=TCetiEis Fucus Serratus, id=9, plasmid=BioPlasmid(name=TCetiEis Fucus Serratus, id=9, rarity=rare, dDNA=BioDNA(name=TCetiEis Fucus Serratus, id=9, rarity=rare), rarity=rare, bBreedable=true)
BioCulture(color=java.awt.Color[r=54,g=119,b=181], name=Xenoxene Xenoxsis, id=10, plasmid=BioPlasmid(name=Barnadafis Arboriatoris, id=8, rarity=rare, dDNA=BioDNA(name=TCetiEis Fucus Serratus, id=9, rarity=rare), rarity=epic, bBreedable=false)
BioData(name=OvumBac, id=10, rarity=rare, chance=1500, tier=2)
BioCulture(color=java.awt.Color[r=223,g=206,b=155], name=Ova Evolutionis, id=11, plasmid=BioPlasmid(name=OvumBac, id=10, rarity=rare, dDNA=BioDNA(name=OvumBac, id=10, rarity=rare), rarity=rare, bBreedable=false)
BioData(name=StemCellBac, id=11, rarity=rare, chance=750, tier=3)
BioCulture(color=java.awt.Color[r=26,g=59,b=137], name=Derivantur Cellula Evolutionis, id=12, plasmid=BioPlasmid(name=StemCellBac, id=11, rarity=rare, dDNA=BioDNA(name=StemCellBac, id=11, rarity=rare), rarity=rare, bBreedable=false)
BioData(name=BioCellBac, id=12, rarity=epic, chance=300, tier=4)
BioCulture(color=java.awt.Color[r=91,g=255,b=41], name=Cellula Biologicum Evolutione, id=13, plasmid=BioPlasmid(name=BioCellBac, id=12, rarity=epic, dDNA=BioDNA(name=BioCellBac, id=12, rarity=epic), rarity=epic, bBreedable=false)
BioData(name=BinniGrowthMedium, id=13, rarity=common, chance=9000, tier=0)
BioCulture(color=java.awt.Color[r=219,g=223,b=138], name=Binni Growth Medium, id=14, plasmid=BioPlasmid(name=BinniGrowthMedium, id=13, rarity=common, dDNA=BioDNA(name=BinniGrowthMedium, id=13, rarity=common), rarity=common, bBreedable=false)
BioData(name=BinniBacteria, id=14, rarity=common, chance=6000, tier=0)
BioCulture(color=java.awt.Color[r=209,g=181,b=129], name=Binni Bacteria, id=15, plasmid=BioPlasmid(name=BinniBacteria, id=14, rarity=common, dDNA=BioDNA(name=BinniBacteria, id=14, rarity=common), rarity=common, bBreedable=true)
BioData(name=BacterialSludgeBac, id=15, rarity=uncommon, chance=3000, tier=1)
BioCulture(color=java.awt.Color[r=10,g=62,b=13], name=Corynebacterium Sludge Marsensis, id=16, plasmid=BioPlasmid(name=BacterialSludgeBac, id=15, rarity=uncommon, dDNA=BioDNA(name=BacterialSludgeBac, id=15, rarity=uncommon), rarity=uncommon, bBreedable=false)
BioData(name=Mutagen, id=16, rarity=rare, chance=1500, tier=2)
BioCulture(color=java.awt.Color[r=29,g=149,b=50], name=Mutagen Bacteria a Spatio, id=17, plasmid=BioPlasmid(name=Mutagen, id=16, rarity=rare, dDNA=BioDNA(name=Mutagen, id=16, rarity=rare), rarity=rare, bBreedable=false)

Comment on lines 40 to 44
Color color;
BioPlasmid plasmid;
BioDNA dDNA;
BioData plasmid;
BioData dDNA;
boolean bBreedable;
Fluid mFluid;
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these used outside of this class? If not, could you please mark them private final and remove the letter prefixes?

Copy link
Contributor

Choose a reason for hiding this comment

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

They have setters, for some reason. Are these not singleton objects, one per type of culture?

Copy link
Member Author

@boubou19 boubou19 Jan 19, 2026

Choose a reason for hiding this comment

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

tbh the code is half assed, and i'm going to rewrite it properly at some point, but i need to get this in a shape for which i understand what's going on. At the end, there will be no BioData class left, i want the cultures to be data driven by a simple enum.

@boubou19 boubou19 force-pushed the clean/bartworks/BioLab branch from 59b4bac to 14dc539 Compare January 19, 2026 23:31
@boubou19 boubou19 force-pushed the clean/bartworks/BioLab branch from 14dc539 to f6136a6 Compare January 19, 2026 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Chore Buildscript update, dep update, adaptation to trivial breaking changes, etc. Refactor For PRs rewriting a part of the code to have a nicer code overall.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants