diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/pokecenter.json b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/pokecenter.json new file mode 100644 index 0000000..c61740b --- /dev/null +++ b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/pokecenter.json @@ -0,0 +1,38 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/pokecenter_1", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/pokecenter_2", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/pokecenter_3", + "processors": { + "processors": [] + }, + "projection": "rigid" + }, + "weight": 1 + } + ], + "fallback": "generations_structures:village/desert/pokecenter" +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/streets/pokecenter.json b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/streets/pokecenter.json new file mode 100644 index 0000000..4d965bd --- /dev/null +++ b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/streets/pokecenter.json @@ -0,0 +1,23 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/streets/pokecenter/corner_01", + "processors": "minecraft:empty", + "projection": "terrain_matching" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/streets/pokecenter/straight_05", + "processors": "minecraft:empty", + "projection": "terrain_matching" + }, + "weight": 1 + } + ], + "fallback": "minecraft:village/plains/streets" +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/streets/pokemart.json b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/streets/pokemart.json new file mode 100644 index 0000000..c305f98 --- /dev/null +++ b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/village/desert/streets/pokemart.json @@ -0,0 +1,23 @@ +{ + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/streets/pokemart/corner_01", + "processors": "minecraft:empty", + "projection": "terrain_matching" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "generations_structures:village/desert/streets/pokemart/straight_05", + "processors": "minecraft:empty", + "projection": "terrain_matching" + }, + "weight": 1 + } + ], + "fallback": "minecraft:village/plains/streets" +} \ No newline at end of file diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/mixin/JigsawPlacementPlacerMixin.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/mixin/JigsawPlacementPlacerMixin.java index 11c03c7..e9568dd 100644 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/mixin/JigsawPlacementPlacerMixin.java +++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/mixin/JigsawPlacementPlacerMixin.java @@ -38,7 +38,7 @@ private ResourceKey modifyPoolKey(ResourceKey PLAINS_POKECENTER_3 = createKey("village/plains/pokecenter_3"); + ResourceKey DESERT_POKEMART_STREET_STRAIGHT_05 = createKey("village/desert/streets/pokemart/straight_05"); + ResourceKey DESERT_POKEMART_STREET_CORNER_01 = createKey("village/desert/streets/pokemart/corner_01"); + ResourceKey DESERT_POKECENTER_STREET_STRAIGHT_05 = createKey("village/desert/streets/pokecenter/straight_05"); + ResourceKey DESERT_POKECENTER_STREET_CORNER_01 = createKey("village/desert/streets/pokecenter/corner_01"); ResourceKey DESERT_POKEMART_1 = createKey("village/desert/pokemart_1"); ResourceKey DESERT_POKEMART_2 = createKey("village/desert/pokemart_2"); ResourceKey DESERT_POKEMART_3 = createKey("village/desert/pokemart_3"); + ResourceKey DESERT_POKECENTER_1 = createKey("village/desert/pokecenter_1"); + ResourceKey DESERT_POKECENTER_2 = createKey("village/desert/pokecenter_2"); + ResourceKey DESERT_POKECENTER_3 = createKey("village/desert/pokecenter_3"); /** * Creates a ResourceKey for the structure. * @param name The name of the structure or directory with name. diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java index 4196a4f..24a1805 100644 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java +++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java @@ -11,9 +11,7 @@ import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.data.worldgen.Pools; import net.minecraft.data.worldgen.ProcessorLists; -import net.minecraft.data.worldgen.VillagePools; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.levelgen.structure.pools.StructurePoolElement; import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList; @@ -145,11 +143,27 @@ public static void bootstrap(BootstapContext context) { Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.PLAINS_POKEMART_3.location().toString()), 1) ), StructureTemplatePool.Projection.RIGID); + register(context, DESERT_VILLAGE_POKEMART_STREETS, VanillaVillages.DESERT.getVillagePool("streets"), ImmutableList.of( + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKEMART_STREET_CORNER_01.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1), + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKEMART_STREET_STRAIGHT_05.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1) + ), StructureTemplatePool.Projection.TERRAIN_MATCHING); + + register(context, DESERT_VILLAGE_POKECENTER_STREETS, VanillaVillages.DESERT.getVillagePool("streets"), ImmutableList.of( + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKECENTER_STREET_CORNER_01.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1), + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKECENTER_STREET_STRAIGHT_05.location().toString(), getProcessor(context, ProcessorLists.EMPTY)), 1) + ), StructureTemplatePool.Projection.TERRAIN_MATCHING); + register(context, DESERT_VILLAGE_POKEMART, DESERT_VILLAGE_POKEMART, ImmutableList.of( Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKEMART_1.location().toString()), 1), Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKEMART_2.location().toString()), 1), Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKEMART_3.location().toString()), 1) ), StructureTemplatePool.Projection.RIGID); + + register(context, DESERT_VILLAGE_POKECENTER, DESERT_VILLAGE_POKECENTER, ImmutableList.of( + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKECENTER_1.location().toString()), 1), + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKECENTER_2.location().toString()), 1), + Pair.of(StructurePoolElement.single(GenerationsStructuresKeys.DESERT_POKECENTER_3.location().toString()), 1) + ), StructureTemplatePool.Projection.RIGID); } private static ResourceKey create(String name) { diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_1.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_1.nbt new file mode 100644 index 0000000..88e29ab Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_1.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_2.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_2.nbt new file mode 100644 index 0000000..196b559 Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_2.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_3.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_3.nbt new file mode 100644 index 0000000..30c4488 Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/pokecenter_3.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_1.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_1.nbt index a3a3be9..1b0b8d3 100644 Binary files a/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_1.nbt and b/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_1.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_2.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_2.nbt index 5624ade..4b8222d 100644 Binary files a/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_2.nbt and b/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_2.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_3.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_3.nbt index 25bfbc1..c2078f6 100644 Binary files a/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_3.nbt and b/common/src/main/resources/data/generations_structures/structures/village/desert/pokemart_3.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokecenter/corner_01.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokecenter/corner_01.nbt new file mode 100644 index 0000000..c494527 Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokecenter/corner_01.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokecenter/straight_05.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokecenter/straight_05.nbt new file mode 100644 index 0000000..7322d26 Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokecenter/straight_05.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokemart/corner_01.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokemart/corner_01.nbt new file mode 100644 index 0000000..a00b5ec Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokemart/corner_01.nbt differ diff --git a/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokemart/straight_05.nbt b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokemart/straight_05.nbt new file mode 100644 index 0000000..0609320 Binary files /dev/null and b/common/src/main/resources/data/generations_structures/structures/village/desert/streets/pokemart/straight_05.nbt differ