From 3b14f9d3258ec3d0e35d3b970f1453aff64ab9cb Mon Sep 17 00:00:00 2001 From: altrisi Date: Wed, 26 Jan 2022 11:28:25 +0100 Subject: [PATCH] Revert missed Movable TE changes --- ...eBEMixin.java => BlockEntity_movableTEMixin.java} | 2 +- ...=> PistonBlockEntityRenderer_movableTEMixin.java} | 2 +- ...in.java => PistonBlockEntity_movableTEMixin.java} | 4 ++-- ...eBEMixin.java => PistonBlock_movableTEMixin.java} | 4 ++-- ...leBEMixin.java => WorldChunk_movableTEMixin.java} | 4 ++-- ...movableBEMixin.java => World_movableTEMixin.java} | 2 +- src/main/resources/carpet.mixins.json | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/carpet/mixins/{BlockEntity_movableBEMixin.java => BlockEntity_movableTEMixin.java} (89%) rename src/main/java/carpet/mixins/{PistonBlockEntityRenderer_movableBEMixin.java => PistonBlockEntityRenderer_movableTEMixin.java} (98%) rename src/main/java/carpet/mixins/{PistonBlockEntity_movableBEMixin.java => PistonBlockEntity_movableTEMixin.java} (98%) rename src/main/java/carpet/mixins/{PistonBlock_movableBEMixin.java => PistonBlock_movableTEMixin.java} (98%) rename src/main/java/carpet/mixins/{WorldChunk_movableBEMixin.java => WorldChunk_movableTEMixin.java} (98%) rename src/main/java/carpet/mixins/{World_movableBEMixin.java => World_movableTEMixin.java} (98%) diff --git a/src/main/java/carpet/mixins/BlockEntity_movableBEMixin.java b/src/main/java/carpet/mixins/BlockEntity_movableTEMixin.java similarity index 89% rename from src/main/java/carpet/mixins/BlockEntity_movableBEMixin.java rename to src/main/java/carpet/mixins/BlockEntity_movableTEMixin.java index a0436244..cb4eb9ad 100644 --- a/src/main/java/carpet/mixins/BlockEntity_movableBEMixin.java +++ b/src/main/java/carpet/mixins/BlockEntity_movableTEMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Shadow; @Mixin(BlockEntity.class) -public abstract class BlockEntity_movableBEMixin implements BlockEntityInterface +public abstract class BlockEntity_movableTEMixin implements BlockEntityInterface { @Mutable @Shadow @Final protected BlockPos worldPosition; diff --git a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableBEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java similarity index 98% rename from src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableBEMixin.java rename to src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java index c7a36cd1..5316e5bd 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableBEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java @@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @Mixin(PistonHeadRenderer.class) -public abstract class PistonBlockEntityRenderer_movableBEMixin implements BlockEntityRenderer +public abstract class PistonBlockEntityRenderer_movableTEMixin implements BlockEntityRenderer { BlockEntityRenderDispatcher dispatcher; @Inject(method = "", at = @At("TAIL")) diff --git a/src/main/java/carpet/mixins/PistonBlockEntity_movableBEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java similarity index 98% rename from src/main/java/carpet/mixins/PistonBlockEntity_movableBEMixin.java rename to src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java index 47b3435c..9e49a713 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntity_movableBEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java @@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(PistonMovingBlockEntity.class) -public abstract class PistonBlockEntity_movableBEMixin extends BlockEntity implements PistonBlockEntityInterface +public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity implements PistonBlockEntityInterface { @Shadow private boolean isSourcePiston; @@ -34,7 +34,7 @@ public abstract class PistonBlockEntity_movableBEMixin extends BlockEntity imple private boolean renderCarriedBlockEntity = false; private boolean renderSet = false; - public PistonBlockEntity_movableBEMixin(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) { + public PistonBlockEntity_movableTEMixin(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) { super(blockEntityType, blockPos, blockState); } diff --git a/src/main/java/carpet/mixins/PistonBlock_movableBEMixin.java b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java similarity index 98% rename from src/main/java/carpet/mixins/PistonBlock_movableBEMixin.java rename to src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java index 2e315c60..439674b0 100644 --- a/src/main/java/carpet/mixins/PistonBlock_movableBEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java @@ -27,9 +27,9 @@ import java.util.List; import java.util.Map; @Mixin(PistonBaseBlock.class) -public abstract class PistonBlock_movableBEMixin extends DirectionalBlock +public abstract class PistonBlock_movableTEMixin extends DirectionalBlock { - protected PistonBlock_movableBEMixin(Properties block$Settings_1) + protected PistonBlock_movableTEMixin(Properties block$Settings_1) { super(block$Settings_1); } diff --git a/src/main/java/carpet/mixins/WorldChunk_movableBEMixin.java b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java similarity index 98% rename from src/main/java/carpet/mixins/WorldChunk_movableBEMixin.java rename to src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java index c34cc696..1ff5ff80 100644 --- a/src/main/java/carpet/mixins/WorldChunk_movableBEMixin.java +++ b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java @@ -27,13 +27,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(LevelChunk.class) -public abstract class WorldChunk_movableBEMixin extends ChunkAccess implements WorldChunkInterface +public abstract class WorldChunk_movableTEMixin extends ChunkAccess implements WorldChunkInterface { @Shadow @Final Level level; - public WorldChunk_movableBEMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) { + public WorldChunk_movableTEMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) { super(pos, upgradeData, heightLimitView, biome, inhabitedTime, sectionArrayInitializer, blendingData); } diff --git a/src/main/java/carpet/mixins/World_movableBEMixin.java b/src/main/java/carpet/mixins/World_movableTEMixin.java similarity index 98% rename from src/main/java/carpet/mixins/World_movableBEMixin.java rename to src/main/java/carpet/mixins/World_movableTEMixin.java index e288c604..9583d40a 100644 --- a/src/main/java/carpet/mixins/World_movableBEMixin.java +++ b/src/main/java/carpet/mixins/World_movableTEMixin.java @@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @Mixin(Level.class) -public abstract class World_movableBEMixin implements WorldInterface, LevelAccessor +public abstract class World_movableTEMixin implements WorldInterface, LevelAccessor { @Shadow @Final diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index cbe9a232..1b1d659f 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -207,11 +207,11 @@ "NoiseColumnSamplerMixin_scarpetMixin", "CaveScalerMixin_scarpetMixin", - "BlockEntity_movableBEMixin", - "PistonBlock_movableBEMixin", - "PistonBlockEntity_movableBEMixin", - "World_movableBEMixin", - "WorldChunk_movableBEMixin", + "BlockEntity_movableTEMixin", + "PistonBlock_movableTEMixin", + "PistonBlockEntity_movableTEMixin", + "World_movableTEMixin", + "WorldChunk_movableTEMixin", "PistonHandler_customStickyMixin", "PlayerEntity_creativeNoClipMixin", "PistonBlockEntity_playerHandlingMixin", @@ -232,7 +232,7 @@ "WorldRenderer_pausedShakeMixin", "InGameHudMixin", "PlayerListHudMixin", - "PistonBlockEntityRenderer_movableBEMixin", + "PistonBlockEntityRenderer_movableTEMixin", "StructureBlockBlockEntityRenderer_mixin", "ClientPlayerEntity_clientCommandMixin", "WorldRenderer_fogOffMixin",