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

Refactor ore and worldgen #3662

Draft
wants to merge 58 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
467cd63
ore block
RecursivePineapple Dec 3, 2024
fdd8abe
refactor work
RecursivePineapple Dec 4, 2024
aadf642
tons of changes
RecursivePineapple Dec 7, 2024
babf488
asteroids
RecursivePineapple Dec 8, 2024
7cd1e74
better asteroids
RecursivePineapple Dec 8, 2024
667fcb0
chunkified asteroid generator
RecursivePineapple Dec 11, 2024
63b9183
fix tools casting meta to byte
RecursivePineapple Dec 11, 2024
8765a21
unify asteroid config + fixes
RecursivePineapple Dec 11, 2024
a8c2647
Merge branch 'master' into remove-ore-tiles
RecursivePineapple Dec 11, 2024
993eef5
bartworks ores
RecursivePineapple Dec 12, 2024
0365ef3
fix prospector freezing server
RecursivePineapple Dec 12, 2024
df05e63
gt++ fixes
RecursivePineapple Dec 12, 2024
17557b3
gt++ optimization
RecursivePineapple Dec 12, 2024
85cd8bb
more fixes & optimizations
RecursivePineapple Dec 12, 2024
283ae71
Merge branch 'master' into remove-ore-tiles
RecursivePineapple Dec 12, 2024
ccd512d
gt transformer
RecursivePineapple Dec 12, 2024
bed8f30
Merge branch 'master' into remove-ore-tiles
RecursivePineapple Dec 12, 2024
43e29e8
fix merge problems
RecursivePineapple Dec 12, 2024
c3f80a4
misc cleanup + impl
RecursivePineapple Dec 16, 2024
99f0c0a
revert accidental change to XSTR seed
RecursivePineapple Dec 17, 2024
a305776
clean + spotless
RecursivePineapple Dec 17, 2024
4301075
Merge branch 'master' into refactor-ore-and-worldgen
RecursivePineapple Dec 17, 2024
ab7aaf6
misc cleanup from checking the code
RecursivePineapple Dec 17, 2024
c1ea88a
Merge branch 'master' into refactor-ore-and-worldgen
Dream-Master Dec 21, 2024
4ff1fe7
optimize stonegen
RecursivePineapple Dec 19, 2024
0aa0d7e
bw ore oredict + fix macerator recipes
RecursivePineapple Dec 22, 2024
a7e3d28
misc asteroid & stone fixes
RecursivePineapple Dec 22, 2024
48549ed
missed a byte cast
RecursivePineapple Dec 22, 2024
4d55cea
prevent crashes from coop tasks
RecursivePineapple Dec 22, 2024
f9a4d55
remove bw & gt++ worlds from eoh
RecursivePineapple Dec 22, 2024
327d9d1
forgot a util for the stone fixes
RecursivePineapple Dec 22, 2024
93fec99
optimize drilling plants
RecursivePineapple Dec 22, 2024
0b0780a
spotless
RecursivePineapple Dec 22, 2024
a738564
Merge branch 'master' into refactor-ore-and-worldgen
RecursivePineapple Dec 22, 2024
d7f16d2
gt ore item transformer
RecursivePineapple Dec 22, 2024
23b8207
kuiper belt fixes
RecursivePineapple Dec 22, 2024
d292692
truncate long lines in the plugin
RecursivePineapple Dec 22, 2024
93956a7
clean up gt ore localization
RecursivePineapple Dec 22, 2024
feeb1aa
bw fixes
RecursivePineapple Dec 22, 2024
26d5f15
spotless
RecursivePineapple Dec 22, 2024
753ad14
swap everglades rng to XSTR
RecursivePineapple Dec 22, 2024
f662b15
clean up & mini ore vein fix
RecursivePineapple Dec 23, 2024
4971d6d
int hashcode utils
RecursivePineapple Dec 23, 2024
ecb239b
disabled void mining in asteroid dims
RecursivePineapple Dec 23, 2024
c0005d6
Merge branch 'master' into refactor-ore-and-worldgen
RecursivePineapple Dec 23, 2024
a730939
improve asteroid profiling
RecursivePineapple Dec 23, 2024
9584c49
Remove metadata casts to byte
RecursivePineapple Dec 23, 2024
5b610bd
Merge branch 'remove-meta-byte-casts' into refactor-ore-and-worldgen
RecursivePineapple Dec 24, 2024
26563d5
Merge branch 'master' into refactor-ore-and-worldgen
RecursivePineapple Dec 24, 2024
51df8ea
optimize scanner
RecursivePineapple Dec 27, 2024
4dfe10f
Merge branch 'master' into refactor-ore-and-worldgen
RecursivePineapple Jan 6, 2025
dc79490
vp changes
RecursivePineapple Jan 7, 2025
46fc9b0
reduce hot-path allocations
RecursivePineapple Jan 7, 2025
5c16d04
clean up & fixes
RecursivePineapple Jan 10, 2025
ce65ac0
rename new classes
RecursivePineapple Jan 10, 2025
800ed4b
OreInfo header comment
RecursivePineapple Jan 10, 2025
49c324f
Merge branch 'master' into refactor-ore-and-worldgen
RecursivePineapple Jan 10, 2025
88fc4c0
spotless
RecursivePineapple Jan 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions src/main/java/bartworks/API/VoidMinerDropAdder.java

This file was deleted.

159 changes: 0 additions & 159 deletions src/main/java/bartworks/client/renderer/BWBlockOreRenderer.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static void unificationRecipeEnforcer() {
for (Werkstoff werkstoff : Werkstoff.werkstoffHashSet) {
StaticRecipeChangeLoaders.runMaterialLinker(werkstoff);
if (werkstoff.getGenerationFeatures().enforceUnification) {
HashSet<String> oreDictNames = new HashSet<>(werkstoff.getADDITIONAL_OREDICT());
HashSet<String> oreDictNames = new HashSet<>(werkstoff.getAdditionalOredict());
oreDictNames.add(werkstoff.getVarName());
StaticRecipeChangeLoaders.runMoltenUnificationEnfocement(werkstoff);
StaticRecipeChangeLoaders.runUnficationDeleter(werkstoff);
Expand Down
1 change: 0 additions & 1 deletion src/main/java/bartworks/neiHandler/NEIBWConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public void loadConfig() {
}

NEIBWConfig.sIsAdded = false;
new OreNEIHandler();
new BioVatNEIHandler(BartWorksRecipeMaps.bacterialVatRecipes.getDefaultRecipeCategory());
new BioLabNEIHandler(BartWorksRecipeMaps.bioLabRecipes.getDefaultRecipeCategory());
NEIBWConfig.sIsAdded = true;
Expand Down
Loading
Loading