mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-22 16:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'biome' into asmparser

Browse Source 
# Conflicts:
#	platforms/bukkit/build.gradle.kts
This commit is contained in:
dfsek
2021-02-06 22:28:53 -07:00
parent 7418d67b09 85efa44673
commit 490fed8c2c
32 changed files with 781 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/bukkit/build.gradle.kts
View File

@@ -96,9 +96,9 @@ val testWithPaper = task<JavaExec>(name = "testWithPaper") {
"-XX:InitiatingHeapOccupancyPercent=15", "-XX:G1MixedGCLiveThresholdPercent=90",
"-XX:G1RSetUpdatingPauseTimePercent=5", "-XX:SurvivorRatio=32", "-XX:+PerfDisableSharedMem",
"-XX:MaxTenuringThreshold=1", "-Dusing.aikars.flags=https://mcflags.emc.gs",
"-Daikars.new.flags=true", "-DIReallyKnowWhatIAmDoingISwear", "-DASMDumpClasses=true")
maxHeapSize = "3G"
minHeapSize = "3G"
"-Daikars.new.flags=true", "-DIReallyKnowWhatIAmDoingISwear")
maxHeapSize = "4G"
minHeapSize = "4G"
//args = listOf("nogui")
workingDir = file("${testDir}/")
classpath = files("${testDir}/paper.jar")

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java
View File

@@ -9,6 +9,7 @@ import com.dfsek.terra.bukkit.population.PopulationManager;
import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
import com.dfsek.terra.config.lang.LangUtil;
import com.dfsek.terra.population.CavePopulator;
import com.dfsek.terra.profiler.DataType;
import com.dfsek.terra.profiler.Measurement;
import com.dfsek.terra.world.TerraWorld;
@@ -52,6 +53,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
popMan.attach(new OrePopulator(main));
popMan.attach(new TreePopulator(main));
popMan.attach(new FloraPopulator(main));
populators.add(new CavePopulator(main));
populators.add(new StructurePopulator(main));
populators.add(popMan);
}

2
platforms/bukkit/src/main/resources/lang/afr_sa.yml
View File

@@ -25,7 +25,7 @@ command:
biome-found: "Bioom geleë te (%1$s, %2$s)"
unable-to-locate: "Kan bioom nie opspoor nie."
invalid-radius: "Ongeldige radius: \"%s\""
invalid: "Ongeldige TerraBiome-ID: \"%s\""
invalid: "Ongeldige Biome-ID: \"%s\""
in: "Jy is in \"%s\""
ore:
main-menu:

2
platforms/bukkit/src/main/resources/lang/de_de.yml
View File

@@ -56,7 +56,7 @@ command:
gui:
main-menu:
- "-------------Terra/image/gui-------------"
- "raw - Öffnet eine GUI mit TerraBiome-Rohdaten"
- "raw - Öffnet eine GUI mit Biome-Rohdaten"
- "step - Daten erneut rendern, um Ränder deutlicher darzustellen"
debug: "Der Debug-Modus muss aktiviert sein, um die Debug-GUI verwenden zu können! Die Debug-GUI ist NICHT PRODUKTIONSSICHER!"
render:

4
platforms/bukkit/src/main/resources/lang/en_us.yml
View File

@@ -26,7 +26,7 @@ command:
biome-found: "Located biome at (%1$s, %2$s)"
unable-to-locate: "Unable to locate biome."
invalid-radius: "Invalid radius: \"%s\""
invalid: "Invalid TerraBiome ID: \"%s\""
invalid: "Invalid Biome ID: \"%s\""
in: "You are in \"%s\""
packs:
main: "Currently installed config packs:"
@@ -61,7 +61,7 @@ command:
gui:
main-menu:
- "-------------Terra/image/gui-------------"
- "raw - Open GUI with raw TerraBiome data"
- "raw - Open GUI with raw Biome data"
- "step - Re-render data to show borders more clearly"
debug: "Debug mode must be enabled to use the debug GUI! The debug GUI is NOT PRODUCTION SAFE!"
render: