mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-17 14:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Development' into Development

Browse Source
This commit is contained in:
cyberpwn
2022-09-10 02:04:58 -04:00
parent e545269b93 94557830f5
commit 3d0c0a11ed
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -24,7 +24,7 @@ plugins {
id "de.undercouch.download" version "5.0.1" id "de.undercouch.download" version "5.0.1"
} }
version '2.2.17-1.19.2' // Needs to be version specific version '2.2.18-1.19.2' // Needs to be version specific
def nmsVersion = "1.19.2" //[NMS] def nmsVersion = "1.19.2" //[NMS]
def apiVersion = '1.19' def apiVersion = '1.19'
def specialSourceVersion = '1.11.0' //[NMS] def specialSourceVersion = '1.11.0' //[NMS]
src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
+1 -2
View File
@@ -126,8 +126,7 @@ public class PlannedStructure {
} }
int id = rng.i(0, Integer.MAX_VALUE); int id = rng.i(0, Integer.MAX_VALUE);
vo.place(xx, height, zz, placer, options, rng, e.shouldReduce(eng) ? null : (b) vo.place(xx, height, zz, placer, options, rng, (b) -> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData());
-> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData());
} }
public void place(World world) { public void place(World world) {
src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
+1 -3
View File
@@ -94,9 +94,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
int xx = rng.i(x, x + 15); int xx = rng.i(x, x + 15);
int zz = rng.i(z, z + 15); int zz = rng.i(z, z + 15);
int id = rng.i(0, Integer.MAX_VALUE); int id = rng.i(0, Integer.MAX_VALUE);
v.place(xx, -1, zz, writer, objectPlacement, rng, v.place(xx, -1, zz, writer, objectPlacement, rng, (b) -> writer.setData(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData());
getMantle().shouldReduce(getEngineMantle().getEngine()) ? null : (b) -> writer.setData(b.getX(), b.getY(), b.getZ(),
v.getLoadKey() + "@" + id), null, getData());
} }
} }
src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
+2
View File
@@ -203,6 +203,8 @@ public class IrisObjectPlacement {
TableCache tc = new TableCache(); TableCache tc = new TableCache();
for(IrisObjectLoot loot : getLoot()) { for(IrisObjectLoot loot : getLoot()) {
if(loot == null)
continue;
IrisLootTable table = manager.getLootLoader().load(loot.getName()); IrisLootTable table = manager.getLootLoader().load(loot.getName());
if(table == null) { if(table == null) {
Iris.warn("Couldn't find loot table " + loot.getName()); Iris.warn("Couldn't find loot table " + loot.getName());
src/main/java/com/volmit/iris/util/matter/Matter.java
-1
View File
@@ -24,7 +24,6 @@ import com.volmit.iris.engine.object.IrisPosition;
import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.Hunk;
import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.BlockPosition;
import com.volmit.iris.util.scheduling.J;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;