Revert missed Movable TE changes

This commit is contained in:
altrisi committed 2022-01-26 11:28:25 +01:00
1 parent 06af9ce8b1
commit 3b14f9d325
7 files changed
+15 -15

No files matched your search

@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@Mixin(BlockEntity.class) @Mixin(BlockEntity.class)
public abstract class BlockEntity_movableBEMixin implements BlockEntityInterface public abstract class BlockEntity_movableTEMixin implements BlockEntityInterface
{ {
@Mutable @Mutable
@Shadow @Final protected BlockPos worldPosition; @Shadow @Final protected BlockPos worldPosition;
@@ -17,7 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@Mixin(PistonHeadRenderer.class) @Mixin(PistonHeadRenderer.class)
public abstract class PistonBlockEntityRenderer_movableBEMixin implements BlockEntityRenderer<PistonMovingBlockEntity> public abstract class PistonBlockEntityRenderer_movableTEMixin implements BlockEntityRenderer<PistonMovingBlockEntity>
{ {
BlockEntityRenderDispatcher dispatcher; BlockEntityRenderDispatcher dispatcher;
@Inject(method = "<init>", at = @At("TAIL")) @Inject(method = "<init>", at = @At("TAIL"))
@@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(PistonMovingBlockEntity.class) @Mixin(PistonMovingBlockEntity.class)
public abstract class PistonBlockEntity_movableBEMixin extends BlockEntity implements PistonBlockEntityInterface public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity implements PistonBlockEntityInterface
{ {
@Shadow @Shadow
private boolean isSourcePiston; private boolean isSourcePiston;
@@ -34,7 +34,7 @@ public abstract class PistonBlockEntity_movableBEMixin extends BlockEntity imple
private boolean renderCarriedBlockEntity = false; private boolean renderCarriedBlockEntity = false;
private boolean renderSet = 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); super(blockEntityType, blockPos, blockState);
} }
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@Mixin(PistonBaseBlock.class) @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); super(block$Settings_1);
} }
@@ -27,13 +27,13 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(LevelChunk.class) @Mixin(LevelChunk.class)
public abstract class WorldChunk_movableBEMixin extends ChunkAccess implements WorldChunkInterface public abstract class WorldChunk_movableTEMixin extends ChunkAccess implements WorldChunkInterface
{ {
@Shadow @Shadow
@Final @Final
Level level; Level level;
public WorldChunk_movableBEMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) { public WorldChunk_movableTEMixin(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry<Biome> biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) {
super(pos, upgradeData, heightLimitView, biome, inhabitedTime, sectionArrayInitializer, blendingData); super(pos, upgradeData, heightLimitView, biome, inhabitedTime, sectionArrayInitializer, blendingData);
} }
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@Mixin(Level.class) @Mixin(Level.class)
public abstract class World_movableBEMixin implements WorldInterface, LevelAccessor public abstract class World_movableTEMixin implements WorldInterface, LevelAccessor
{ {
@Shadow @Shadow
@Final @Final
+6 -6
View File
@@ -207,11 +207,11 @@
"NoiseColumnSamplerMixin_scarpetMixin", "NoiseColumnSamplerMixin_scarpetMixin",
"CaveScalerMixin_scarpetMixin", "CaveScalerMixin_scarpetMixin",
"BlockEntity_movableBEMixin", "BlockEntity_movableTEMixin",
"PistonBlock_movableBEMixin", "PistonBlock_movableTEMixin",
"PistonBlockEntity_movableBEMixin", "PistonBlockEntity_movableTEMixin",
"World_movableBEMixin", "World_movableTEMixin",
"WorldChunk_movableBEMixin", "WorldChunk_movableTEMixin",
"PistonHandler_customStickyMixin", "PistonHandler_customStickyMixin",
"PlayerEntity_creativeNoClipMixin", "PlayerEntity_creativeNoClipMixin",
"PistonBlockEntity_playerHandlingMixin", "PistonBlockEntity_playerHandlingMixin",
@@ -232,7 +232,7 @@
"WorldRenderer_pausedShakeMixin", "WorldRenderer_pausedShakeMixin",
"InGameHudMixin", "InGameHudMixin",
"PlayerListHudMixin", "PlayerListHudMixin",
"PistonBlockEntityRenderer_movableBEMixin", "PistonBlockEntityRenderer_movableTEMixin",
"StructureBlockBlockEntityRenderer_mixin", "StructureBlockBlockEntityRenderer_mixin",
"ClientPlayerEntity_clientCommandMixin", "ClientPlayerEntity_clientCommandMixin",
"WorldRenderer_fogOffMixin", "WorldRenderer_fogOffMixin",