SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup tests and add missing API detected by those tests

Browse Source
This commit is contained in:
Jake Potrebic
2023-12-08 12:07:56 -08:00
parent 4fc499dde8
commit b21ac86cac
8 changed files with 73 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/Add-missing-structure-set-seed-configs.patch
View File

@@ -90,6 +90,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ case "trail_ruins":
+ seed = conf.trailRuinsSeed;
+ break;
+ case "trial_chambers":
+ seed = conf.trialChambersSeed;
+ break;
+ // Paper end
}
@@ -242,6 +245,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - add missing structure set configs
+ public int ancientCitySeed;
+ public int trailRuinsSeed;
+ public int trialChambersSeed;
+ public int buriedTreasureSeed;
+ public Integer mineshaftSeed;
+ public Long strongholdSeed;
@@ -260,6 +264,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - add missing structure set configs
+ this.ancientCitySeed = this.getInt("seed-ancientcity", 20083232);
+ this.trailRuinsSeed = this.getInt("seed-trailruins", 83469867);
+ this.trialChambersSeed = this.getInt("seed-trialchambers", 94251327);
+ this.buriedTreasureSeed = this.getInt("seed-buriedtreasure", 10387320); // StructurePlacement#HIGHLY_ARBITRARY_RANDOM_SALT
+ this.mineshaftSeed = this.getSeed("seed-mineshaft", Integer::parseInt);
+ this.strongholdSeed = this.getSeed("seed-stronghold", Long::parseLong);
@@ -334,6 +339,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ case "end_cities" -> config.endCitySeed;
+ case "ancient_cities" -> config.ancientCitySeed;
+ case "trail_ruins" -> config.trailRuinsSeed;
+ case "trial_chambers" -> config.trialChambersSeed;
+ default -> throw new AssertionError("Missing structure set seed in SpigotWorldConfig for " + setKey);
+ };
+ if (setKey == BuiltinStructureSets.BURIED_TREASURES) {