mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-01 23:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rotation of schematics

Browse Source
This commit is contained in:
Daniel Mills 2020-01-04 17:54:34 -05:00
parent f8a40b8fb3
commit ed0efec628
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ninja/bytecode/iris/Settings.java
View File

@ -9,10 +9,10 @@ public class Settings
public static class PerformanceSettings public static class PerformanceSettings
{ {
public PerformanceMode performanceMode = PerformanceMode.HALF_CPU; public PerformanceMode performanceMode = PerformanceMode.UNLIMITED;
public int threadCount = 12; public int threadCount = 12;
public int threadPriority = Thread.MIN_PRIORITY; public int threadPriority = Thread.MAX_PRIORITY;
public boolean loadonstart = false; public boolean loadonstart = true;
} }
public static class GeneratorSettings public static class GeneratorSettings
@ -26,7 +26,7 @@ public class Settings
public double superHeightScale = 0.95; public double superHeightScale = 0.95;
public double baseHeight = 0.165; public double baseHeight = 0.165;
public int seaLevel = 63; public int seaLevel = 63;
public double caveDensity = 3; public double caveDensity = 0;
public double biomeScale = 2.46; public double biomeScale = 2.46;
public boolean flatBedrock = false; public boolean flatBedrock = false;
public boolean doSchematics = true; public boolean doSchematics = true;

35
src/main/java/ninja/bytecode/iris/schematic/Schematic.java
View File

@ -105,6 +105,7 @@ public class Schematic
} }
din.close(); din.close();
center();
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@ -130,7 +131,6 @@ public class Schematic
} }
dos.close(); dos.close();
center();
} }
public BlockVector getOffset() public BlockVector getOffset()
@ -174,7 +174,7 @@ public class Schematic
public void place(World source, int wx, int wy, int wz) public void place(World source, int wx, int wy, int wz)
{ {
Location start = new Location(source, wx, wy, wz).clone().subtract(w / 2, centeredHeight ? h / 2 : 0, d / 2); Location start = new Location(source, wx, wy, wz).clone().subtract(0, centeredHeight ? h / 2 : 0, 0);
for(BlockVector i : getSchematic().k()) for(BlockVector i : getSchematic().k())
{ {
@ -210,41 +210,46 @@ public class Schematic
public void center() public void center()
{ {
GMap<BlockVector, MB> s = getSchematic().copy(); GMap<BlockVector, MB> sf = getSchematic().copy();
BlockVector max = new BlockVector(-w, -h, -d);
BlockVector min = new BlockVector(w, h, d);
clear(); clear();
BlockVector max = new BlockVector(-10000, -10000, -10000);
BlockVector min = new BlockVector(10000, 10000, 10000);
for(BlockVector i : s.k()) for(BlockVector i : sf.k())
{ {
if(i.lengthSquared() < min.lengthSquared()) if(i.getX() <= min.getX() && i.getZ() <= min.getZ() && i.getY() <= min.getY())
{ {
min = i; min = i;
} }
if(i.lengthSquared() > max.lengthSquared()) if(i.getX() >= max.getX() && i.getZ() >= max.getZ() && i.getY() >= max.getY())
{ {
max = i; max = i;
} }
} }
BlockVector center = min.clone().add(max.clone().multiply(0.5D)).toBlockVector(); BlockVector center = min.clone().add(max.clone().multiply(0.5D)).toBlockVector();
center.setY(0);
for(BlockVector i : s.k()) for(BlockVector i : sf.k())
{ {
getSchematic().put(i.clone().subtract(center).toBlockVector(), s.get(i)); getSchematic().put(i.clone().subtract(center).toBlockVector(), sf.get(i));
} }
x = 0;
y = 0;
z = 0;
} }
public void rotate(Direction from, Direction to) public void rotate(Direction from, Direction to)
{ {
center(); GMap<BlockVector, MB> sf = getSchematic().copy();
GMap<BlockVector, MB> s = getSchematic().copy();
clear(); clear();
for(BlockVector i : s.k()) for(BlockVector i : sf.k())
{ {
getSchematic().put(VectorMath.rotate(from, to, i).toBlockVector(), s.get(i)); getSchematic().put(VectorMath.rotate(from, to, i).toBlockVector(), sf.get(i));
} }
center();
} }
} }

5
src/main/java/ninja/bytecode/iris/util/Catalyst12.java
View File

@ -29,6 +29,11 @@ public class Catalyst12
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static void setBlock(World wo, int x, int y, int z, MB m) public static void setBlock(World wo, int x, int y, int z, MB m)
{ {
if(y > wo.getMaxHeight())
{
return;
}
net.minecraft.server.v1_12_R1.World w = ((CraftWorld) wo).getHandle(); net.minecraft.server.v1_12_R1.World w = ((CraftWorld) wo).getHandle();
net.minecraft.server.v1_12_R1.Chunk chunk = w.getChunkAt(x >> 4, z >> 4); net.minecraft.server.v1_12_R1.Chunk chunk = w.getChunkAt(x >> 4, z >> 4);
int combined = m.material.getId() + (m.data << 12); int combined = m.material.getId() + (m.data << 12);