From 6e92a46ccc7e693d41a93867455d458775a9c080 Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Wed, 14 Aug 2024 16:58:02 -0400
Subject: [PATCH] Remove extra code

---
 .../palettes/boiler/BoilerBigOutlines.java    | 106 ------------------
 .../content/palettes/boiler/BoilerBlock.java  |   3 +-
 .../block/be/SmokeStackBlockEntity.java       |   5 +-
 .../mixin/MixinAbstractBogeyBlock.java        |  37 +-----
 .../mixin/MixinRollerMovementBehaviour.java   |  17 ---
 .../mixin/client/MixinGameRenderer.java       |  34 ------
 .../railways/util/IHaveCustomGoggleIcon.java  |  35 ------
 .../resources/railways-common.mixins.json     |   1 -
 .../client/GoggleOverlayRendererMixin.java    |  51 ---------
 .../src/main/resources/railways.mixins.json   |   1 -
 .../client/GoggleOverlayRendererMixin.java    |  51 ---------
 forge/src/main/resources/railways.mixins.json |   1 -
 12 files changed, 6 insertions(+), 336 deletions(-)
 delete mode 100644 common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBigOutlines.java
 delete mode 100644 common/src/main/java/com/railwayteam/railways/mixin/client/MixinGameRenderer.java
 delete mode 100644 common/src/main/java/com/railwayteam/railways/util/IHaveCustomGoggleIcon.java
 delete mode 100644 fabric/src/main/java/com/railwayteam/railways/fabric/mixin/client/GoggleOverlayRendererMixin.java
 delete mode 100644 forge/src/main/java/com/railwayteam/railways/forge/mixin/client/GoggleOverlayRendererMixin.java

diff --git a/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBigOutlines.java b/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBigOutlines.java
deleted file mode 100644
index fb717edd1..000000000
--- a/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBigOutlines.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Steam 'n' Rails
- * Copyright (c) 2022-2024 The Railways Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.railwayteam.railways.content.palettes.boiler;
-
-import com.simibubi.create.foundation.utility.AnimationTickHolder;
-import com.simibubi.create.foundation.utility.RaycastHelper;
-import com.simibubi.create.foundation.utility.VecHelper;
-import dev.architectury.injectables.annotations.ExpectPlatform;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-
-// TODO - Remove when https://github.com/Creators-of-Create/Create/pull/6356 make's it into a release
-@Deprecated
-public class BoilerBigOutlines {
-    static BlockHitResult result = null;
-
-    public static void pick() {
-        Minecraft mc = Minecraft.getInstance();
-        if (!(mc.cameraEntity instanceof LocalPlayer player))
-            return;
-        if (mc.level == null)
-            return;
-
-        result = null;
-
-        Vec3 origin = player.getEyePosition(AnimationTickHolder.getPartialTicks(mc.level));
-
-        double maxRange = mc.hitResult == null ? Double.MAX_VALUE
-                : mc.hitResult.getLocation()
-                .distanceToSqr(origin);
-
-        double range = getRange(player);
-        Vec3 target = RaycastHelper.getTraceTarget(player, Math.min(maxRange, range) + 1, origin);
-
-        RaycastHelper.rayTraceUntil(origin, target, pos -> {
-            BlockPos.MutableBlockPos p = BlockPos.ZERO.mutable();
-
-            for (int x = -1; x <= 1; x++) {
-                for (int y = -1; y <= 1; y++) {
-                    for (int z = -1; z <= 1; z++) {
-                        p.set(pos.getX() + x, pos.getY() + y, pos.getZ() + z);
-                        BlockState blockState = mc.level.getBlockState(p);
-
-                        if (!(blockState.getBlock() instanceof BoilerBlock))
-                            continue;
-
-                        BlockHitResult hit = blockState.getInteractionShape(mc.level, p)
-                                .clip(origin, target, p.immutable());
-                        if (hit == null)
-                            continue;
-
-                        if (result != null && Vec3.atCenterOf(p)
-                                .distanceToSqr(origin) >= Vec3.atCenterOf(result.getBlockPos())
-                                .distanceToSqr(origin))
-                            continue;
-
-                        Vec3 vec = hit.getLocation();
-                        double interactionDist = vec.distanceToSqr(origin);
-                        if (interactionDist >= maxRange)
-                            continue;
-
-                        BlockPos hitPos = hit.getBlockPos();
-
-                        // pacifies ServerGamePacketListenerImpl.handleUseItemOn
-                        vec = vec.subtract(Vec3.atCenterOf(hitPos));
-                        vec = VecHelper.clampComponentWise(vec, 1);
-                        vec = vec.add(Vec3.atCenterOf(hitPos));
-
-                        result = new BlockHitResult(vec, hit.getDirection(), hitPos, hit.isInside());
-                    }
-                }
-            }
-
-            return result != null;
-        });
-
-        if (result != null)
-            mc.hitResult = result;
-    }
-
-    @ExpectPlatform
-    public static double getRange(Player player) {
-        throw new AssertionError();
-    }
-}
diff --git a/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBlock.java b/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBlock.java
index d06d49893..d69c9873f 100644
--- a/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBlock.java
+++ b/common/src/main/java/com/railwayteam/railways/content/palettes/boiler/BoilerBlock.java
@@ -26,6 +26,7 @@
 import com.railwayteam.railways.registry.CRShapes;
 import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripItem;
 import com.simibubi.create.content.equipment.wrench.IWrenchable;
