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

Revert "Revert "Revert "Test carved objects"""

Browse Source 
This reverts commit 6df6296cd149dfef6445e573c459904f63122ab7.
This commit is contained in:
DanLT 2021-07-06 02:04:39 -08:00
parent d50b7de668
commit 559f37e5d2
5 changed files with 10 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java
View File

@ -259,16 +259,4 @@ public class IrisCaveModifier extends EngineAssignedModifier<BlockData>
{
return B.isSolid(m) && !m.equals(Material.BEDROCK);
}
public boolean isCave(int x, int y, int z) {
for(CaveResult i : genCaves(x, z, x&15,z&15, null))
{
if(i.getFloor() < y && i.getCeiling() > y)
{
return true;
}
}
return false;
}
}

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

@ -474,11 +474,6 @@ public class IrisObject extends IrisRegistrant
}
public void set(int param1Int1, int param1Int2, int param1Int3, BlockData param1BlockData) {
if(config.isCarved() && oplacer.isCarved(param1Int1, param1Int2, param1Int3))
{
return;
}
oplacer.set(param1Int1, param1Int2, param1Int3, param1BlockData);
}
@ -509,11 +504,6 @@ public class IrisObject extends IrisRegistrant
public void setTile(int param1Int1, int param1Int2, int param1Int3, TileData<? extends TileState> param1TileData) {
oplacer.setTile(param1Int1, param1Int2, param1Int3, param1TileData);
}
@Override
public boolean isCarved(int xx, int j, int zz) {
return oplacer.isCarved(xx,j,zz);
}
} : oplacer;
if(config.isSmartBore())
@ -779,11 +769,6 @@ public class IrisObject extends IrisRegistrant
if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR))
{
if(config.isCarved() && placer.isCarved(xx, yy, zz))
{
continue;
}
placer.set(xx, yy, zz, data);
if(tile != null)
@ -851,11 +836,6 @@ public class IrisObject extends IrisRegistrant
for(int j = lowest + y; j > yg - config.getOverStilt() - 1; j--)
{
if(config.isCarved() && placer.isCarved(xx, j, zz))
{
continue;
}
placer.set(xx, j, zz, d);
}
}
@ -876,12 +856,6 @@ public class IrisObject extends IrisRegistrant
if(config.getSnow() > 0)
{
int height = rngx.i(0, (int) (config.getSnow() * 7));
if(config.isCarved() && placer.isCarved(vx, vy + 1, vz))
{
continue;
}
placer.set(vx, vy + 1, vz, SNOW_LAYERS[Math.max(Math.min(height, 7), 0)]);
}
}

4
src/main/java/com/volmit/iris/object/IrisObjectPlacement.java
View File

@ -72,10 +72,6 @@ public class IrisObjectPlacement
@Desc("When bore is enabled, lower min-y of the cuboid it removes")
private int boreExtendMinY = 0;
@DontObfuscate
@Desc("Allow objects to be carved by caves and carvings. Use this sparingly, there is a performance impact.")
private boolean carved = false;
@DontObfuscate
@Desc("If set to true, objects will place on the terrain height, ignoring the water surface.")
private boolean underwater = false;

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

@ -2,7 +2,6 @@ package com.volmit.iris.scaffold.engine;
import com.volmit.iris.Iris;
import com.volmit.iris.generator.IrisComplex;
import com.volmit.iris.generator.modifier.IrisCaveModifier;
import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.object.*;
import com.volmit.iris.object.tile.TileData;
@ -19,6 +18,7 @@ import org.bukkit.Chunk;
import org.bukkit.ChunkSnapshot;
import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_17_R1.util.CraftMagicNumbers;
import org.bukkit.util.BlockVector;
import org.bukkit.util.Consumer;
@ -41,12 +41,6 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
return getEngine().getParallax();
}
default boolean isCarved(int x, int y, int z)
{
return ((IrisCaveModifier)getEngine().getFramework().getCaveModifier()).isCave(x,y,z) ||
getEngine().getDimension().isCarved(x,y,z, getComplex().getRng(), getEngine().getHeight());
}
default IrisDataManager getData() {
return getEngine().getData();
}

20
src/main/java/com/volmit/iris/util/IObjectPlacer.java
View File

@ -6,25 +6,23 @@ import org.bukkit.block.data.BlockData;
public interface IObjectPlacer
{
int getHighest(int x, int z);
public int getHighest(int x, int z);
int getHighest(int x, int z, boolean ignoreFluid);
public int getHighest(int x, int z, boolean ignoreFluid);
void set(int x, int y, int z, BlockData d);
public void set(int x, int y, int z, BlockData d);
BlockData get(int x, int y, int z);
public BlockData get(int x, int y, int z);
boolean isPreventingDecay();
public boolean isPreventingDecay();
boolean isSolid(int x, int y, int z);
public boolean isSolid(int x, int y, int z);
boolean isUnderwater(int x, int z);
public boolean isUnderwater(int x, int z);
int getFluidHeight();
public int getFluidHeight();
boolean isDebugSmartBore();
public boolean isDebugSmartBore();
void setTile(int xx, int yy, int zz, TileData<? extends TileState> tile);
boolean isCarved(int xx, int j, int zz);
}