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

remove Windows support, revert new guava to small version

Browse source
This commit is contained in:
Sen 2025-03-25 11:31:48 +01:00
parent fd84384f10
commit 920405d8c5
264 changed files with 22715 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/src/game/network/IThreadListener.java
View file

@ -1,6 +1,6 @@
package game.network;
import com.google.common.util.concurrent.ListenableFuture;
import game.future.ListenableFuture;
public interface IThreadListener
{

2
java/src/game/network/NetConnection.java
View file

@ -7,7 +7,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.regex.Pattern;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import game.future.ThreadFactoryBuilder;
import game.log.Log;
import game.network.NetHandler.ThreadQuickExitException;

2
java/src/game/network/NetHandlerPlayClient.java
View file

@ -5,7 +5,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.collect.Maps;
import game.collect.Maps;
import game.Game;
import game.dimension.Dimension;

8
java/src/game/network/NetHandlerPlayServer.java
View file

@ -7,9 +7,9 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Futures;
import java.util.function.Predicate;
import game.collect.Lists;
import game.future.Futures;
import game.Server;
import game.block.Block;
@ -2810,7 +2810,7 @@ public class NetHandlerPlayServer extends NetHandler implements ICrafting, Scrip
case MAGNET:
if(this.isAdmin()) {
List<Entity> list = this.entity.worldObj.getEntitiesWithinAABB(Entity.class, new BoundingBox(this.entity.getPosition().subtract(new BlockPos(128, 128, 128)), this.entity.getPosition().add(new BlockPos(128, 128, 128))), new Predicate<Entity>() {
public boolean apply(Entity entity) {
public boolean test(Entity entity) {
return entity.isEntityAlive() && (entity instanceof EntityItem || entity instanceof EntityXp);
}
});

6
java/src/game/network/PacketRegistry.java
View file

@ -2,9 +2,9 @@ package game.network;
import java.util.Map;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Maps;
import game.collect.BiMap;
import game.collect.HashBiMap;
import game.collect.Maps;
import game.packet.CPacketAction;
import game.packet.CPacketBook;