From 1a1ec159b847c70bb6e14f4a2790efb95dcee114 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Sat, 3 Feb 2024 12:00:03 -0500 Subject: [PATCH] Update pokecenter.nbt --- .../village/PlaceInVillage.java | 10 ++++----- .../structures/pokecenter.nbt | Bin 9393 -> 20401 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/village/PlaceInVillage.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/village/PlaceInVillage.java index 57004b2..9390290 100644 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/village/PlaceInVillage.java +++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/village/PlaceInVillage.java @@ -63,11 +63,11 @@ public static void addStructuresToVillages(MinecraftServer server) { if (!config.AllowStructuresInVillages) return; GenerationsStructures.LOGGER.info("Adding structures to villages"); RegistryAccess.Frozen serverRegistry = server.registryAccess(); - addBuildingToPool(serverRegistry, getPoolRL("plains/streets"), ProcessorLists.STREET_PLAINS, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 5); - addBuildingToPool(serverRegistry, getPoolRL("desert/streets"), ProcessorLists.EMPTY, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 2); - addBuildingToPool(serverRegistry, getPoolRL("savanna/streets"), ProcessorLists.STREET_SAVANNA, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 2); - addBuildingToPool(serverRegistry, getPoolRL("snowy/streets"), ProcessorLists.STREET_SNOWY_OR_TAIGA, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 2); - addBuildingToPool(serverRegistry, getPoolRL("taiga/streets"), ProcessorLists.STREET_SNOWY_OR_TAIGA, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 2); + addBuildingToPool(serverRegistry, getPoolRL("plains/streets"), ProcessorLists.STREET_PLAINS, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 3); + //addBuildingToPool(serverRegistry, getPoolRL("desert/streets"), ProcessorLists.EMPTY, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 3); + addBuildingToPool(serverRegistry, getPoolRL("savanna/streets"), ProcessorLists.STREET_SAVANNA, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 3); + addBuildingToPool(serverRegistry, getPoolRL("snowy/streets"), ProcessorLists.STREET_SNOWY_OR_TAIGA, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 3); + addBuildingToPool(serverRegistry, getPoolRL("taiga/streets"), ProcessorLists.STREET_SNOWY_OR_TAIGA, GenerationsStructuresKeys.GenerationsStreetKeys.POKE_STREET.location(), StructureTemplatePool.Projection.TERRAIN_MATCHING, 3); } private static ResourceLocation getPoolRL(String poolName) { diff --git a/common/src/main/resources/data/generations_structures/structures/pokecenter.nbt b/common/src/main/resources/data/generations_structures/structures/pokecenter.nbt index 5476b4d791a456f870c7b51a4d3100d8b341cb05..c249628a1093573f772bfba9a15ce796c48c9d4f 100644 GIT binary patch literal 20401 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 STAs+4#CX}OzDHR0*8c;B0p_{@ literal 9393 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 Y>tH|XOPQq~7BtnS^0JSgU%BFc0DY`FGynhq diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail