From 11fadcab868ed25c742d76b3f53f3649814d7a7c Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Wed, 1 Jan 2025 10:07:12 -0500
Subject: [PATCH] remove temp fixes

---
 .../mixin/compat/create/BlockHelperMixin.java | 17 ------
 ...rriage$DimensionalCarriageEntityMixin.java | 54 -------------------
 .../mixin/compat/create/CarriageAccessor.java | 12 -----
 src/main/resources/railwaystweaks.mixins.json |  3 --
 4 files changed, 86 deletions(-)
 delete mode 100644 src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/BlockHelperMixin.java
 delete mode 100644 src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/Carriage$DimensionalCarriageEntityMixin.java
 delete mode 100644 src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/CarriageAccessor.java

diff --git a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/BlockHelperMixin.java b/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/BlockHelperMixin.java
deleted file mode 100644
index 355ff73..0000000
--- a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/BlockHelperMixin.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package dev.ithundxr.railwaystweaks.mixin.compat.create;
-
-import com.llamalad7.mixinextras.sugar.Local;
-import com.simibubi.create.foundation.utility.BlockHelper;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(BlockHelper.class)
-public class BlockHelperMixin {
-    @Redirect(method = "placeSchematicBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntity;getType()Lnet/minecraft/world/level/block/entity/BlockEntityType;", ordinal = 1))
-    private static BlockEntityType<?> railwayTweaks$fixSchematicannonCrash(BlockEntity instance, @Local(ordinal = 1) BlockEntity loaded) {
-        return loaded != null ? instance.getType() : null;
-    }
-}
diff --git a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/Carriage$DimensionalCarriageEntityMixin.java b/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/Carriage$DimensionalCarriageEntityMixin.java
deleted file mode 100644
index 5bb9842..0000000
--- a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/Carriage$DimensionalCarriageEntityMixin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package dev.ithundxr.railwaystweaks.mixin.compat.create;
-
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-import com.simibubi.create.content.trains.entity.Carriage;
-import net.minecraft.nbt.DoubleTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
-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(Carriage.DimensionalCarriageEntity.class)
-public class Carriage$DimensionalCarriageEntityMixin {
-    @Final
-    @Shadow(aliases = "this$0")
-    Carriage this$0;
-
-    @Shadow public Vec3 positionAnchor;
-
-    @Inject(method = "createEntity", at = @At("HEAD"))
-    private void railwaysTweaks$fixDimensionalTrainCrash(Level level, boolean loadPassengers, CallbackInfo ci) {
-        if (positionAnchor != null) {
-            ((CarriageAccessor) this$0).railwaysTweaks$getSerializedEntity().put(
-                    "Pos",
-                    railwaysTweaks$newDoubleList(
-                            positionAnchor.x(),
-                            positionAnchor.y(),
-                            positionAnchor.z()
-                    )
-            );
-        }
-    }
-    
-    @WrapWithCondition(method = "createEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;moveTo(Lnet/minecraft/world/phys/Vec3;)V"))
-    private boolean railwaysTweaks$fixDimensionalTrainCrash2(Entity instance, Vec3 vec) {
-        return positionAnchor != null;
-    }
-
-    @Unique
-    private static ListTag railwaysTweaks$newDoubleList(double... pValues) {
-        ListTag listtag = new ListTag();
-
-        for (double d : pValues)
-            listtag.add(DoubleTag.valueOf(d));
-
-        return listtag;
-    }
-}
diff --git a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/CarriageAccessor.java b/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/CarriageAccessor.java
deleted file mode 100644
index 030d1f2..0000000
--- a/src/main/java/dev/ithundxr/railwaystweaks/mixin/compat/create/CarriageAccessor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package dev.ithundxr.railwaystweaks.mixin.compat.create;
-
-import com.simibubi.create.content.trains.entity.Carriage;
-import net.minecraft.nbt.CompoundTag;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(Carriage.class)
-public interface CarriageAccessor {
-    @Accessor("serialisedEntity")
-    CompoundTag railwaysTweaks$getSerializedEntity();
-}
diff --git a/src/main/resources/railwaystweaks.mixins.json b/src/main/resources/railwaystweaks.mixins.json
index 9f1d0e0..bbd38a8 100644
--- a/src/main/resources/railwaystweaks.mixins.json
+++ b/src/main/resources/railwaystweaks.mixins.json
@@ -12,9 +12,6 @@
     "ServerStatusPacketListenerImplMixin",
     "compat.appleskin.SyncHandlerMixin",
     "compat.carryon.PlacementHandlerMixin",
-    "compat.create.BlockHelperMixin",
-    "compat.create.Carriage$DimensionalCarriageEntityMixin",
-    "compat.create.CarriageAccessor",
     "compat.dcintegration.DiscordEventListenerMixin",
     "compat.enchancement.SlideComponentMixin",
     "compat.sereneseasons.RandomUpdateHandlerMixin",