From 0c774c887bd7edf17c174456c50c5bb50705f4c5 Mon Sep 17 00:00:00 2001 From: Yeregorix Date: Sat, 4 Nov 2023 22:04:43 +0100 Subject: [PATCH] Apply common access wideners to forge dev env. This also fixes the ip issue. --- forge/build.gradle.kts | 1 + .../common/service/server/ban/SpongeIPBanList.java | 6 +----- src/main/resources/common.accesswidener | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index a01353dee1a..8e585890acc 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -178,6 +178,7 @@ sourceSets.configureEach { extensions.configure(LoomGradleExtensionAPI::class) { silentMojangMappingsLicense() + accessWidenerPath.set(file("../src/main/resources/common.accesswidener")) mixin { useLegacyMixinAp.set(false) diff --git a/src/main/java/org/spongepowered/common/service/server/ban/SpongeIPBanList.java b/src/main/java/org/spongepowered/common/service/server/ban/SpongeIPBanList.java index 85e93e7a20b..6ee8716ff4a 100644 --- a/src/main/java/org/spongepowered/common/service/server/ban/SpongeIPBanList.java +++ b/src/main/java/org/spongepowered/common/service/server/ban/SpongeIPBanList.java @@ -33,7 +33,6 @@ import org.spongepowered.api.Sponge; import org.spongepowered.api.service.ban.Ban; import org.spongepowered.api.service.ban.BanService; -import org.spongepowered.common.SpongeCommon; import org.spongepowered.common.util.BanUtil; import org.spongepowered.common.util.NetworkUtil; @@ -64,10 +63,7 @@ protected boolean contains(final String entry) { try { return Sponge.server().serviceProvider().banService().find(InetAddress.getByName(entry)).join().isPresent(); } catch (final UnknownHostException e) { - // TODO SF 1.19.4 - SpongeCommon.logger().info("Error parsing Ban IP address!", e); - return false; - // throw new IllegalArgumentException("Error parsing Ban IP address!", e); + throw new IllegalArgumentException("Error parsing Ban IP address!", e); } } diff --git a/src/main/resources/common.accesswidener b/src/main/resources/common.accesswidener index 82a2cf77f2f..215cc24aa91 100644 --- a/src/main/resources/common.accesswidener +++ b/src/main/resources/common.accesswidener @@ -15,7 +15,6 @@ extendable class net/minecraft/world/item/crafting/Ingredient extendable method net/minecraft/world/item/crafting/Ingredient (Ljava/util/stream/Stream;)V accessible field net/minecraft/world/item/crafting/Ingredient values [Lnet/minecraft/world/item/crafting/Ingredient$Value; accessible class net/minecraft/world/item/crafting/Ingredient$Value -accessible class net/minecraft/world/level/biome/MultiNoiseBiomeSource$NoiseParameters accessible method net/minecraft/world/level/biome/Biome getTemperature (Lnet/minecraft/core/BlockPos;)F accessible class net/minecraft/server/level/ServerLevel$EntityCallbacks accessible class net/minecraft/network/protocol/game/ServerboundInteractPacket$Action