Remove @Environment

Gaming32 · May 30, 2024 · c731634 · c731634
1 parent ae360ac
commit c731634
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/common/src/main/java/io/github/gaming32/bingo/client/BingoClient.java b/common/src/main/java/io/github/gaming32/bingo/client/BingoClient.java
@@ -18,8 +18,6 @@
 import io.github.gaming32.bingo.platform.event.ClientEvents;
 import io.github.gaming32.bingo.platform.registrar.KeyMappingBuilder;
 import io.github.gaming32.bingo.util.ResourceLocations;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -45,7 +43,6 @@
 import java.util.Iterator;
 import java.util.Objects;
 
-@Environment(EnvType.CLIENT)
 public class BingoClient {
     private static final ResourceLocation BOARD_TEXTURE = ResourceLocations.bingo("board");
     public static final Component BOARD_TITLE = Component.translatable("bingo.board.title");

diff --git a/common/src/main/java/io/github/gaming32/bingo/triggers/KeyPressedTrigger.java b/common/src/main/java/io/github/gaming32/bingo/triggers/KeyPressedTrigger.java
@@ -2,13 +2,10 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.advancements.Criterion;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
 import net.minecraft.advancements.critereon.EntityPredicate;
 import net.minecraft.advancements.critereon.SimpleCriterionTrigger;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.NotNull;
 
@@ -53,11 +50,6 @@ public static Criterion<TriggerInstance> keyPressed(String key) {
             ));
         }
 
-        @Environment(EnvType.CLIENT)
-        public static Criterion<TriggerInstance> keyPressed(KeyMapping key) {
-            return keyPressed(key.getName());
-        }
-
         public boolean matches(String key) {
             return this.key.isEmpty() || this.key.get().equals(key);
         }

diff --git a/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/EasyGoalProvider.java b/fabric/src/main/java/io/github/gaming32/bingo/fabric/datagen/goal/EasyGoalProvider.java
@@ -951,7 +951,7 @@ ItemSubPredicates.STORED_ENCHANTMENTS, createAnyStoredEnchantmentsRequirement()
             .name("pottery_sherd"));
         final KeyMapping walkBackwards = Minecraft.getInstance().options.keyDown;
         addGoal(BingoGoal.builder(id("never_walk_backwards"))
-            .criterion("walk", KeyPressedTrigger.TriggerInstance.keyPressed(walkBackwards))
+            .criterion("walk", KeyPressedTrigger.TriggerInstance.keyPressed(walkBackwards.getName()))
             .tags(BingoTags.ACTION, BingoTags.NEVER)
             .name(Component.translatable(
                 "bingo.goal.never_walk_backwards",