mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-16 13:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

add message to export command, more cleanup

Browse Source
This commit is contained in:
dfsek
2021-01-07 09:45:40 -07:00
parent c6ff808cce
commit e47b3f0397
5 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/biome/BiomeZone.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class BiomeZone {
this.noise.setFractalType(FastNoiseLite.FractalType.FBm); this.noise.setFractalType(FastNoiseLite.FractalType.FBm);
this.noise.setFractalOctaves(4); this.noise.setFractalOctaves(4);
ConfigPackTemplate t = wc.getTemplate(); ConfigPackTemplate t = wc.getTemplate();
this.noise.setFrequency(1D / t.getZoneFreq()); this.noise.setFrequency(1D / (t.getZoneFreq() * grids.length));
this.grids = grids; this.grids = grids;
imageLoader = t.getImageLoader(); imageLoader = t.getImageLoader();
useImage = t.isFromImage(); useImage = t.isFromImage();
common/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class ConfigPackTemplate implements ValidatedConfigTemplate {
@Value("frequencies.zone") @Value("frequencies.zone")
@Default @Default
private int zoneFreq = 2048; private int zoneFreq = 256;
@Value("blend.enable") @Value("blend.enable")
@Default @Default
common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java
+2 -2
View File
@@ -20,8 +20,8 @@ public class BiomeGridFactory implements TerraFactory<BiomeGridTemplate, BiomeGr
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.setXFreq(config.getXFreq() * xSize);
holder.setZFreq(config.getZFreq() / zSize); holder.setZFreq(config.getZFreq() * zSize);
Biome[][] biomes = new UserDefinedBiome[xSize][zSize]; Biome[][] biomes = new UserDefinedBiome[xSize][zSize];
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/ExportCommand.java
+1 -21
View File
@@ -95,27 +95,7 @@ public class ExportCommand extends PlayerCommand {
/* sender.sendMessage("Exported structure to " + file.getAbsolutePath());
Structure structure;
try {
structure = new Structure(l1, l2, args[0]);
} catch(InitializationException e) {
sender.sendMessage(e.getMessage());
return true;
}
try {
File file = new File(getMain().getDataFolder() + File.separator + "export" + File.separator + "structures", args[0] + ".tstructure");
//noinspection ResultOfMethodCallIgnored
file.getParentFile().mkdirs();
//noinspection ResultOfMethodCallIgnored
file.createNewFile();
structure.save(file);
LangUtil.send("command.structure.export", sender, file.getAbsolutePath());
} catch(IOException e) {
e.printStackTrace();
}
*/
return true; return true;
} }
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java
-2
View File
@@ -10,7 +10,6 @@ import com.dfsek.terra.api.util.FastRandom;
import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.api.world.tree.Tree;
import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.BukkitAdapter;
import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.debug.Debug;
import com.dfsek.terra.registry.TreeRegistry; import com.dfsek.terra.registry.TreeRegistry;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeType; import org.bukkit.TreeType;
@@ -54,7 +53,6 @@ public class EventListener implements Listener {
block.setType(Material.AIR); block.setType(Material.AIR);
TreeRegistry registry = c.getTreeRegistry(); TreeRegistry registry = c.getTreeRegistry();
Tree tree = registry.get(TREE_TYPE_STRING_TRANSFORMER.translate(e.getSpecies())); Tree tree = registry.get(TREE_TYPE_STRING_TRANSFORMER.translate(e.getSpecies()));
Debug.info("Overrode tree type: " + e.getSpecies());
org.bukkit.Location location = e.getLocation(); org.bukkit.Location location = e.getLocation();
if(!tree.plant(new Location(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom())) block.setBlockData(data); if(!tree.plant(new Location(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom())) block.setBlockData(data);
} }