Skip to content

Commit

Permalink
Update balancing
Browse files Browse the repository at this point in the history
  • Loading branch information
@frqnny
frqnny committed May 3, 2022
1 parent 6056313 commit 00460cf
Show file tree
Hide file tree
Showing 32 changed files with 62 additions and 152 deletions.
31 changes: 15 additions & 16 deletions src/main/java/io/github/frqnny/mostructures/config/MoStructuresConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,21 @@ public StructureConfigEntry get(Identifier id) {

@Override
public void save() {
structureConfigEntries.putIfAbsent("abandoned_church", StructureConfigEntry.of(16, 32));
structureConfigEntries.putIfAbsent("air_balloon", StructureConfigEntry.of(6, 12));
structureConfigEntries.putIfAbsent("barn_house", StructureConfigEntry.of(16, 32));
structureConfigEntries.putIfAbsent("big_pyramid", StructureConfigEntry.of(16, 24));
structureConfigEntries.putIfAbsent("ice_tower", StructureConfigEntry.of(16, 24));
structureConfigEntries.putIfAbsent("jungle_pyramid", StructureConfigEntry.of(16, 20));
structureConfigEntries.putIfAbsent("killer_bunny_castle", StructureConfigEntry.of(25, 35));
structureConfigEntries.putIfAbsent("lighthouse", StructureConfigEntry.of(16, 25));
structureConfigEntries.putIfAbsent("moai", StructureConfigEntry.of(8, 10));
structureConfigEntries.putIfAbsent("pillager_factory", StructureConfigEntry.of(16, 36));
structureConfigEntries.putIfAbsent("pirate_ship", StructureConfigEntry.of(16, 40));
structureConfigEntries.putIfAbsent("tavern", StructureConfigEntry.of(16, 32));
structureConfigEntries.putIfAbsent("the_castle_in_the_sky", StructureConfigEntry.of(16, 29));
structureConfigEntries.putIfAbsent("villager_tower", StructureConfigEntry.of(16, 32));
structureConfigEntries.putIfAbsent("villager_market", StructureConfigEntry.of(16, 34));
structureConfigEntries.putIfAbsent("volcanic_vent", StructureConfigEntry.of(16, 32));
structureConfigEntries.putIfAbsent("abandoned_church", StructureConfigEntry.of(14, 26));
structureConfigEntries.putIfAbsent("air_balloon", StructureConfigEntry.of(10, 20));
structureConfigEntries.putIfAbsent("barn_house", StructureConfigEntry.of(13, 24));
structureConfigEntries.putIfAbsent("big_pyramid", StructureConfigEntry.of(16, 20));
structureConfigEntries.putIfAbsent("ice_tower", StructureConfigEntry.of(14, 22));
structureConfigEntries.putIfAbsent("jungle_pyramid", StructureConfigEntry.of(14, 16));
structureConfigEntries.putIfAbsent("killer_bunny_castle", StructureConfigEntry.of(22, 30));
structureConfigEntries.putIfAbsent("lighthouse", StructureConfigEntry.of(14, 24));
structureConfigEntries.putIfAbsent("moai", StructureConfigEntry.of(15, 17));
structureConfigEntries.putIfAbsent("pillager_factory", StructureConfigEntry.of(14, 30));
structureConfigEntries.putIfAbsent("pirate_ship", StructureConfigEntry.of(14, 32));
structureConfigEntries.putIfAbsent("tavern", StructureConfigEntry.of(13, 30));
structureConfigEntries.putIfAbsent("the_castle_in_the_sky", StructureConfigEntry.of(15, 23));
structureConfigEntries.putIfAbsent("villager_market", StructureConfigEntry.of(16, 30));
structureConfigEntries.putIfAbsent("villager_tower", StructureConfigEntry.of(16, 29));
Config.super.save();
}
}
2 changes: 1 addition & 1 deletion src/main/java/io/github/frqnny/mostructures/structure/ModStructure.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static boolean canGenerate(StructureGeneratorFactory.Context<ConfigMS> co

public static boolean checks(ChunkGenerator chunkGenerator, long worldSeed, ChunkPos pos, ConfigMS config, HeightLimitView world) {
for (RegistryKey<StructureSet> key : config.structureSetToAvoid) {
if (chunkGenerator.method_41053(key, worldSeed, pos.x, pos.z, 2)) {
if (chunkGenerator.method_41053(key, worldSeed, pos.x, pos.z, 3)) {
return false;
}
}
Expand Down
7 changes: 1 addition & 6 deletions src/main/resources/data/mostructures/worldgen/configured_structure_feature/barn_house.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@
"start_pool": "mostructures:barn_house/base_plates",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:villager_market"
],
"size": 7,
"heightRange": 40
Expand Down
12 changes: 1 addition & 11 deletions src/main/resources/data/mostructures/worldgen/configured_structure_feature/big_pyramid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,7 @@
"config": {
"start_pool": "mostructures:pyramid/base",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:barn_house",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:abandoned_church"
],
"size": 7,
"heightRange": 40
Expand Down
7 changes: 0 additions & 7 deletions ...rces/data/mostructures/worldgen/configured_structure_feature/desert_abandoned_church.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@
"config": {
"start_pool": "mostructures:abandoned/village/plates_desert",
"structure_set_to_avoid": [
"mostructures:barn_house",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
],
"size": 7,
Expand Down
7 changes: 0 additions & 7 deletions src/main/resources/data/mostructures/worldgen/configured_structure_feature/ice_tower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,8 @@
"start_pool": "mostructures:ice_tower/base",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:barn_house",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
],
"size": 7,
Expand Down
14 changes: 1 addition & 13 deletions ...ain/resources/data/mostructures/worldgen/configured_structure_feature/jungle_pyramid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,7 @@
"type": "mostructures:generic",
"config": {
"start_pool": "mostructures:jungle_pyramid/base",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:barn_house",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
],
"structure_set_to_avoid": [],
"size": 7,
"heightRange": 40
},
Expand Down
3 changes: 0 additions & 3 deletions ...esources/data/mostructures/worldgen/configured_structure_feature/killer_bunny_castle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:barn_house",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
],
"size": 7,
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/data/mostructures/worldgen/configured_structure_feature/lighthouse.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:barn_house",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
Expand Down
10 changes: 2 additions & 8 deletions ...n/resources/data/mostructures/worldgen/configured_structure_feature/pillager_factory.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@
"config": {
"start_pool": "mostructures:factory/base",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:barn_house",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:barn_house",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:moai"
],
"size": 7,
"heightRange": 40
Expand Down
9 changes: 1 addition & 8 deletions ...rces/data/mostructures/worldgen/configured_structure_feature/plains_abandoned_church.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,10 @@
"config": {
"start_pool": "mostructures:abandoned/village/plates_plains",
"structure_set_to_avoid": [
"mostructures:barn_house",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:villager_market"
],
"size": 7,
"heightRange": 40
Expand Down
9 changes: 1 addition & 8 deletions ...ces/data/mostructures/worldgen/configured_structure_feature/savanna_abandoned_church.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,10 @@
"config": {
"start_pool": "mostructures:abandoned/village/plates_savanna",
"structure_set_to_avoid": [
"mostructures:barn_house",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:tavern"
],
"size": 7,
"heightRange": 40
Expand Down
10 changes: 1 addition & 9 deletions ...urces/data/mostructures/worldgen/configured_structure_feature/snowy_abandoned_church.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,9 @@
"config": {
"start_pool": "mostructures:abandoned/village/plates_snowy",
"structure_set_to_avoid": [
"mostructures:barn_house",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:pillager_factory"
],
"size": 7,
"heightRange": 40
Expand Down
5 changes: 1 addition & 4 deletions ...urces/data/mostructures/worldgen/configured_structure_feature/taiga_abandoned_church.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
"start_pool": "mostructures:abandoned/village/plates_taiga",
"structure_set_to_avoid": [
"mostructures:barn_house",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:villager_tower"
"mostructures:villager_market"
],
"size": 7,
"heightRange": 40
Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/data/mostructures/worldgen/configured_structure_feature/tavern.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
"config": {
"start_pool": "mostructures:tavern/base_plates",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
Expand Down
8 changes: 1 addition & 7 deletions ...in/resources/data/mostructures/worldgen/configured_structure_feature/villager_market.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@
"config": {
"start_pool": "mostructures:market/main",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:barn_house",
"mostructures:villager_tower"
"mostructures:barn_house"
],
"size": 7,
"heightRange": 40
Expand Down
4 changes: 0 additions & 4 deletions ...ain/resources/data/mostructures/worldgen/configured_structure_feature/villager_tower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@
"start_pool": "mostructures:villager/tower_plates",
"structure_set_to_avoid": [
"mostructures:abandoned_church",
"mostructures:big_pyramid",
"mostructures:ice_tower",
"mostructures:jungle_pyramid",
"mostructures:killer_bunny_castle",
"mostructures:lighthouse",
"mostructures:moai",
"mostructures:pillager_factory",
"mostructures:tavern",
"mostructures:villager_market",
"mostructures:barn_house"
],
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/data/mostructures/worldgen/structure_set/abandoned_church.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 32,
"separation": 16,
"salt": 66996840
"spacing": 26,
"separation": 14,
"salt": 16996840
}
}
6 changes: 3 additions & 3 deletions src/main/resources/data/mostructures/worldgen/structure_set/air_balloon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 12,
"separation": 6,
"salt": 29483148
"spacing": 20,
"separation": 10,
"salt": 19483148
}
}
6 changes: 3 additions & 3 deletions src/main/resources/data/mostructures/worldgen/structure_set/barn_house.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 32,
"separation": 16,
"salt": 165757306
"spacing": 24,
"separation": 13,
"salt": 265757306
}
}
4 changes: 2 additions & 2 deletions src/main/resources/data/mostructures/worldgen/structure_set/big_pyramid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 24,
"spacing": 20,
"separation": 16,
"salt": 239284294
"salt": 139284294
}
}
4 changes: 2 additions & 2 deletions src/main/resources/data/mostructures/worldgen/structure_set/ice_tower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 26,
"separation": 16,
"spacing": 22,
"separation": 14,
"salt": 964058305
}
}
4 changes: 2 additions & 2 deletions src/main/resources/data/mostructures/worldgen/structure_set/jungle_pyramid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 20,
"separation": 16,
"spacing": 16,
"separation": 14,
"salt": 112178642
}
}
6 changes: 3 additions & 3 deletions src/main/resources/data/mostructures/worldgen/structure_set/killer_bunny_castle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
],
"placement": {
"type": "minecraft:random_spread",
"spacing": 35,
"separation": 25,
"salt": 48123900
"spacing": 30,
"separation": 22,
"salt": 181239001
}
}
Loading

0 comments on commit 00460cf

Please sign in to comment.