mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 10:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Daniel Mills 2021-07-09 08:00:38 -04:00
parent 4fed35d189
commit b4f866be03
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -5,7 +5,7 @@ plugins {
} }
group 'com.volmit.iris' group 'com.volmit.iris'
version '1.4.11' version '1.4.12'
def apiVersion = '1.17' def apiVersion = '1.17'
def name = 'Iris' def name = 'Iris'
def main = 'com.volmit.iris.Iris' def main = 'com.volmit.iris.Iris'

4
src/main/java/com/volmit/iris/Iris.java
View File

@ -65,8 +65,7 @@ public class Iris extends VolmitPlugin implements Listener
instance = this; instance = this;
INMS.get(); INMS.get();
IO.delete(new File("iris")); IO.delete(new File("iris"));
lowMemoryMode = Runtime.getRuntime().maxMemory() < 4000000000L; // 4 * 1000 * 1000 * 1000 // 4g lowMemoryMode = Runtime.getRuntime().maxMemory() < 4000000000L; // 4 * 1000 * 1000 * 1000 // 4;
} }
public static int getThreadCount() public static int getThreadCount()
@ -178,6 +177,7 @@ public class Iris extends VolmitPlugin implements Listener
getServer().getPluginManager().registerEvents(new CommandLocate(), this); getServer().getPluginManager().registerEvents(new CommandLocate(), this);
getServer().getPluginManager().registerEvents(new WandManager() ,this); getServer().getPluginManager().registerEvents(new WandManager() ,this);
super.onEnable(); super.onEnable();
Bukkit.getPluginManager().registerEvents(this, this);
} }
private void checkConfigHotload() { private void checkConfigHotload() {

8
src/main/java/com/volmit/iris/object/IrisObject.java
View File

@ -555,9 +555,9 @@ public class IrisObject extends IrisRegistrant
BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ()); BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ());
BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone(); BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone();
for(int i = x - (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i <= x + (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i += (rotatedDimensions.getBlockX() / 2)) for(int i = x - (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i <= x + (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i += (rotatedDimensions.getBlockX() / 2)+1)
{ {
for(int j = z - (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j <= z + (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j += (rotatedDimensions.getBlockZ() / 2)) for(int j = z - (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j <= z + (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j += (rotatedDimensions.getBlockZ() / 2)+1)
{ {
int h = placer.getHighest(i, j, config.isUnderwater()) + rty; int h = placer.getHighest(i, j, config.isUnderwater()) + rty;
@ -595,9 +595,9 @@ public class IrisObject extends IrisRegistrant
BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ()); BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ());
BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone(); BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone();
for(int i = x - (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i <= x + (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i += (rotatedDimensions.getBlockX() / 2)) for(int i = x - (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i <= x + (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i += (rotatedDimensions.getBlockX() / 2)+1)
{ {
for(int j = z - (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j <= z + (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j += (rotatedDimensions.getBlockZ() / 2)) for(int j = z - (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j <= z + (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j += (rotatedDimensions.getBlockZ() / 2)+1)
{ {
int h = placer.getHighest(i, j, config.isUnderwater()) + rty; int h = placer.getHighest(i, j, config.isUnderwater()) + rty;

1
src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
View File

@ -432,6 +432,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
} }
default void generateParallaxSurface(RNG rng, int x, int z, IrisBiome biome, IrisRegion region, boolean vacuum) { default void generateParallaxSurface(RNG rng, int x, int z, IrisBiome biome, IrisRegion region, boolean vacuum) {
for (IrisObjectPlacement i : biome.getSurfaceObjects()) for (IrisObjectPlacement i : biome.getSurfaceObjects())
{ {
if(i.isVacuum() != vacuum) if(i.isVacuum() != vacuum)

2
src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java
View File

@ -6,6 +6,8 @@ import com.volmit.iris.scaffold.cache.Cache;
import com.volmit.iris.scaffold.stream.BasicStream; import com.volmit.iris.scaffold.stream.BasicStream;
import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.scaffold.stream.ProceduralStream;
import java.util.concurrent.ConcurrentHashMap;
public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStream<T> public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStream<T>
{ {
private final ProceduralStream<T> stream; private final ProceduralStream<T> stream;