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

4
java/src/game/item/Item.java
View file

@ -4,8 +4,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import game.collect.Maps;
import game.collect.Sets;
import game.block.Block;
import game.color.TextColor;

6
java/src/game/item/ItemArmor.java
View file

@ -4,8 +4,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Sets;
import java.util.function.Predicate;
import game.collect.Sets;
import game.block.BlockDispenser;
import game.dispenser.BehaviorDefaultDispenseItem;
@ -38,7 +38,7 @@ public class ItemArmor extends Item
int k = blockpos.getZ();
BoundingBox axisalignedbb = new BoundingBox((double)i, (double)j, (double)k, (double)(i + 1), (double)(j + 1), (double)(k + 1));
List<EntityLiving> list = source.getWorld().<EntityLiving>getEntitiesWithinAABB(EntityLiving.class, axisalignedbb, new Predicate<EntityLiving>() {
public boolean apply(EntityLiving entity) {
public boolean test(EntityLiving entity) {
return entity.isEntityAlive() && entity instanceof EntityNPC &&
entity.getItem(ItemArmor.getArmorPosition(stack)) != null; // || entitylivingbase.isPlayer());
}

2
java/src/game/item/ItemBucket.java
View file

@ -7,7 +7,7 @@ import java.util.List;
import java.util.Queue;
import java.util.Set;
import com.google.common.collect.Sets;
import game.collect.Sets;
import game.block.Block;
import game.block.BlockDynamicLiquid;

2
java/src/game/item/ItemBucketMilk.java
View file

@ -3,7 +3,7 @@ package game.item;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.collect.Sets;
import game.entity.attributes.Attribute;
import game.entity.attributes.AttributeModifier;

2
java/src/game/item/ItemFirework.java
View file

@ -2,7 +2,7 @@ package game.item;
import java.util.List;
import com.google.common.collect.Lists;
import game.collect.Lists;
import game.entity.item.EntityFireworks;
import game.entity.npc.EntityNPC;

2
java/src/game/item/ItemFishFood.java
View file

@ -3,7 +3,7 @@ package game.item;
import java.util.List;
import java.util.Map;
import com.google.common.collect.Maps;
import game.collect.Maps;
import game.entity.npc.EntityNPC;
import game.potion.Potion;

4
java/src/game/item/ItemMagnet.java
View file

@ -2,7 +2,7 @@ package game.item;
import java.util.List;
import com.google.common.base.Predicate;
import java.util.function.Predicate;
import game.entity.Entity;
import game.entity.animal.EntityChicken;
@ -37,7 +37,7 @@ public class ItemMagnet extends Item {
new BoundingBox(playerIn.posX - 40.0f, playerIn.posY + playerIn.getEyeHeight() - 40.0f, playerIn.posZ - 40.0f,
playerIn.posX + 40.0f, playerIn.posY + playerIn.getEyeHeight() + 40.0f, playerIn.posZ + 40.0f),
new Predicate<Entity>() {
public boolean apply(Entity entity) {
public boolean test(Entity entity) {
return (ItemMagnet.this.chicken || /* ? !((EntityLiving)entity).isAIDisabled() : */ entity.isMagnetic())
&& entity.getDistanceToEntity(playerIn) <= 38.0f;
}

2
java/src/game/item/ItemMetal.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.collect.Sets;
import game.color.TextColor;
import game.entity.attributes.Attribute;

2
java/src/game/item/ItemMetalBlock.java
View file

@ -4,7 +4,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.collect.Sets;
import game.block.Block;
import game.color.TextColor;

4
java/src/game/item/ItemPotion.java
View file

@ -6,8 +6,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import game.collect.Maps;
import game.collect.Sets;
import game.color.TextColor;
import game.entity.attributes.Attribute;

4
java/src/game/item/ItemStack.java
View file

@ -6,8 +6,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import game.collect.Lists;
import game.collect.Maps;
import game.block.Block;
import game.color.TextColor;

2
java/src/game/item/ItemSword.java
View file

@ -3,7 +3,7 @@ package game.item;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.collect.Sets;
import game.block.Block;
import game.entity.attributes.Attribute;

2
java/src/game/item/ItemTool.java
View file

@ -3,7 +3,7 @@ package game.item;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import game.collect.Sets;
import game.block.Block;
import game.entity.attributes.Attribute;