From fb709093fa5fc2a933b219acfe534c48c846c855 Mon Sep 17 00:00:00 2001 From: forkiesassds Date: Mon, 27 Oct 2025 01:22:41 +0200 Subject: [PATCH] chore: Remove environment annotations from client only classes --- .../modernerbeta/fabric/ModernerBetaFabricClient.java | 3 --- .../client/resource/ModernBetaFabricColormapResource.java | 3 --- .../modernerbeta/fabric/config/ModernBetaModMenu.java | 3 --- .../java/mod/bluestaggo/modernerbeta/client/FogUtils.java | 3 --- .../modernerbeta/client/ModernBetaClientBuiltInProviders.java | 3 --- .../bluestaggo/modernerbeta/client/ModernerBetaClient.java | 3 --- .../modernerbeta/client/color/BlockColorSampler.java | 3 --- .../bluestaggo/modernerbeta/client/color/BlockColormap.java | 4 ---- .../mod/bluestaggo/modernerbeta/client/color/BlockColors.java | 3 --- .../bluestaggo/modernerbeta/client/color/SkyColorSampler.java | 3 --- .../client/debug/ModernBetaDebugScreenEntries.java | 3 --- .../modernerbeta/client/debug/entries/DebugEntryClimate.java | 3 --- .../client/debug/entries/DebugEntryExtendedBiome.java | 3 --- .../client/debug/entries/DebugEntryForcedHeight.java | 3 --- .../client/debug/entries/DebugEntryHeightmap.java | 3 --- .../client/debug/entries/DebugEntryInjectedBiome.java | 3 --- .../client/gui/optioncallbacks/BiomePickerCallbacks.java | 3 --- .../client/gui/optioncallbacks/CustomButtonCallbacks.java | 3 --- .../client/gui/optioncallbacks/FloatSliderCallbacks.java | 3 --- .../client/gui/optioncallbacks/IntegerFieldCallbacks.java | 3 --- .../client/gui/optioncallbacks/TextFieldCallbacks.java | 3 --- .../client/gui/optioncallbacks/TextLabelCallbacks.java | 3 --- .../optioncallbacks/ValidatingIntMultipleSliderCallbacks.java | 3 --- .../client/gui/screen/ModernBetaBiomePreviewScreen.java | 3 --- .../modernerbeta/client/gui/screen/ModernBetaScreen.java | 3 --- .../client/gui/screen/ModernBetaSelectBiomeScreen.java | 3 --- .../client/gui/screen/ModernBetaSettingsConfirmScreen.java | 3 --- .../client/gui/screen/ModernBetaSettingsPresetScreen.java | 3 --- .../client/gui/screen/ModernBetaSettingsScreen.java | 3 --- .../modernerbeta/client/gui/screen/ModernBetaWorldScreen.java | 3 --- .../client/gui/screen/ModernBetaWorldScreenProvider.java | 3 --- .../gui/screen/config/ExtendedBiomeIdToColorMapScreen.java | 3 --- .../screen/config/ExtendedBiomeIdToHeightConfigMapScreen.java | 3 --- .../client/gui/screen/config/GraphicalConfigBuilder.java | 3 --- .../config/ModernBetaGraphicalCompoundSettingsScreen.java | 3 --- .../screen/config/ModernBetaGraphicalListSettingsScreen.java | 3 --- .../screen/config/ModernBetaGraphicalMapSettingsScreen.java | 3 --- .../config/ModernBetaGraphicalProviderSettingsScreen.java | 3 --- .../gui/screen/config/ModernBetaGraphicalSettingsScreen.java | 3 --- .../client/gui/screen/config/VoronoiPointBiomeListScreen.java | 3 --- .../gui/screen/config/VoronoiPointCaveBiomeListScreen.java | 3 --- .../modernerbeta/client/gui/widget/AlignedStringWidget.java | 3 --- .../client/registry/ModernBetaClientRegistries.java | 3 --- .../client/registry/ModernBetaClientResourceKeys.java | 3 --- .../client/resource/ModernBetaColormapResource.java | 3 --- .../mixin/client/AirBasedFogEnvironmentMixin.java | 3 --- .../modernerbeta/mixin/client/BiomeColorsMixin.java | 3 --- .../modernerbeta/mixin/client/ClientLevelMixin.java | 3 --- .../modernerbeta/mixin/client/DebugScreenEntriesAccessor.java | 3 --- .../modernerbeta/mixin/client/DebugScreenOverlayMixin.java | 3 --- .../modernerbeta/mixin/client/FogRendererMixin.java | 3 --- .../modernerbeta/mixin/client/FrameLayoutMixin.java | 3 --- .../modernerbeta/mixin/client/HeaderAndFooterLayoutMixin.java | 3 --- .../modernerbeta/mixin/client/LevelLoadingScreenMixin.java | 3 --- .../modernerbeta/mixin/client/MultiLineEditBoxAccessor.java | 3 --- .../mixin/client/RenderSectionRegionAccessor.java | 3 --- .../modernerbeta/mixin/client/ScreenshotAccessor.java | 3 --- .../modernerbeta/mixin/client/WaterFogEnvironmentMixin.java | 3 --- .../modernerbeta/mixin/client/WeatherEffectRendererMixin.java | 3 --- .../modernerbeta/mixin/client/WorldCreationUiStateMixin.java | 3 --- 60 files changed, 181 deletions(-) diff --git a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java index 6da26b8a..f3ed2058 100644 --- a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java +++ b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java @@ -10,15 +10,12 @@ import mod.bluestaggo.modernerbeta.fabric.registry.RegistryHelperImpl; import mod.bluestaggo.modernerbeta.network.BiomeProviderInfoPayload; import mod.bluestaggo.modernerbeta.network.S2CPacketHandlers; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.minecraft.client.Minecraft; import net.minecraft.server.packs.PackType; -@Environment(EnvType.CLIENT) public class ModernerBetaFabricClient implements ClientModInitializer { @Override public void onInitializeClient() { diff --git a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/client/resource/ModernBetaFabricColormapResource.java b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/client/resource/ModernBetaFabricColormapResource.java index 5149b01d..8eb96214 100644 --- a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/client/resource/ModernBetaFabricColormapResource.java +++ b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/client/resource/ModernBetaFabricColormapResource.java @@ -1,14 +1,11 @@ package mod.bluestaggo.modernerbeta.fabric.client.resource; import mod.bluestaggo.modernerbeta.client.resource.ModernBetaColormapResource; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; import net.minecraft.resources.ResourceLocation; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ModernBetaFabricColormapResource extends ModernBetaColormapResource implements IdentifiableResourceReloadListener { private final ResourceLocation id; diff --git a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/config/ModernBetaModMenu.java b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/config/ModernBetaModMenu.java index 9cb9c59f..7d274266 100644 --- a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/config/ModernBetaModMenu.java +++ b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/config/ModernBetaModMenu.java @@ -3,11 +3,8 @@ package mod.bluestaggo.modernerbeta.fabric.config; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; import mod.bluestaggo.modernerbeta.client.gui.screen.config.ModernBetaGraphicalConfigSettingsScreen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -@Environment(EnvType.CLIENT) public class ModernBetaModMenu implements ModMenuApi { @Override public ConfigScreenFactory getModConfigScreenFactory() { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/FogUtils.java b/src/main/java/mod/bluestaggo/modernerbeta/client/FogUtils.java index 80959648..e22b8e80 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/FogUtils.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/FogUtils.java @@ -1,10 +1,7 @@ package mod.bluestaggo.modernerbeta.client; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.util.Mth; -@Environment(EnvType.CLIENT) public class FogUtils { public static float calculateFogWeight(int renderDistance) { // Old fog formula with old render distance: weight = 1.0F / (float)(4 - renderDistance) diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/ModernBetaClientBuiltInProviders.java b/src/main/java/mod/bluestaggo/modernerbeta/client/ModernBetaClientBuiltInProviders.java index f4cec884..5137924e 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/ModernBetaClientBuiltInProviders.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/ModernBetaClientBuiltInProviders.java @@ -7,8 +7,6 @@ import mod.bluestaggo.modernerbeta.settings.component.CaveGeneration; import mod.bluestaggo.modernerbeta.world.chunk.provider.indev.IndevTheme; import mod.bluestaggo.modernerbeta.world.chunk.provider.indev.IndevType; import mod.bluestaggo.modernerbeta.world.chunk.provider.island.IslandShape; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.components.OptionsList; @@ -16,7 +14,6 @@ import net.minecraft.nbt.Tag; import static mod.bluestaggo.modernerbeta.ModernBetaBuiltInTypes.SettingsComponentType.*; -@Environment(EnvType.CLIENT) @SuppressWarnings("unchecked") public class ModernBetaClientBuiltInProviders { private static void addAll(OptionsList list, OptionInstance... options) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/ModernerBetaClient.java b/src/main/java/mod/bluestaggo/modernerbeta/client/ModernerBetaClient.java index b4407ce1..1e1ac52c 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/ModernerBetaClient.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/ModernerBetaClient.java @@ -2,14 +2,11 @@ package mod.bluestaggo.modernerbeta.client; import mod.bluestaggo.modernerbeta.client.registry.ModernBetaClientRegistries; import mod.bluestaggo.modernerbeta.registry.IRegistryHandler; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.Registry; import net.minecraft.util.Tuple; import java.util.List; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ModernerBetaClient { public static List, Consumer>>> CUSTOM_REGISTRY_HANDLERS; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColorSampler.java b/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColorSampler.java index 48ab498f..b4bd9099 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColorSampler.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColorSampler.java @@ -10,8 +10,6 @@ import mod.bluestaggo.modernerbeta.mixin.BiomeAccessor; import mod.bluestaggo.modernerbeta.mixin.client.RenderSectionRegionAccessor; import mod.bluestaggo.modernerbeta.settings.component.ClimateDistribution; import mod.bluestaggo.modernerbeta.tags.ModernBetaBiomeTags; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.renderer.BiomeColors; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; @@ -36,7 +34,6 @@ import java.util.*; import java.util.concurrent.ExecutionException; import java.util.function.Function; -@Environment(EnvType.CLIENT) public final class BlockColorSampler { private static final int CLIME_CACHE_CAPACITY = 128; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColormap.java b/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColormap.java index c97c1b75..b691e22e 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColormap.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColormap.java @@ -1,9 +1,5 @@ package mod.bluestaggo.modernerbeta.client.color; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) public class BlockColormap { private final int[] colormap; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColors.java b/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColors.java index 9a3b0904..64b89d1c 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColors.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/color/BlockColors.java @@ -1,13 +1,10 @@ package mod.bluestaggo.modernerbeta.client.color; import mod.bluestaggo.modernerbeta.util.VersionCompat; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.color.block.BlockColor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -@Environment(EnvType.CLIENT) public final class BlockColors { @FunctionalInterface public interface BlockColorRegisterer { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/color/SkyColorSampler.java b/src/main/java/mod/bluestaggo/modernerbeta/client/color/SkyColorSampler.java index b4098a92..afb4c4d8 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/color/SkyColorSampler.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/color/SkyColorSampler.java @@ -1,14 +1,11 @@ package mod.bluestaggo.modernerbeta.client.color; import mod.bluestaggo.modernerbeta.api.world.biome.climate.ClimateSamplerSky; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.util.Mth; import net.minecraft.world.phys.Vec3; import java.util.Optional; -@Environment(EnvType.CLIENT) public class SkyColorSampler { public static final SkyColorSampler INSTANCE = new SkyColorSampler(); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/ModernBetaDebugScreenEntries.java b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/ModernBetaDebugScreenEntries.java index 5502d45a..e3f7e2b3 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/ModernBetaDebugScreenEntries.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/ModernBetaDebugScreenEntries.java @@ -4,13 +4,10 @@ import mod.bluestaggo.modernerbeta.ModernerBeta; import mod.bluestaggo.modernerbeta.client.debug.entries.*; import mod.bluestaggo.modernerbeta.mixin.client.DebugScreenEntriesAccessor; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.debug.DebugScreenEntry; import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class ModernBetaDebugScreenEntries { public static final ResourceLocation EXTENDED_BIOME = register("extended_biome", new DebugEntryExtendedBiome()); public static final ResourceLocation CLIMATE = register("climate", new DebugEntryClimate()); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryClimate.java b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryClimate.java index 8d7bc7fb..07ca8555 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryClimate.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryClimate.java @@ -14,8 +14,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.chunk.LevelChunk; import org.jetbrains.annotations.Nullable; *///?} -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.BiomeSource; @@ -25,7 +23,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -@Environment(EnvType.CLIENT) public class DebugEntryClimate /*? >=1.21.9 {*/ /*implements DebugScreenEntry *//*?}*/ { //? if >=1.21.9 { /*private static final ResourceLocation SECTION_ID = ModernerBeta.createId("climate"); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryExtendedBiome.java b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryExtendedBiome.java index 81ee0730..d7e351ed 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryExtendedBiome.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryExtendedBiome.java @@ -13,13 +13,10 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.chunk.LevelChunk; import org.jetbrains.annotations.Nullable; *///?} -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkGenerator; -@Environment(EnvType.CLIENT) public class DebugEntryExtendedBiome /*? >=1.21.9 {*/ /*implements DebugScreenEntry *//*?}*/ { //? if >=1.21.9 { /*@Override diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryForcedHeight.java b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryForcedHeight.java index e2a04105..b6758577 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryForcedHeight.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryForcedHeight.java @@ -13,13 +13,10 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.chunk.LevelChunk; import org.jetbrains.annotations.Nullable; *///?} -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkGenerator; -@Environment(EnvType.CLIENT) public class DebugEntryForcedHeight /*? >=1.21.9 {*/ /*implements DebugScreenEntry *//*?}*/ { //? if >=1.21.9 { /*@Override diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryHeightmap.java b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryHeightmap.java index 83e0ccb5..290cb192 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryHeightmap.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryHeightmap.java @@ -15,8 +15,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.chunk.LevelChunk; import org.jetbrains.annotations.Nullable; *///?} -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkGenerator; @@ -26,7 +24,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -@Environment(EnvType.CLIENT) public class DebugEntryHeightmap /*? >=1.21.9 {*/ /*implements DebugScreenEntry *//*?}*/ { //? if >=1.21.9 { /*private static final ResourceLocation SECTION_ID = ModernerBeta.createId("heightmap"); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryInjectedBiome.java b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryInjectedBiome.java index f36650a1..4ef70de0 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryInjectedBiome.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/debug/entries/DebugEntryInjectedBiome.java @@ -11,13 +11,10 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.level.chunk.LevelChunk; import org.jetbrains.annotations.Nullable; *///?} -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkGenerator; -@Environment(EnvType.CLIENT) public class DebugEntryInjectedBiome /*? >=1.21.9 {*/ /*implements DebugScreenEntry *//*?}*/ { //? if >=1.21.9 { /*@Override diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/BiomePickerCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/BiomePickerCallbacks.java index 34118e16..48bc1667 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/BiomePickerCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/BiomePickerCallbacks.java @@ -3,8 +3,6 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; import mod.bluestaggo.modernerbeta.client.gui.screen.ModernBetaSelectBiomeScreen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; @@ -25,7 +23,6 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; -@Environment(EnvType.CLIENT) public record BiomePickerCallbacks(Consumer screenChangeHandler, Screen parentScreen, WorldCreationContext generatorOptionsHolder, boolean allowNone) implements OptionInstance.ValueSet { @Override public @NotNull Function, AbstractWidget> createButton(OptionInstance.TooltipSupplier tooltipFactory, Options gameOptions, int x, int y, int width, Consumer changeCallback) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/CustomButtonCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/CustomButtonCallbacks.java index 58de4d15..7f2330ee 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/CustomButtonCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/CustomButtonCallbacks.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; import net.minecraft.client.gui.components.AbstractWidget; @@ -14,7 +12,6 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; -@Environment(EnvType.CLIENT) public record CustomButtonCallbacks(Component text, Runnable onPress) implements OptionInstance.ValueSet { @Override public @NotNull Function, AbstractWidget> createButton(OptionInstance.TooltipSupplier tooltipFactory, Options gameOptions, int x, int y, int width, Consumer changeCallback) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/FloatSliderCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/FloatSliderCallbacks.java index eb72fdae..1a7b0e9c 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/FloatSliderCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/FloatSliderCallbacks.java @@ -1,15 +1,12 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.util.Mth; import org.jetbrains.annotations.NotNull; import java.util.Optional; -@Environment(EnvType.CLIENT) public record FloatSliderCallbacks(float min, float max) implements OptionInstance.SliderableValueSet { @Override public @NotNull Optional validateValue(Float value) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/IntegerFieldCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/IntegerFieldCallbacks.java index 3b2f2c6c..af53957d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/IntegerFieldCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/IntegerFieldCallbacks.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; @@ -17,7 +15,6 @@ import java.util.function.Function; import java.util.function.IntFunction; import java.util.function.ToIntFunction; -@Environment(EnvType.CLIENT) public record IntegerFieldCallbacks(String prefix, IntFunction serializer, ToIntFunction deserializer) implements OptionInstance.ValueSet { @Override public @NotNull Function, AbstractWidget> createButton(OptionInstance.TooltipSupplier tooltipFactory, Options gameOptions, int x, int y, int width, Consumer changeCallback) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextFieldCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextFieldCallbacks.java index 056dff48..c9af5896 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextFieldCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextFieldCallbacks.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; @@ -17,7 +15,6 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; -@Environment(EnvType.CLIENT) public record TextFieldCallbacks(Predicate validationFunction, Predicate inputValidationFunction) implements OptionInstance.ValueSet { public static final TextFieldCallbacks NO_VALIDATION = new TextFieldCallbacks(Objects::nonNull, Objects::nonNull); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextLabelCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextLabelCallbacks.java index b6be29c4..9dffd79f 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextLabelCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/TextLabelCallbacks.java @@ -2,8 +2,6 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; import mod.bluestaggo.modernerbeta.client.gui.widget.AlignedStringWidget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; @@ -15,7 +13,6 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; -@Environment(EnvType.CLIENT) public record TextLabelCallbacks(Component text, float alignment) implements OptionInstance.ValueSet { public TextLabelCallbacks(Component text) { this(text, 0.5F); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/ValidatingIntMultipleSliderCallbacks.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/ValidatingIntMultipleSliderCallbacks.java index 9e07ef3a..7b9279a9 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/ValidatingIntMultipleSliderCallbacks.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/optioncallbacks/ValidatingIntMultipleSliderCallbacks.java @@ -1,15 +1,12 @@ package mod.bluestaggo.modernerbeta.client.gui.optioncallbacks; import com.mojang.serialization.Codec; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.util.Mth; import org.jetbrains.annotations.NotNull; import java.util.Optional; -@Environment(EnvType.CLIENT) public record ValidatingIntMultipleSliderCallbacks(int minInclusive, int maxInclusive, int multiple) implements OptionInstance.IntRangeBase { @Override public @NotNull Optional validateValue(Integer integer) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaBiomePreviewScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaBiomePreviewScreen.java index 0967e81f..ff66cc60 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaBiomePreviewScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaBiomePreviewScreen.java @@ -16,8 +16,6 @@ import mod.bluestaggo.modernerbeta.settings.ModernBetaSettings; import mod.bluestaggo.modernerbeta.settings.SettingsComponentTypes; import mod.bluestaggo.modernerbeta.world.biome.provider.fractal.ExtendedBiomeId; import mod.bluestaggo.modernerbeta.world.biome.provider.fractal.layers.LayerRandom; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.client.gui.GuiGraphics; @@ -53,7 +51,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -@Environment(EnvType.CLIENT) public class ModernBetaBiomePreviewScreen extends ModernBetaScreen { private final BiomeProvider biomeProvider; private BiomeDisplayWidget biomeDisplay; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaScreen.java index b1a75a47..a440b1ae 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaScreen.java @@ -1,7 +1,5 @@ package mod.bluestaggo.modernerbeta.client.gui.screen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.StringWidget; @@ -9,7 +7,6 @@ import net.minecraft.client.gui.layouts.GridLayout; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; -@Environment(EnvType.CLIENT) public abstract class ModernBetaScreen extends Screen { public static final int BUTTON_HEIGHT = 20; public static final int BUTTON_LENGTH = 150; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSelectBiomeScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSelectBiomeScreen.java index 352d2729..1449ad14 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSelectBiomeScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSelectBiomeScreen.java @@ -2,8 +2,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen; import com.ibm.icu.text.Collator; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; @@ -32,7 +30,6 @@ import java.util.Locale; import java.util.Objects; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ModernBetaSelectBiomeScreen extends Screen { private final HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this); private final Screen parent; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsConfirmScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsConfirmScreen.java index 1f064557..1b21c894 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsConfirmScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsConfirmScreen.java @@ -1,7 +1,5 @@ package mod.bluestaggo.modernerbeta.client.gui.screen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.StringWidget; import net.minecraft.client.gui.layouts.FrameLayout; @@ -10,7 +8,6 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -@Environment(EnvType.CLIENT) public class ModernBetaSettingsConfirmScreen extends ModernBetaScreen { private final Runnable runnable; private final Component messageText; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsPresetScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsPresetScreen.java index 67fbfd77..e98828f5 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsPresetScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsPresetScreen.java @@ -5,8 +5,6 @@ import mod.bluestaggo.modernerbeta.settings.ModernBetaSettingsPreset; import mod.bluestaggo.modernerbeta.settings.ModernBetaSettingsPresetCategory; import mod.bluestaggo.modernerbeta.settings.NameAndDescriptionItem; import mod.bluestaggo.modernerbeta.util.VersionCompat; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; //? if <1.21.9 import net.minecraft.Util; import net.minecraft.client.Minecraft; @@ -26,7 +24,6 @@ import net.minecraft.util.FormattedCharSequence; import java.util.List; -@Environment(EnvType.CLIENT) public class ModernBetaSettingsPresetScreen extends ModernBetaScreen { private static final String TEXT_TITLE = "createWorld.customize.modern_beta.title.preset"; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsScreen.java index f3a91e2f..4120c2e1 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaSettingsScreen.java @@ -9,8 +9,6 @@ import mod.bluestaggo.modernerbeta.ModernerBeta; import mod.bluestaggo.modernerbeta.mixin.client.MultiLineEditBoxAccessor; import mod.bluestaggo.modernerbeta.settings.ModernBetaSettings; import mod.bluestaggo.modernerbeta.util.VersionCompat; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.MultiLineEditBox; @@ -25,7 +23,6 @@ import net.minecraft.network.chat.Component; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ModernBetaSettingsScreen extends ModernBetaScreen { private static final String TEXT_NAVIGATION = "createWorld.customize.modern_beta.navigation"; private static final String TEXT_SETTINGS = "createWorld.customize.modern_beta.settings"; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreen.java index 0181c26d..0649104d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreen.java @@ -12,8 +12,6 @@ import mod.bluestaggo.modernerbeta.settings.SettingsComponentTypes; import mod.bluestaggo.modernerbeta.tags.ModernBetaSettingsPresetCategoryTags; import mod.bluestaggo.modernerbeta.world.biome.ModernBetaBiomeSource; import mod.bluestaggo.modernerbeta.world.chunk.ModernBetaChunkGenerator; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.StringWidget; @@ -37,7 +35,6 @@ import org.apache.logging.log4j.util.TriConsumer; import java.util.Optional; import java.util.Random; -@Environment(EnvType.CLIENT) public class ModernBetaWorldScreen extends ModernBetaScreen { private static final String TEXT_TITLE = "createWorld.customize.modern_beta.title"; private static final String TEXT_TITLE_CHUNK = "createWorld.customize.modern_beta.title.chunk"; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreenProvider.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreenProvider.java index 5b767e3f..300be067 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreenProvider.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/ModernBetaWorldScreenProvider.java @@ -5,8 +5,6 @@ import mod.bluestaggo.modernerbeta.settings.ModernBetaSettings; import mod.bluestaggo.modernerbeta.settings.ModernBetaSettingsPreset; import mod.bluestaggo.modernerbeta.world.biome.ModernBetaBiomeSource; import mod.bluestaggo.modernerbeta.world.chunk.ModernBetaChunkGenerator; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; @@ -18,7 +16,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; -@Environment(EnvType.CLIENT) public class ModernBetaWorldScreenProvider { public static WorldCreationContext.DimensionsUpdater createModifier( CompoundTag chunkSettingsCompound, diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToColorMapScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToColorMapScreen.java index 2a14a053..d36d042d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToColorMapScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToColorMapScreen.java @@ -1,7 +1,5 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.screens.Screen; @@ -17,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ExtendedBiomeIdToColorMapScreen extends ModernBetaGraphicalMapSettingsScreen { public ExtendedBiomeIdToColorMapScreen(String title, Screen parent, WorldCreationContext generatorOptionsHolder, CompoundTag settings, Consumer onDone) { super(title, parent, generatorOptionsHolder, settings, onDone); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToHeightConfigMapScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToHeightConfigMapScreen.java index 7eb6e806..1da832b6 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToHeightConfigMapScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ExtendedBiomeIdToHeightConfigMapScreen.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; import mod.bluestaggo.modernerbeta.world.biome.HeightConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.screens.Screen; @@ -17,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ExtendedBiomeIdToHeightConfigMapScreen extends ModernBetaGraphicalMapSettingsScreen { public ExtendedBiomeIdToHeightConfigMapScreen(String title, Screen parent, WorldCreationContext generatorOptionsHolder, CompoundTag settings, Consumer onDone) { super(title, parent, generatorOptionsHolder, settings, onDone); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/GraphicalConfigBuilder.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/GraphicalConfigBuilder.java index e600af8c..454e0773 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/GraphicalConfigBuilder.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/GraphicalConfigBuilder.java @@ -1,10 +1,7 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.OptionsList; -@Environment(EnvType.CLIENT) @FunctionalInterface public interface GraphicalConfigBuilder { void apply(ModernBetaGraphicalCompoundSettingsScreen screen, OptionsList options); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalCompoundSettingsScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalCompoundSettingsScreen.java index cb6be8e9..6f940e1f 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalCompoundSettingsScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalCompoundSettingsScreen.java @@ -6,8 +6,6 @@ import mod.bluestaggo.modernerbeta.util.VersionCompat; import mod.bluestaggo.modernerbeta.util.function.FloatSupplier; import mod.bluestaggo.modernerbeta.world.biome.HeightConfig; import mod.bluestaggo.modernerbeta.world.biome.provider.fractal.ExtendedBiomeId; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; import net.minecraft.client.gui.screens.Screen; @@ -26,7 +24,6 @@ import java.util.Arrays; import java.util.List; import java.util.function.*; -@Environment(EnvType.CLIENT) public abstract class ModernBetaGraphicalCompoundSettingsScreen extends ModernBetaGraphicalSettingsScreen { public ModernBetaGraphicalCompoundSettingsScreen( String title, diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalListSettingsScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalListSettingsScreen.java index b7dde7cf..7f2b91f9 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalListSettingsScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalListSettingsScreen.java @@ -5,8 +5,6 @@ import mod.bluestaggo.modernerbeta.client.gui.optioncallbacks.BiomePickerCallbac import mod.bluestaggo.modernerbeta.client.gui.optioncallbacks.TextFieldCallbacks; import mod.bluestaggo.modernerbeta.util.VersionCompat; import mod.bluestaggo.modernerbeta.world.biome.provider.fractal.ExtendedBiomeId; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; import net.minecraft.client.gui.components.OptionsList; @@ -23,7 +21,6 @@ import java.util.List; import java.util.function.Consumer; import java.util.function.Supplier; -@Environment(EnvType.CLIENT) public abstract class ModernBetaGraphicalListSettingsScreen extends ModernBetaGraphicalSettingsScreen { public ModernBetaGraphicalListSettingsScreen( String title, diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalMapSettingsScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalMapSettingsScreen.java index dee4cb97..719f93d0 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalMapSettingsScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalMapSettingsScreen.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; import mod.bluestaggo.modernerbeta.util.VersionCompat; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.components.OptionsList; import net.minecraft.client.gui.screens.Screen; @@ -16,7 +14,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public abstract class ModernBetaGraphicalMapSettingsScreen extends ModernBetaGraphicalCompoundSettingsScreen { protected static final String KEY = "$MB MAP KEY$."; protected static final String VALUE = "$MB MAP VALUE$."; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalProviderSettingsScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalProviderSettingsScreen.java index b4c2ee1b..9efcacdb 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalProviderSettingsScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalProviderSettingsScreen.java @@ -3,8 +3,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; import mod.bluestaggo.modernerbeta.ModernBetaBuiltInTypes; import mod.bluestaggo.modernerbeta.api.world.provider.ProviderType; import mod.bluestaggo.modernerbeta.util.VersionCompat; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.OptionsList; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; @@ -20,7 +18,6 @@ import net.minecraft.world.level.dimension.LevelStem; import java.util.Optional; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ModernBetaGraphicalProviderSettingsScreen extends ModernBetaGraphicalComponentedSettingsScreen { private final Registry providerRegistry; private final ResourceLocation[] providers; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalSettingsScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalSettingsScreen.java index da8a1fa7..10c959a8 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalSettingsScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/ModernBetaGraphicalSettingsScreen.java @@ -2,8 +2,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; import mod.bluestaggo.modernerbeta.client.gui.optioncallbacks.*; import mod.bluestaggo.modernerbeta.imixin.ModernBetaClearableWidget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; import net.minecraft.client.OptionInstance; //? if <1.21 @@ -25,7 +23,6 @@ import net.minecraft.resources.ResourceLocation; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public abstract class ModernBetaGraphicalSettingsScreen extends OptionsSubScreen { protected static final String STRING_PREFIX = "createWorld.customize.modern_beta.settings."; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointBiomeListScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointBiomeListScreen.java index 9560311e..52400c1d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointBiomeListScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointBiomeListScreen.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; import mod.bluestaggo.modernerbeta.util.CompoundTagBuilder; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; @@ -13,7 +11,6 @@ import net.minecraft.world.level.biome.Biomes; import java.util.List; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class VoronoiPointBiomeListScreen extends ModernBetaGraphicalListSettingsScreen { public VoronoiPointBiomeListScreen(String title, Screen parent, WorldCreationContext context, ListTag settings, Consumer onDone) { super(title, parent, context, settings, onDone); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointCaveBiomeListScreen.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointCaveBiomeListScreen.java index e2334e5b..a9546249 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointCaveBiomeListScreen.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/screen/config/VoronoiPointCaveBiomeListScreen.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.gui.screen.config; import mod.bluestaggo.modernerbeta.util.CompoundTagBuilder; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; @@ -13,7 +11,6 @@ import net.minecraft.world.level.biome.Biomes; import java.util.List; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class VoronoiPointCaveBiomeListScreen extends ModernBetaGraphicalListSettingsScreen { public VoronoiPointCaveBiomeListScreen(String title, Screen parent, WorldCreationContext context, ListTag settings, Consumer onDone) { super(title, parent, context, settings, onDone); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/widget/AlignedStringWidget.java b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/widget/AlignedStringWidget.java index 5d5d8e95..59bc598c 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/gui/widget/AlignedStringWidget.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/gui/widget/AlignedStringWidget.java @@ -1,7 +1,5 @@ package mod.bluestaggo.modernerbeta.client.gui.widget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractStringWidget; @@ -12,7 +10,6 @@ import net.minecraft.network.chat.FormattedText; import net.minecraft.util.FormattedCharSequence; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class AlignedStringWidget extends AbstractStringWidget { private float horizontalAlignment = 0.5F; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientRegistries.java b/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientRegistries.java index a44fb968..52eca5cd 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientRegistries.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientRegistries.java @@ -2,12 +2,9 @@ package mod.bluestaggo.modernerbeta.client.registry; import mod.bluestaggo.modernerbeta.client.gui.screen.config.GraphicalConfigBuilder; import mod.bluestaggo.modernerbeta.registry.IRegistryHelper; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; -@Environment(EnvType.CLIENT) public final class ModernBetaClientRegistries { private static IRegistryHelper registryHelper; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientResourceKeys.java b/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientResourceKeys.java index 311404a2..a2f97cd1 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientResourceKeys.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/registry/ModernBetaClientResourceKeys.java @@ -2,12 +2,9 @@ package mod.bluestaggo.modernerbeta.client.registry; import mod.bluestaggo.modernerbeta.ModernerBeta; import mod.bluestaggo.modernerbeta.client.gui.screen.config.GraphicalConfigBuilder; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; -@Environment(EnvType.CLIENT) public class ModernBetaClientResourceKeys { public static final ResourceKey> SETTINGS_COMPONENT_TYPE_GUI = of("settings_component_type_gui"); diff --git a/src/main/java/mod/bluestaggo/modernerbeta/client/resource/ModernBetaColormapResource.java b/src/main/java/mod/bluestaggo/modernerbeta/client/resource/ModernBetaColormapResource.java index 47c35f02..099314eb 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/client/resource/ModernBetaColormapResource.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/client/resource/ModernBetaColormapResource.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.client.resource; import mod.bluestaggo.modernerbeta.ModernerBeta; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.resources.LegacyStuffWrapper; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; @@ -11,7 +9,6 @@ import net.minecraft.server.packs.resources.ResourceManagerReloadListener; import java.io.IOException; import java.util.function.Consumer; -@Environment(EnvType.CLIENT) public class ModernBetaColormapResource implements ResourceManagerReloadListener { private final ResourceLocation id; private final Consumer consumer; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/AirBasedFogEnvironmentMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/AirBasedFogEnvironmentMixin.java index cda6f6af..2fd13f1d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/AirBasedFogEnvironmentMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/AirBasedFogEnvironmentMixin.java @@ -5,8 +5,6 @@ import mod.bluestaggo.modernerbeta.ModernerBeta; import mod.bluestaggo.modernerbeta.client.FogUtils; import mod.bluestaggo.modernerbeta.imixin.ModernBetaLevel; import mod.bluestaggo.modernerbeta.settings.SettingsComponentTypes; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.fog.environment.AirBasedFogEnvironment; @@ -17,7 +15,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -@Environment(EnvType.CLIENT) @Mixin(AirBasedFogEnvironment.class) public abstract class AirBasedFogEnvironmentMixin { @Unique private static int modernBeta_renderDistance = 16; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/BiomeColorsMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/BiomeColorsMixin.java index aa436251..a52d4789 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/BiomeColorsMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/BiomeColorsMixin.java @@ -2,8 +2,6 @@ package mod.bluestaggo.modernerbeta.mixin.client; import mod.bluestaggo.modernerbeta.api.world.biome.climate.Clime; import mod.bluestaggo.modernerbeta.client.color.BlockColorSampler; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.renderer.BiomeColors; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; @@ -12,7 +10,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -@Environment(EnvType.CLIENT) @Mixin(BiomeColors.class) public abstract class BiomeColorsMixin { @Inject(method = "getAverageWaterColor", at = @At("HEAD"), cancellable = true) diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ClientLevelMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ClientLevelMixin.java index fef8eedd..ef2a3eed 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ClientLevelMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ClientLevelMixin.java @@ -3,8 +3,6 @@ package mod.bluestaggo.modernerbeta.mixin.client; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import mod.bluestaggo.modernerbeta.client.color.SkyColorSampler; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.multiplayer.ClientLevel; //? if >=1.21.11 { /*import net.minecraft.client.Camera; @@ -17,7 +15,6 @@ import net.minecraft.world.phys.Vec3; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -@Environment(EnvType.CLIENT) @Mixin(value = ClientLevel.class, priority = 1) public abstract class ClientLevelMixin { //? if >=1.21.11 diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenEntriesAccessor.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenEntriesAccessor.java index e1be6cfa..fe5fb829 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenEntriesAccessor.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenEntriesAccessor.java @@ -1,15 +1,12 @@ //? if >=1.21.9 { /*package mod.bluestaggo.modernerbeta.mixin.client; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.debug.DebugScreenEntries; import net.minecraft.client.gui.components.debug.DebugScreenEntry; import net.minecraft.resources.ResourceLocation; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; -@Environment(EnvType.CLIENT) @Mixin(DebugScreenEntries.class) public interface DebugScreenEntriesAccessor { @Invoker("register") diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenOverlayMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenOverlayMixin.java index d0ad6782..de03ac3d 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenOverlayMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/DebugScreenOverlayMixin.java @@ -3,8 +3,6 @@ package mod.bluestaggo.modernerbeta.mixin.client; import mod.bluestaggo.modernerbeta.ModernerBeta; import mod.bluestaggo.modernerbeta.client.debug.entries.*; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.DebugScreenOverlay; import net.minecraft.client.server.IntegratedServer; @@ -20,7 +18,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.List; -@Environment(EnvType.CLIENT) @Mixin(DebugScreenOverlay.class) public abstract class DebugScreenOverlayMixin { @Shadow @Final private Minecraft minecraft; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FogRendererMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FogRendererMixin.java index cb5b058b..7e013733 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FogRendererMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FogRendererMixin.java @@ -9,8 +9,6 @@ import mod.bluestaggo.modernerbeta.client.FogUtils; import mod.bluestaggo.modernerbeta.client.color.BlockColorSampler; import mod.bluestaggo.modernerbeta.imixin.ModernBetaLevel; import mod.bluestaggo.modernerbeta.settings.SettingsComponentTypes; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.FogRenderer; @@ -29,7 +27,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; /^import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; ^///?} -@Environment(EnvType.CLIENT) @Mixin(FogRenderer.class) public abstract class FogRendererMixin { @Unique private static final String GET_FOG_COLOR_METHOD = diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FrameLayoutMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FrameLayoutMixin.java index 2caadd0f..7384580f 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FrameLayoutMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/FrameLayoutMixin.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.mixin.client; import mod.bluestaggo.modernerbeta.imixin.ModernBetaClearableWidget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.layouts.FrameLayout; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -10,7 +8,6 @@ import org.spongepowered.asm.mixin.Shadow; import java.util.List; -@Environment(EnvType.CLIENT) @Mixin(FrameLayout.class) public class FrameLayoutMixin implements ModernBetaClearableWidget { @Shadow @Final private List children; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/HeaderAndFooterLayoutMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/HeaderAndFooterLayoutMixin.java index 201cbb31..794051c9 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/HeaderAndFooterLayoutMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/HeaderAndFooterLayoutMixin.java @@ -1,15 +1,12 @@ package mod.bluestaggo.modernerbeta.mixin.client; import mod.bluestaggo.modernerbeta.imixin.ModernBetaClearableWidget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.layouts.FrameLayout; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Environment(EnvType.CLIENT) @Mixin(HeaderAndFooterLayout.class) public class HeaderAndFooterLayoutMixin implements ModernBetaClearableWidget { @Shadow @Final private FrameLayout headerFrame; diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/LevelLoadingScreenMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/LevelLoadingScreenMixin.java index 14d77fb3..e69c83d3 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/LevelLoadingScreenMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/LevelLoadingScreenMixin.java @@ -1,8 +1,6 @@ package mod.bluestaggo.modernerbeta.mixin.client; import mod.bluestaggo.modernerbeta.api.world.chunk.ChunkProviderFinite; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.LevelLoadingScreen; import net.minecraft.client.gui.screens.Screen; @@ -12,7 +10,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Environment(EnvType.CLIENT) @Mixin(LevelLoadingScreen.class) public abstract class LevelLoadingScreenMixin extends Screen { protected LevelLoadingScreenMixin(Component title) { diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/MultiLineEditBoxAccessor.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/MultiLineEditBoxAccessor.java index acee298b..efdd99e8 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/MultiLineEditBoxAccessor.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/MultiLineEditBoxAccessor.java @@ -1,13 +1,10 @@ package mod.bluestaggo.modernerbeta.mixin.client; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.MultiLineEditBox; import net.minecraft.client.gui.components.MultilineTextField; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -@Environment(EnvType.CLIENT) @Mixin(MultiLineEditBox.class) public interface MultiLineEditBoxAccessor { @Accessor("textField") diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/RenderSectionRegionAccessor.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/RenderSectionRegionAccessor.java index fb4b084e..b6057afb 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/RenderSectionRegionAccessor.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/RenderSectionRegionAccessor.java @@ -1,7 +1,5 @@ package mod.bluestaggo.modernerbeta.mixin.client; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; //? if >=1.21.6 { import net.minecraft.client.renderer.chunk.RenderSectionRegion; //?} else { @@ -11,7 +9,6 @@ import net.minecraft.world.level.Level; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -@Environment(EnvType.CLIENT) @Mixin( //? if >=1.21.6 { RenderSectionRegion.class diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ScreenshotAccessor.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ScreenshotAccessor.java index 6380d445..e5dfd234 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ScreenshotAccessor.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/ScreenshotAccessor.java @@ -1,14 +1,11 @@ package mod.bluestaggo.modernerbeta.mixin.client; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Screenshot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; import java.io.File; -@Environment(EnvType.CLIENT) @Mixin(Screenshot.class) public interface ScreenshotAccessor { @Invoker diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WaterFogEnvironmentMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WaterFogEnvironmentMixin.java index 499f10b7..abd2bcbb 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WaterFogEnvironmentMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WaterFogEnvironmentMixin.java @@ -5,8 +5,6 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import mod.bluestaggo.modernerbeta.api.world.biome.climate.Clime; import mod.bluestaggo.modernerbeta.client.color.BlockColorSampler; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.fog.environment.WaterFogEnvironment; @@ -23,7 +21,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -@Environment(EnvType.CLIENT) @Mixin(WaterFogEnvironment.class) public abstract class WaterFogEnvironmentMixin { @Unique diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WeatherEffectRendererMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WeatherEffectRendererMixin.java index 53f94a59..caecb023 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WeatherEffectRendererMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WeatherEffectRendererMixin.java @@ -6,8 +6,6 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; import mod.bluestaggo.modernerbeta.imixin.ModernBetaLevel; import mod.bluestaggo.modernerbeta.util.VersionCompat; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.renderer.WeatherEffectRenderer; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; @@ -15,7 +13,6 @@ import net.minecraft.world.level.biome.Biome; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -@Environment(EnvType.CLIENT) @Mixin(WeatherEffectRenderer.class) public class WeatherEffectRendererMixin { @WrapOperation( diff --git a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WorldCreationUiStateMixin.java b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WorldCreationUiStateMixin.java index 59c51685..bef214bd 100644 --- a/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WorldCreationUiStateMixin.java +++ b/src/main/java/mod/bluestaggo/modernerbeta/mixin/client/WorldCreationUiStateMixin.java @@ -3,8 +3,6 @@ package mod.bluestaggo.modernerbeta.mixin.client; import mod.bluestaggo.modernerbeta.client.gui.screen.ModernBetaWorldScreen; import mod.bluestaggo.modernerbeta.client.gui.screen.ModernBetaWorldScreenProvider; import mod.bluestaggo.modernerbeta.world.preset.ModernBetaWorldPresets; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.screens.worldselection.PresetEditor; import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState; import net.minecraft.core.Holder; @@ -16,7 +14,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -@Environment(EnvType.CLIENT) @Mixin(WorldCreationUiState.class) public abstract class WorldCreationUiStateMixin { @Inject(method = "getPresetEditor", at = @At("RETURN"), cancellable = true) -- knotmirror 0.0.1