diff --git a/src/main/java/org/ultramine/commands/basic/TechCommands.java b/src/main/java/org/ultramine/commands/basic/TechCommands.java index c327a9a..e6ae6fc 100644 --- a/src/main/java/org/ultramine/commands/basic/TechCommands.java +++ b/src/main/java/org/ultramine/commands/basic/TechCommands.java @@ -417,8 +417,8 @@ if(ctx.getAction().equals("stop")) { FMLCommonHandler.instance().bus().unregister(worldgen); + ctx.sendMessage("command.genworld.stop", worldgen.genCurrent, worldgen.genTotal); worldgen = null; - ctx.sendMessage("command.genworld.stop"); return; } @@ -456,7 +456,8 @@ private int x; private int z; - private int totalGenerated; + private int genCurrent; + private int genTotal; public WorldGenerator(int dim, int chunksPerTick) { @@ -478,6 +479,8 @@ x = minX; z = minZ; + + genTotal = (Math.abs(maxX - minX) + 8)*(Math.abs(maxZ - minZ) + 8); } @SubscribeEvent @@ -486,7 +489,7 @@ if(e.phase == TickEvent.Phase.START) { if(MinecraftServer.getServer().getTickCounter() % 600 == 0) - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentTranslation("command.genworld.process", totalGenerated)); + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentTranslation("command.genworld.process", genCurrent, genTotal)); if(MinecraftServer.getServer().getTickCounter() % Math.max(1,169/chunksPerTick) != 0) return; @@ -509,11 +512,13 @@ x = minX; z = minZ; + + genTotal = (Math.abs(maxX - minX) + 8)*(Math.abs(maxZ - minZ) + 8); } - while(x < maxX) + while(x <= maxX) { - while(z < maxZ) + while(z <= maxZ) { if(world.getBorder().isChunkInsideBorder(x, z)) { @@ -536,13 +541,13 @@ } } - totalGenerated += counter*169; + genCurrent += (counter-1)*81; if(borderInd >= (isBorder ? borders.length : 1)) { FMLCommonHandler.instance().bus().unregister(worldgen); worldgen = null; - MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentTranslation("command.genworld.complete", totalGenerated)); + MinecraftServer.getServer().getConfigurationManager().sendChatMsg(new ChatComponentTranslation("command.genworld.complete", genCurrent, genTotal)); } } } diff --git a/src/main/resources/assets/ultramine/lang/en_US.lang b/src/main/resources/assets/ultramine/lang/en_US.lang index 7cf57a4..681a9f0 100644 --- a/src/main/resources/assets/ultramine/lang/en_US.lang +++ b/src/main/resources/assets/ultramine/lang/en_US.lang @@ -201,9 +201,9 @@ command.genworld.already=World is now generating. Type "/genworld stop" before command.genworld.noborder=The world don't contains any borders; add border or use radially generation command.genworld.start=World generation started -command.genworld.stop=World generation stopped -command.genworld.complete=World generation completed (generated %s chunks) -command.genworld.process=World generation: generated %s chunks +command.genworld.stop=World generation stopped (generated %s/%s chunks) +command.genworld.complete=World generation completed (generated %s/%s chunks) +command.genworld.process=World generation: generated %s/%s chunks command.chunkdebug.usage=/chunkdebug OR /chunkdebug [average|peak] [count] command.chunkdebug.description=Starts per chunk profiling or displays results diff --git a/src/main/resources/assets/ultramine/lang/ru_RU.lang b/src/main/resources/assets/ultramine/lang/ru_RU.lang index 664f0b9..feb98b7 100644 --- a/src/main/resources/assets/ultramine/lang/ru_RU.lang +++ b/src/main/resources/assets/ultramine/lang/ru_RU.lang @@ -201,9 +201,9 @@ command.genworld.already=Генерауия мира уже запущена. Сначала введите "/genworld stop" command.genworld.noborder=Мир не содержит барьера; добавьте барьер или используйте генерацию по радиусу command.genworld.start=Генерация мира запущена -command.genworld.stop=Генерация мира остановлена -command.genworld.complete=Генерация мира завершена (сгенерировано %s чанков) -command.genworld.process=Генерация мира: сгенерировано %s чанков +command.genworld.stop=Генерация мира остановлена (сгенерировано %s/%s чанков) +command.genworld.complete=Генерация мира завершена (сгенерировано %s/%s чанков) +command.genworld.process=Генерация мира: сгенерировано %s/%s чанков command.chunkdebug.usage=/chunkdebug ИЛИ /chunkdebug [average|peak] [количество] command.chunkdebug.description=Запускает почанковое профилирование или выводит результаты