Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-04-02 09:56:04 +02:00
Code Issues Projects Releases Wiki Activity

Remove guava dependency

Browse Source
This commit is contained in:
themode 2022-01-27 05:15:51 +01:00
parent a111271113
commit 6ecf486b9d
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@ -60,7 +60,6 @@ dependencies {
implementation(libs.bundles.flare)
// Libraries
api(libs.guava)
api(libs.gson)
implementation(libs.jcTools)
// Path finding

7
demo/src/main/java/net/minestom/demo/entity/ChickenCreature.java
View File

@ -1,23 +1,24 @@
package net.minestom.demo.entity;
import com.google.common.collect.ImmutableList;
import net.minestom.server.attribute.Attribute;
import net.minestom.server.entity.EntityCreature;
import net.minestom.server.entity.EntityType;
import net.minestom.server.entity.ai.goal.RandomStrollGoal;
import java.util.List;
public class ChickenCreature extends EntityCreature {
public ChickenCreature() {
super(EntityType.CHICKEN);
addAIGroup(
ImmutableList.of(
List.of(
// new DoNothingGoal(this, 500, 0.1f),
// new MeleeAttackGoal(this, 500, 2, TimeUnit.MILLISECOND),
new RandomStrollGoal(this, 2)
),
ImmutableList.of(
List.of(
// new LastEntityDamagerTarget(this, 15),
// new ClosestEntityTarget(this, 15, LivingEntity.class)
)

2
gradle/libs.versions.toml
View File

@ -20,7 +20,6 @@ caffeine = "3.0.5"
fastutil = "8.5.6"
flare = "2.0.0"
gson = "2.8.9"
guava = "31.0.1-jre"
jcTools = "3.3.0"
# Test
@ -71,7 +70,6 @@ caffeine = { group = "com.github.ben-manes.caffeine", name = "caffeine", version
fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
flare = { group = "space.vectrix.flare", name = "flare-fastutil", version.ref = "flare"}
flare-fastutil = { group = "space.vectrix.flare", name = "flare", version.ref = "flare"}
guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
jcTools = { group = "org.jctools", name = "jctools-core", version.ref = "jcTools"}

19
src/main/java/net/minestom/server/adventure/audience/IterableAudienceProvider.java
View File

@ -1,6 +1,5 @@
package net.minestom.server.adventure.audience;
import com.google.common.collect.Iterables;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.key.Key;
import net.minestom.server.MinecraftServer;
@ -8,8 +7,8 @@ import net.minestom.server.command.ConsoleSender;
import net.minestom.server.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.Collections;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Predicate;
@ -19,8 +18,7 @@ import java.util.stream.StreamSupport;
* A provider of iterable audiences.
*/
class IterableAudienceProvider implements AudienceProvider<Iterable<? extends Audience>> {
private final Collection<ConsoleSender> console = Collections.singleton(MinecraftServer.getCommandManager().getConsoleSender());
private final List<ConsoleSender> console = List.of(MinecraftServer.getCommandManager().getConsoleSender());
private final AudienceRegistry registry = new AudienceRegistry(new ConcurrentHashMap<>(), CopyOnWriteArrayList::new);
protected IterableAudienceProvider() {
@ -28,7 +26,11 @@ class IterableAudienceProvider implements AudienceProvider<Iterable<? extends Au
@Override
public @NotNull Iterable<? extends Audience> all() {
return Iterables.concat(this.players(), this.console(), this.customs());
List<Audience> all = new ArrayList<>();
this.players().forEach(all::add);
this.console().forEach(all::add);
this.customs().forEach(all::add);
return all;
}
@Override
@ -48,7 +50,10 @@ class IterableAudienceProvider implements AudienceProvider<Iterable<? extends Au
@Override
public @NotNull Iterable<? extends Audience> server() {
return Iterables.concat(this.players(), this.console());
List<Audience> all = new ArrayList<>();
this.players().forEach(all::add);
this.console().forEach(all::add);
return all;
}
@Override