9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-30 04:29:05 +00:00

Fix commands & support regeneration

This commit is contained in:
Daniel Mills
2020-10-12 00:18:05 -04:00
parent a46f57eaab
commit e72ea21b6b
21 changed files with 486 additions and 120 deletions

View File

@@ -2,6 +2,7 @@ package com.volmit.iris.edit;
import java.io.Closeable;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
public interface BlockEditor extends Closeable
@@ -11,7 +12,15 @@ public interface BlockEditor extends Closeable
public void set(int x, int y, int z, BlockData d);
public BlockData get(int x, int y, int z);
public void setBiome(int x, int z, Biome b);
public void setBiome(int x, int y, int z, Biome b);
@Override
public void close();
public Biome getBiome(int x, int y, int z);
public Biome getBiome(int x, int z);
}

View File

@@ -1,6 +1,7 @@
package com.volmit.iris.edit;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import com.volmit.iris.util.M;
@@ -37,4 +38,30 @@ public class BukkitBlockEditor implements BlockEditor
{
return M.ms();
}
@SuppressWarnings("deprecation")
@Override
public void setBiome(int x, int z, Biome b)
{
world.setBiome(x, z, b);
}
@Override
public void setBiome(int x, int y, int z, Biome b)
{
world.setBiome(x, y, z, b);
}
@Override
public Biome getBiome(int x, int y, int z)
{
return world.getBiome(x, y, z);
}
@SuppressWarnings("deprecation")
@Override
public Biome getBiome(int x, int z)
{
return world.getBiome(x, z);
}
}

View File

@@ -1,12 +1,15 @@
package com.volmit.iris.edit;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.biome.BiomeTypes;
import com.volmit.iris.util.M;
public class WEBlockEditor implements BlockEditor
@@ -22,12 +25,21 @@ public class WEBlockEditor implements BlockEditor
es = WorldEdit.getInstance().newEditSessionBuilder().world(BukkitAdapter.adapt(world)).build();
}
@SuppressWarnings("deprecation")
public void setBiome(int x, int z, Biome b)
{
es.setBiome(BlockVector2.at(x, z), BiomeTypes.get("minecraft:" + b.name().toLowerCase()));
}
public void setBiome(int x, int y, int z, Biome b)
{
es.setBiome(BlockVector3.at(x, y, z), BiomeTypes.get("minecraft:" + b.name().toLowerCase()));
}
@Override
public void set(int x, int y, int z, BlockData d)
{
last = M.ms();
es.rawSetBlock(BlockVector3.at(x, y, z), BukkitAdapter.adapt(d));
world.getBlockAt(x, y, z).setBlockData(d, false);
}
@Override
@@ -48,4 +60,17 @@ public class WEBlockEditor implements BlockEditor
{
return last;
}
@Override
public Biome getBiome(int x, int y, int z)
{
return world.getBiome(x, y, z);
}
@SuppressWarnings("deprecation")
@Override
public Biome getBiome(int x, int z)
{
return world.getBiome(x, z);
}
}