preperations to have a common code and different implementations for forge and fabric to ease up maintaining both versions

4 files changed, 0 insertions, 155 deletions

diff --git a/src/main/java/de/hype/bbsentials/mixins/ClientCommandSourceMixin.java b/src/main/java/de/hype/bbsentials/mixins/ClientCommandSourceMixin.java
deleted file mode 100644
index edbe487..0000000
--- a/src/main/java/de/hype/bbsentials/mixins/ClientCommandSourceMixin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package de.hype.bbsentials.mixins;
-
-import com.google.common.collect.Lists;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientCommandSource;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.client.network.PlayerListEntry;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-@Environment(EnvType.CLIENT)
-@Mixin(ClientCommandSource.class)
-public abstract class ClientCommandSourceMixin {
-    @Shadow
-    private final ClientPlayNetworkHandler networkHandler;
-    private final MinecraftClient client;
-    @Final
-    private List<PlayerListEntry> playerList;
-
-    /**
-     * @return Collection of player names.
-     * @author HacktheTime
-     * @reason Remove hypixels dummy players from the list.
-     * Overwrites the getPlayerNames() method with the new implementation.
-     * This method returns a collection of player names from the playerList.
-     * This method is now also used by server-side commands.
-     */
-    @Overwrite
-    public Collection<String> getPlayerNames() {
-        List<String> list = Lists.newArrayList();
-        Iterator var2 = this.networkHandler.getPlayerList().iterator();
-
-        while (var2.hasNext()) {
-            PlayerListEntry playerListEntry = (PlayerListEntry) var2.next();
-            String playerName = playerListEntry.getProfile().getName();
-            if (!playerName.startsWith("!")) {
-                list.add(playerName);
-            }
-        }
-
-        return list;
-    }
-
-    public ClientCommandSourceMixin(ClientPlayNetworkHandler networkHandler) {
-        this.networkHandler = networkHandler;
-        this.client = MinecraftClient.getInstance();
-    }
-}
diff --git a/src/main/java/de/hype/bbsentials/mixins/ItemRendererMixin.java b/src/main/java/de/hype/bbsentials/mixins/ItemRendererMixin.java
deleted file mode 100644
index 177161f..0000000
--- a/src/main/java/de/hype/bbsentials/mixins/ItemRendererMixin.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package de.hype.bbsentials.mixins;
-
-import de.hype.bbsentials.client.BBsentials;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.client.render.model.json.ModelTransformationMode;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ItemRenderer.class)
-public class ItemRendererMixin {
-    @Shadow
-    @Final
-    private MinecraftClient client;
-
-    @Inject(method = "renderItem", at = @At("HEAD"), cancellable = true)
-    private void renderItemMixin(ItemStack stack, ModelTransformationMode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, BakedModel model, CallbackInfo ci) {
-        if (BBsentials.config.highlightitem) {
-            setCustomName(stack, BBsentials.connection.getItemName());
-        }
-    }
-
-    @Unique
-    private void setCustomName(ItemStack stack, String triggerName) {
-        String temp = stack.getName().getString();
-        if ((!temp.contains("Splash")) && temp.contains(triggerName)) {
-            stack.setCustomName(Text.literal("§6(Bingo Splash) " + temp));
-        }
-    }
-}
diff --git a/src/main/java/de/hype/bbsentials/mixins/ScreenMixin.java b/src/main/java/de/hype/bbsentials/mixins/ScreenMixin.java
deleted file mode 100644
index e046e25..0000000
--- a/src/main/java/de/hype/bbsentials/mixins/ScreenMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.hype.bbsentials.mixins;
-
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.List;
-
-@Mixin(Screen.class)
-public class ScreenMixin {
-    @Inject(method = "getTooltipFromItem", at = @At("RETURN"), cancellable = true)
-    private static void getTooltipFromItem(MinecraftClient client, ItemStack stack, CallbackInfoReturnable<List<Text>> ci) {
-        /*// Cancel the original method
-        List<Text> temp = ci.getReturnValue();
-        temp.add(1,Text.literal("§6Splash on going by missing"));
-        ci.setReturnValue(temp);*/
-
-        //TODO this is an only visual addition for time tooltip.
-        // This means it can be used to add data the server cant see.
-    }
-}
diff --git a/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java b/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java
deleted file mode 100644
index 7444788..0000000
--- a/src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package de.hype.bbsentials.mixins;
-
-import de.hype.bbsentials.api.ISimpleOption;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.option.SimpleOption;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.Objects;
-import java.util.function.Consumer;
-
-@Mixin(SimpleOption.class)
-public class SimpleOptionMixin implements ISimpleOption {
-    @Shadow
-    Object value;
-    @Shadow
-    @Final
-    private Consumer<Object> changeCallback;
-
-    @Override
-    public void set(Object value) {
-        if (!MinecraftClient.getInstance().isRunning()) {
-            this.value = value;
-        }
-        else {
-            if (!Objects.equals(this.value, value)) {
-                this.value = value;
-                this.changeCallback.accept(this.value);
-            }
-        }
-    }
-}