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

Cleanup sources

Browse Source
This commit is contained in:
cyberpwn 2022-01-12 08:39:55 -05:00
parent 64d8f22757
commit 4430fd21f5
8 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java
View File

@ -35,7 +35,6 @@ import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer; import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer;
import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer; import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer;
import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.CompoundTag;
import com.volmit.iris.util.scheduling.J;
import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.IdMap; import net.minecraft.core.IdMap;
@ -67,7 +66,6 @@ import java.io.DataOutputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -166,10 +164,8 @@ public class NMSBinding18_1 implements INMSBinding {
public Object getBiomeBaseFromId(int id) { public Object getBiomeBaseFromId(int id) {
try { try {
return byIdRef.aquire(() -> { return byIdRef.aquire(() -> {
for(Method i : IdMap.class.getDeclaredMethods()) for(Method i : IdMap.class.getDeclaredMethods()) {
{ if(i.getParameterCount() == 1 && i.getParameterTypes()[0].equals(int.class)) {
if(i.getParameterCount() == 1 && i.getParameterTypes()[0].equals(int.class))
{
Iris.info("[NMS] Found byId method in " + IdMap.class.getSimpleName() + "." + i.getName() + "(int) => " + Biome.class.getSimpleName()); Iris.info("[NMS] Found byId method in " + IdMap.class.getSimpleName() + "." + i.getName() + "(int) => " + Biome.class.getSimpleName());
return i; return i;
} }

9
src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java
View File

@ -25,7 +25,6 @@ import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.framework.EngineAssignedActuator;
import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisBiomeCustom; import com.volmit.iris.engine.object.IrisBiomeCustom;
import com.volmit.iris.util.collection.KSet;
import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.BlockCoordinates;
import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.Hunk;
import com.volmit.iris.util.hunk.view.BiomeGridHunkView; import com.volmit.iris.util.hunk.view.BiomeGridHunkView;
@ -108,15 +107,11 @@ public class IrisBiomeActuator extends EngineAssignedActuator<Biome> {
} else { } else {
Biome v = ib.getSkyBiome(rng, x, 0, z); Biome v = ib.getSkyBiome(rng, x, 0, z);
if(v != null) if(v != null) {
{
for(int i = 0; i < maxHeight; i++) { for(int i = 0; i < maxHeight; i++) {
h.set(finalXf, i, zf, v); h.set(finalXf, i, zf, v);
} }
} } else if(cl.flip()) {
else if(cl.flip())
{
Iris.error("No biome provided for " + ib.getLoadKey()); Iris.error("No biome provided for " + ib.getLoadKey());
} }
} }

1
src/main/java/com/volmit/iris/engine/framework/Engine.java
View File

@ -78,7 +78,6 @@ import org.bukkit.block.BlockFace;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

1
src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java
View File

@ -24,7 +24,6 @@ import com.volmit.iris.util.hunk.Hunk;
import lombok.Data; import lombok.Data;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;

6
src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@ -230,14 +230,12 @@ public class IrisDimension extends IrisRegistrant {
@ArrayType(type = IrisOreGenerator.class, min = 1) @ArrayType(type = IrisOreGenerator.class, min = 1)
private KList<IrisOreGenerator> ores = new KList<>(); private KList<IrisOreGenerator> ores = new KList<>();
public int getMaxHeight() public int getMaxHeight() {
{
return 320; return 320;
// return (int) getDimensionHeight().getMax(); // return (int) getDimensionHeight().getMax();
} }
public int getMinHeight() public int getMinHeight() {
{
return -64; return -64;
// return (int) getDimensionHeight().getMin(); // return (int) getDimensionHeight().getMin();
} }

1
src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java
View File

@ -44,7 +44,6 @@ import lombok.Data;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.generator.ChunkGenerator;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

4
src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java
View File

@ -34,7 +34,6 @@ import java.io.ByteArrayOutputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.util.concurrent.atomic.AtomicReferenceArray;
import static com.volmit.iris.util.nbt.mca.LoadFlags.*; import static com.volmit.iris.util.nbt.mca.LoadFlags.*;
@ -638,8 +637,7 @@ public class Chunk {
if(structures != null) level.put("Structures", structures); if(structures != null) level.put("Structures", structures);
ListTag<CompoundTag> sections = new ListTag<>(CompoundTag.class); ListTag<CompoundTag> sections = new ListTag<>(CompoundTag.class);
for(int i : this.sections.keySet()) for(int i : this.sections.keySet()) {
{
if(this.sections.get(i) != null) { if(this.sections.get(i) != null) {
sections.add(this.sections.get(i).updateHandle(i)); sections.add(this.sections.get(i).updateHandle(i));
} }