mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-17 14:21:08 +00:00
fix //regen and cleanup
This commit is contained in:
@@ -16,12 +16,13 @@ public class BiomeGridFactory implements TerraFactory<BiomeGridTemplate, BiomeGr
|
|||||||
public UserDefinedGridBuilder build(BiomeGridTemplate config, TerraPlugin main) throws LoadException {
|
public UserDefinedGridBuilder build(BiomeGridTemplate config, TerraPlugin main) throws LoadException {
|
||||||
|
|
||||||
UserDefinedGridBuilder holder = new UserDefinedGridBuilder();
|
UserDefinedGridBuilder holder = new UserDefinedGridBuilder();
|
||||||
holder.setXFreq(config.getXFreq());
|
|
||||||
holder.setZFreq(config.getZFreq());
|
|
||||||
|
|
||||||
int xSize = config.getGrid().size();
|
int xSize = config.getGrid().size();
|
||||||
int zSize = config.getGrid().get(0).size();
|
int zSize = config.getGrid().get(0).size();
|
||||||
|
|
||||||
|
holder.setXFreq(config.getXFreq() / xSize);
|
||||||
|
holder.setZFreq(config.getZFreq() / zSize);
|
||||||
|
|
||||||
Biome[][] biomes = new UserDefinedBiome[xSize][zSize];
|
Biome[][] biomes = new UserDefinedBiome[xSize][zSize];
|
||||||
|
|
||||||
for(int x = 0; x < xSize; x++) {
|
for(int x = 0; x < xSize; x++) {
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
|
|||||||
throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator());
|
throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator());
|
||||||
if(!worlds.containsKey(w.getName())) {
|
if(!worlds.containsKey(w.getName())) {
|
||||||
getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\"");
|
getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\"");
|
||||||
return new TerraWorld(w, ((MasterChunkGenerator) w.getGenerator()).getConfigPack(), this);
|
return new TerraWorld(w, ((MasterChunkGenerator) w.getGenerator().getHandle()).getConfigPack(), this);
|
||||||
}
|
}
|
||||||
return worldMap.computeIfAbsent(w, world -> new TerraWorld(w, worlds.get(w.getName()), this));
|
return worldMap.computeIfAbsent(w, world -> new TerraWorld(w, worlds.get(w.getName()), this));
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -1,12 +1,16 @@
|
|||||||
package com.dfsek.terra.bukkit.command.command.image;
|
package com.dfsek.terra.bukkit.command.command.image;
|
||||||
|
|
||||||
import com.dfsek.terra.bukkit.command.WorldCommand;
|
import com.dfsek.terra.bukkit.command.WorldCommand;
|
||||||
|
import com.dfsek.terra.bukkit.world.BukkitAdapter;
|
||||||
|
import com.dfsek.terra.config.lang.LangUtil;
|
||||||
|
import com.dfsek.terra.image.WorldImageGenerator;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -17,9 +21,8 @@ public class RenderCommand extends WorldCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(@NotNull Player sender, @NotNull Command command, @NotNull String label, @NotNull String[] args, World world) {
|
public boolean execute(@NotNull Player sender, @NotNull Command command, @NotNull String label, @NotNull String[] args, World world) {
|
||||||
/*
|
|
||||||
try {
|
try {
|
||||||
WorldImageGenerator g = new WorldImageGenerator(world, Integer.parseInt(args[0]), Integer.parseInt(args[1]), (TerraBukkitPlugin) getMain());
|
WorldImageGenerator g = new WorldImageGenerator(BukkitAdapter.adapt(world), Integer.parseInt(args[0]), Integer.parseInt(args[1]), getMain());
|
||||||
g.drawWorld(sender.getLocation().getBlockX(), sender.getLocation().getBlockZ());
|
g.drawWorld(sender.getLocation().getBlockX(), sender.getLocation().getBlockZ());
|
||||||
File file = new File(getMain().getDataFolder() + File.separator + "export" + File.separator + "map" + File.separator + "map_" + System.currentTimeMillis() + ".png");
|
File file = new File(getMain().getDataFolder() + File.separator + "export" + File.separator + "map" + File.separator + "map_" + System.currentTimeMillis() + ".png");
|
||||||
//noinspection ResultOfMethodCallIgnored
|
//noinspection ResultOfMethodCallIgnored
|
||||||
@@ -27,16 +30,13 @@ public class RenderCommand extends WorldCommand {
|
|||||||
//noinspection ResultOfMethodCallIgnored
|
//noinspection ResultOfMethodCallIgnored
|
||||||
file.createNewFile();
|
file.createNewFile();
|
||||||
g.save(file);
|
g.save(file);
|
||||||
LangUtil.send("command.image.render.save", sender, file.getAbsolutePath());
|
LangUtil.send("command.image.render.save", BukkitAdapter.adapt(sender), file.getAbsolutePath());
|
||||||
return true;
|
return true;
|
||||||
} catch(Exception e) {
|
} catch(Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
LangUtil.send("command.image.render.error", sender);
|
LangUtil.send("command.image.render.error", BukkitAdapter.adapt(sender));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
*/
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ public class BukkitSign extends BukkitBlockState implements Sign {
|
|||||||
public void applyState(String state) {
|
public void applyState(String state) {
|
||||||
SerialState.parse(state).forEach((k, v) -> {
|
SerialState.parse(state).forEach((k, v) -> {
|
||||||
if(!v.startsWith("text")) throw new IllegalArgumentException("Invalid property: " + k);
|
if(!v.startsWith("text")) throw new IllegalArgumentException("Invalid property: " + k);
|
||||||
setLine(Integer.parseInt(k), v.substring(4));
|
setLine(Integer.parseInt(k) + 1, v.substring(4));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user