+import com.simibubi.create.foundation.block.IHaveBigOutline;
 import com.simibubi.create.foundation.placement.IPlacementHelper;
 import com.simibubi.create.foundation.placement.PlacementHelpers;
 import com.simibubi.create.foundation.placement.PlacementOffset;
@@ -66,7 +67,7 @@
 import java.util.Locale;
 import java.util.function.Predicate;
 
-public class BoilerBlock extends Block implements IWrenchable, IForceRenderingSodium, IHasCustomOutline {
+public class BoilerBlock extends Block implements IWrenchable, IForceRenderingSodium, IHasCustomOutline, IHaveBigOutline {
     public static final int placementHelperId = PlacementHelpers.register(new PlacementHelper());
 
     public static final EnumProperty<Style> STYLE = EnumProperty.create("style", Style.class);
diff --git a/common/src/main/java/com/railwayteam/railways/content/smokestack/block/be/SmokeStackBlockEntity.java b/common/src/main/java/com/railwayteam/railways/content/smokestack/block/be/SmokeStackBlockEntity.java
index bd2d4c936..1ea413db0 100644
--- a/common/src/main/java/com/railwayteam/railways/content/smokestack/block/be/SmokeStackBlockEntity.java
+++ b/common/src/main/java/com/railwayteam/railways/content/smokestack/block/be/SmokeStackBlockEntity.java
@@ -21,7 +21,6 @@
 import com.railwayteam.railways.Railways;
 import com.railwayteam.railways.content.smokestack.block.SmokeStackBlock;
 import com.railwayteam.railways.util.ColorUtils;
-import com.railwayteam.railways.util.IHaveCustomGoggleIcon;
 import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
 import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@@ -39,7 +38,7 @@
 
 import java.util.List;
 
-public class SmokeStackBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation, IHaveCustomGoggleIcon {
+public class SmokeStackBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation {
 
     public @Nullable DyeColor getColor() {
         return color;
@@ -114,7 +113,7 @@ public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneak
     }
 
     @Override
-    public ItemStack railways$setGoggleIcon(boolean isPlayerSneaking) {
+    public ItemStack getIcon(boolean isPlayerSneaking) {
         if (color != null)
             return ColorUtils.getDyeColorDyeItem(color).getDefaultInstance();
 
diff --git a/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java b/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java
index 6c8b2f515..8abbe5d32 100644
--- a/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java
+++ b/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java
@@ -22,29 +22,22 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.railwayteam.railways.registry.CRBogeyStyles;
 import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock;
-import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity;
-import com.simibubi.create.content.trains.bogey.BogeySizes;
 import com.simibubi.create.content.trains.bogey.BogeyStyle;
 import com.simibubi.create.content.trains.track.ITrackBlock;
 import com.simibubi.create.content.trains.track.TrackMaterial.TrackType;
 import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 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.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.Collection;
 import java.util.List;
@@ -52,33 +45,7 @@
 
 @Mixin(value = AbstractBogeyBlock.class, remap = false)
 public abstract class MixinAbstractBogeyBlock {
-    @Shadow protected abstract BlockState copyProperties(BlockState source, BlockState target);
-
-    @Shadow public abstract BlockState getStateOfSize(AbstractBogeyBlockEntity sbte, BogeySizes.BogeySize size);
-
-    // fixme this is a Create bug, file a report (styles not placing the correct block)
-    // Has been merged, awaiting release
-    @Inject(method = "use",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;displayClientMessage(Lnet/minecraft/network/chat/Component;Z)V", remap = true, ordinal = 0),
-            locals = LocalCapture.CAPTURE_FAILSOFT, cancellable = true, remap = true)
-    private void placeCorrectedBlock(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand,
-                                     BlockHitResult hit, CallbackInfoReturnable<InteractionResult> cir, ItemStack stack,
-                                     BlockEntity be, AbstractBogeyBlockEntity sbbe, BogeyStyle currentStyle,
-                                     BogeySizes.BogeySize size, BogeyStyle style) {
-        if (state.getBlock() != style.getBlockOfSize(size)) {
-            CompoundTag oldData = sbbe.getBogeyData();
-            level.setBlock(pos, copyProperties(state, getStateOfSize(sbbe, size)), 3);
-            BlockEntity newBlockEntity = level.getBlockEntity(pos);
-            if (!(newBlockEntity instanceof AbstractBogeyBlockEntity newBlockEntity1)) {
-                cir.setReturnValue(InteractionResult.FAIL);
-                return;
-            }
-            newBlockEntity1.setBogeyData(oldData);
-        }
-    }
-
-    @Unique
-    private final ThreadLocal<TrackType> railways$trackType = new ThreadLocal<>();
+    @Unique private final ThreadLocal<TrackType> railways$trackType = new ThreadLocal<>();
 
     @Inject(method = "getNextStyle(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lcom/simibubi/create/content/trains/bogey/BogeyStyle;", at = @At("HEAD"), remap = true)
     private void storeSupportType(Level level, BlockPos pos, CallbackInfoReturnable<BogeyStyle> cir) {
@@ -129,7 +96,7 @@ private Object wrapCycleWithFallback(List<Object> list, Object style, Operation<
         try {
             return original.call(list, style);
         } catch (IllegalArgumentException e) {
-            return list.get(0);
+            return list.getFirst();
         }
     }
 }
diff --git a/common/src/main/java/com/railwayteam/railways/mixin/MixinRollerMovementBehaviour.java b/common/src/main/java/com/railwayteam/railways/mixin/MixinRollerMovementBehaviour.java
index e9437a979..6d265f38d 100644
--- a/common/src/main/java/com/railwayteam/railways/mixin/MixinRollerMovementBehaviour.java
+++ b/common/src/main/java/com/railwayteam/railways/mixin/MixinRollerMovementBehaviour.java
@@ -19,46 +19,29 @@
 package com.railwayteam.railways.mixin;
 
 import com.railwayteam.railways.content.roller_extensions.TrackReplacePaver;
-import com.simibubi.create.AllTags;
 import com.simibubi.create.content.contraptions.actors.roller.PaveTask;
 import com.simibubi.create.content.contraptions.actors.roller.RollerMovementBehaviour;
 import com.simibubi.create.content.contraptions.behaviour.MovementContext;
 import com.simibubi.create.content.trains.track.ITrackBlock;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import javax.annotation.Nullable;
 
 @Mixin(value = RollerMovementBehaviour.class, remap = false)
 public abstract class MixinRollerMovementBehaviour {
-    @Shadow protected abstract BlockState getStateToPaveWithAsSlab(MovementContext context);
-
     @Shadow protected abstract BlockState getStateToPaveWith(MovementContext context);
 
-
     @Shadow @Nullable protected abstract PaveTask createHeightProfileForTracks(MovementContext context);
 
-    // fixme this is a Create bug
-    // https://github.com/Creators-of-Create/Create/pull/6272 Remove this mixin whenever this is merged
-    // Has been merged, awaiting release
-    @Deprecated
-    @Inject(method = "canBreak", at = @At("RETURN"), cancellable = true)
-    private void noBreakingTracks(Level world, BlockPos breakingPos, BlockState state, CallbackInfoReturnable<Boolean> cir) {
-        if (AllTags.AllBlockTags.TRACKS.matches(state))
-            cir.setReturnValue(false);
-    }
-
     @Inject(method = "triggerPaver", at = @At("HEAD"), cancellable = true)
     private void skipTracksAndPaveTracks(MovementContext context, BlockPos pos, CallbackInfo ci) {
         BlockState stateToPaveWith = getStateToPaveWith(context);
-        BlockState stateToPaveWithAsSlab = getStateToPaveWithAsSlab(context);
         int mode = context.blockEntityData.getInt("ScrollValue");
         if (mode == 3) { // TRACK_REPLACE
             ci.cancel();
diff --git a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinGameRenderer.java b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinGameRenderer.java
deleted file mode 100644
index d5807802b..000000000
--- a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinGameRenderer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Steam 'n' Rails
- * Copyright (c) 2022-2024 The Railways Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.railwayteam.railways.mixin.client;
-
-import com.railwayteam.railways.content.palettes.boiler.BoilerBigOutlines;
-import net.minecraft.client.renderer.GameRenderer;
-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.CallbackInfo;
-
-@Mixin(GameRenderer.class)
-public class MixinGameRenderer {
-    @Inject(method = "pick(F)V", at = @At("TAIL"))
-    private void railways$bigShapePickModifiedFromCreate(CallbackInfo ci) {
-        BoilerBigOutlines.pick();
-    }
-}
\ No newline at end of file
diff --git a/common/src/main/java/com/railwayteam/railways/util/IHaveCustomGoggleIcon.java b/common/src/main/java/com/railwayteam/railways/util/IHaveCustomGoggleIcon.java
deleted file mode 100644
index fd7f72c5a..000000000
--- a/common/src/main/java/com/railwayteam/railways/util/IHaveCustomGoggleIcon.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Steam 'n' Rails
- * Copyright (c) 2022-2024 The Railways Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.railwayteam.railways.util;
-
-import com.simibubi.create.AllItems;
-import net.minecraft.world.item.ItemStack;
-
-// TODO - Remove when https://github.com/Creators-of-Create/Create/pull/5900 is merged
-// Has been merged, awaiting release
-@Deprecated
-public interface IHaveCustomGoggleIcon {
-    /**
-     * this method will be called when looking at a BlockEntity that implemented this
-     * interface
-     */
-    default ItemStack railways$setGoggleIcon(boolean isPlayerSneaking) {
-        return AllItems.GOGGLES.asStack();
-    }
-}
diff --git a/common/src/main/resources/railways-common.mixins.json b/common/src/main/resources/railways-common.mixins.json
index 39f517ca0..60ec68405 100644
--- a/common/src/main/resources/railways-common.mixins.json
+++ b/common/src/main/resources/railways-common.mixins.json
@@ -122,7 +122,6 @@
     "client.MixinCarriageSounds",
     "client.MixinCurvedTrackInteraction",
     "client.MixinDebugRenderer",
-    "client.MixinGameRenderer",
     "client.MixinGlobalRailwayManager",
     "client.MixinItemModelShaper",
     "client.MixinLevelRenderer",
diff --git a/fabric/src/main/java/com/railwayteam/railways/fabric/mixin/client/GoggleOverlayRendererMixin.java b/fabric/src/main/java/com/railwayteam/railways/fabric/mixin/client/GoggleOverlayRendererMixin.java
deleted file mode 100644
index 6ec29fd32..000000000
--- a/fabric/src/main/java/com/railwayteam/railways/fabric/mixin/client/GoggleOverlayRendererMixin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Steam 'n' Rails
- * Copyright (c) 2022-2024 The Railways Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.railwayteam.railways.fabric.mixin.client;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import com.railwayteam.railways.util.IHaveCustomGoggleIcon;
-import com.simibubi.create.content.equipment.goggles.GoggleOverlayRenderer;
-import com.simibubi.create.content.equipment.goggles.GogglesItem;
-import com.tterrag.registrate.util.entry.ItemEntry;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-// TODO - Remove when https://github.com/Creators-of-Create/Create/pull/5900 is merged
-// Has been merged, awaiting release
-@Deprecated
-@Mixin(GoggleOverlayRenderer.class)
-public class GoggleOverlayRendererMixin {
-    @WrapOperation(
-            method = "renderOverlay",
-            at = @At(value = "INVOKE", target = "Lcom/tterrag/registrate/util/entry/ItemEntry;asStack()Lnet/minecraft/world/item/ItemStack;")
-    )
-    private static ItemStack changeDisplayItem(ItemEntry<GogglesItem> instance, Operation<ItemStack> original,
-                                               @Local BlockEntity be, @Local(name = "wearingGoggles") boolean wearingGoggles) {
-        if (be instanceof IHaveCustomGoggleIcon gte && wearingGoggles) {
-            return gte.railways$setGoggleIcon(Minecraft.getInstance().player.isShiftKeyDown());
-        }
-
-        return original.call(instance);
-    }
-}
diff --git a/fabric/src/main/resources/railways.mixins.json b/fabric/src/main/resources/railways.mixins.json
index e93617b8c..618405d61 100644
--- a/fabric/src/main/resources/railways.mixins.json
+++ b/fabric/src/main/resources/railways.mixins.json
@@ -5,7 +5,6 @@
   "compatibilityLevel": "JAVA_17",
   "refmap": "Steam_Rails-fabric-refmap.json",
   "client": [
-    "client.GoggleOverlayRendererMixin",
     "client.LevelRendererMixin",
     "client.TrackBlockOutlineMixin",
     "client.TrainHUDMixin"
diff --git a/forge/src/main/java/com/railwayteam/railways/forge/mixin/client/GoggleOverlayRendererMixin.java b/forge/src/main/java/com/railwayteam/railways/forge/mixin/client/GoggleOverlayRendererMixin.java
deleted file mode 100644
index fbdc7907e..000000000
--- a/forge/src/main/java/com/railwayteam/railways/forge/mixin/client/GoggleOverlayRendererMixin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Steam 'n' Rails
- * Copyright (c) 2022-2024 The Railways Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.railwayteam.railways.forge.mixin.client;
-
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
-import com.railwayteam.railways.util.IHaveCustomGoggleIcon;
-import com.simibubi.create.content.equipment.goggles.GoggleOverlayRenderer;
-import com.simibubi.create.content.equipment.goggles.GogglesItem;
-import com.tterrag.registrate.util.entry.ItemEntry;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-// TODO - Remove when https://github.com/Creators-of-Create/Create/pull/5900 is merged
-// Has been merged, awaiting release
-@Deprecated
-@Mixin(GoggleOverlayRenderer.class)
-public class GoggleOverlayRendererMixin {
-    @WrapOperation(
-            method = "renderOverlay",
-            at = @At(value = "INVOKE", target = "Lcom/tterrag/registrate/util/entry/ItemEntry;asStack()Lnet/minecraft/world/item/ItemStack;")
-    )
-    private static ItemStack changeDisplayItem(ItemEntry<GogglesItem> instance, Operation<ItemStack> original,
-                                               @Local BlockEntity be, @Local(name = "wearingGoggles") boolean wearingGoggles) {
-        if (be instanceof IHaveCustomGoggleIcon gte && wearingGoggles) {
-            return gte.railways$setGoggleIcon(Minecraft.getInstance().player.isShiftKeyDown());
-        }
-
-        return original.call(instance);
-    }
-}
diff --git a/forge/src/main/resources/railways.mixins.json b/forge/src/main/resources/railways.mixins.json
index 6e763a1f7..9d76fce47 100644
--- a/forge/src/main/resources/railways.mixins.json
+++ b/forge/src/main/resources/railways.mixins.json
@@ -6,7 +6,6 @@
   "refmap": "Steam_Rails-forge-refmap.json",
   "client": [
     "client.ClientPacketListenerMixin",
-    "client.GoggleOverlayRendererMixin",
     "client.TrackBlockOutlineMixin",
     "client.TrainHUDMixin"
   ],