From d6ed896b2d3da4dcf3b7f234c44f3bd614f5456a Mon Sep 17 00:00:00 2001 From: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> Date: Thu, 11 May 2023 21:54:59 -0700 Subject: [PATCH] Upstream fallout Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> --- core/build.gradle.kts | 4 ---- .../geyser/registry/populator/ItemRegistryPopulator.java | 8 +------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 58dba0942..fd373baae 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -66,10 +66,6 @@ configurations.api { // This is still experimental - additionally, it could only really benefit standalone exclude(group = "io.netty.incubator", module = "netty-incubator-transport-native-io_uring") } -java { - sourceCompatibility = JavaVersion.VERSION_14 - targetCompatibility = JavaVersion.VERSION_14 -} tasks.processResources { // This is solely for backwards compatibility for other programs that used this file before the switch to gradle. diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java index 58491d688..a7ece9d6a 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java +++ b/core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java @@ -70,13 +70,7 @@ import org.geysermc.geyser.item.type.Item; import org.geysermc.geyser.registry.type.*; import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; /**