sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

cleanup, remove ambient occlusion from models

Browse source
This commit is contained in:
Sen 2025-05-30 18:08:07 +02:00
parent 8e0bbd06c2
commit d1a0847303
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
38 changed files with 175 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/src/main/java/server/Server.java
View file

@ -84,7 +84,7 @@ import common.tags.TagObject;
import common.util.BlockPos;
import common.util.EncryptUtil;
import common.util.ExtMath;
import common.util.LazyLoadBase;
import common.util.LazyLoader;
import common.util.PortalType;
import common.util.Position;
import common.util.Util;
@ -103,7 +103,7 @@ import server.world.Region;
import server.world.WorldServer;
public final class Server implements IThreadListener {
private static final LazyLoadBase<NioEventLoopGroup> SERVER_NIO_EVENTLOOP = new LazyLoadBase<NioEventLoopGroup>() {
private static final LazyLoader<NioEventLoopGroup> SERVER_NIO_EVENTLOOP = new LazyLoader<NioEventLoopGroup>() {
protected NioEventLoopGroup load() {
return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build());
}

74
server/src/main/java/server/world/NextTickListEntry.java Executable file
View file

@ -0,0 +1,74 @@
package server.world;
import common.block.Block;
import common.init.BlockRegistry;
import common.util.BlockPos;
public class NextTickListEntry implements Comparable<NextTickListEntry>
{
/** The id number for the next tick entry */
private static long nextTickEntryID;
private final Block block;
public final BlockPos position;
/** Time this tick is scheduled to occur at */
public long scheduledTime;
public int priority;
/** The id of the tick entry */
private long tickEntryID;
public NextTickListEntry(BlockPos positionIn, Block blockIn)
{
this.tickEntryID = (long)(nextTickEntryID++);
this.position = positionIn;
this.block = blockIn;
}
public boolean equals(Object p_equals_1_)
{
if (!(p_equals_1_ instanceof NextTickListEntry))
{
return false;
}
else
{
NextTickListEntry nextticklistentry = (NextTickListEntry)p_equals_1_;
return this.position.equals(nextticklistentry.position) && Block.isEqualTo(this.block, nextticklistentry.block);
}
}
public int hashCode()
{
return this.position.hashCode();
}
/**
* Sets the scheduled time for this tick entry
*/
public NextTickListEntry setScheduledTime(long scheduledTimeIn)
{
this.scheduledTime = scheduledTimeIn;
return this;
}
public void setPriority(int priorityIn)
{
this.priority = priorityIn;
}
public int compareTo(NextTickListEntry p_compareTo_1_)
{
return this.scheduledTime < p_compareTo_1_.scheduledTime ? -1 : (this.scheduledTime > p_compareTo_1_.scheduledTime ? 1 : (this.priority != p_compareTo_1_.priority ? this.priority - p_compareTo_1_.priority : (this.tickEntryID < p_compareTo_1_.tickEntryID ? -1 : (this.tickEntryID > p_compareTo_1_.tickEntryID ? 1 : 0))));
}
public String toString()
{
return BlockRegistry.getIdFromBlock(this.block) + ": " + this.position + ", " + this.scheduledTime + ", " + this.priority + ", " + this.tickEntryID;
}
public Block getBlock()
{
return this.block;
}
}

1
server/src/main/java/server/world/Region.java
View file

@ -28,7 +28,6 @@ import common.log.Log;
import common.tags.TagObject;
import common.tileentity.TileEntity;
import common.util.BlockPos;
import common.util.NextTickListEntry;
import common.util.NibbleArray;
import common.util.Util;
import common.world.BlockArray;

1
server/src/main/java/server/world/WorldServer.java
View file

@ -64,7 +64,6 @@ import common.util.ChunkPos;
import common.util.ExtMath;
import common.util.IntHashMap;
import common.util.LongHashMap;
import common.util.NextTickListEntry;
import common.util.PortalType;
import common.util.Position;
import common.util.Vec3;