From 256d54fab72228c9c13756f17ee317de3ebbc1a7 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 13 Sep 2019 17:00:14 -0300 Subject: [PATCH] removed all mentions of a tile per official Micro$oft corporate mappings --- README.md | 4 ++-- .../PistonBlockEntityRenderer_movableTEMixin.java | 2 +- .../mixins/PistonBlockEntity_movableTEMixin.java | 10 +++++----- .../java/carpet/mixins/PistonBlock_movableTEMixin.java | 10 +++++----- .../carpet/mixins/PistonHandler_movableTEMixin.java | 4 ++-- .../java/carpet/mixins/WorldChunk_movableTEMixin.java | 2 +- src/main/java/carpet/mixins/World_tickMixin.java | 2 +- src/main/java/carpet/settings/CarpetSettings.java | 4 ++-- src/main/java/carpet/utils/CarpetProfiler.java | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 79a0c148..3b0bd2e7 100644 --- a/README.md +++ b/README.md @@ -276,8 +276,8 @@ Pistons, Glass and Sponge can be broken faster with their appropriate tools * Required options: `true`, `false` * Categories: `SURVIVAL` -## movableTileEntities -Pistons can push tile entities, like hoppers, chests etc. +## movableBlockEntities +Pistons can push block entities, like hoppers, chests etc. * Type: `boolean` * Default value: `false` * Required options: `true`, `false` diff --git a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java index 9be523af..f841ae43 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java @@ -22,7 +22,7 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin extends BlockEnti double double_3, float float_1, int int_1, CallbackInfo ci) { if (!((PistonBlockEntityInterface) pistonBlockEntity_1).isRenderModeSet()) - ((PistonBlockEntityInterface) pistonBlockEntity_1).setRenderCarriedBlockEntity(CarpetSettings.movableTileEntities && ((PistonBlockEntityInterface) pistonBlockEntity_1).getCarriedBlockEntity() != null); + ((PistonBlockEntityInterface) pistonBlockEntity_1).setRenderCarriedBlockEntity(CarpetSettings.movableBlockEntities && ((PistonBlockEntityInterface) pistonBlockEntity_1).getCarriedBlockEntity() != null); } @Inject(method = "method_3576", at = @At("RETURN")) diff --git a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java index 0de7a544..667950af 100644 --- a/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java @@ -77,7 +77,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple target = "Lnet/minecraft/world/World;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z")) private boolean movableTEsetBlockState0(World world, BlockPos blockPos_1, BlockState blockAState_2, int int_1) { - if (!CarpetSettings.movableTileEntities) + if (!CarpetSettings.movableBlockEntities) return world.setBlockState(blockPos_1, blockAState_2, int_1); else return ((WorldInterface) (world)).setBlockStateWithBlockEntity(blockPos_1, blockAState_2, this.carriedBlockEntity, int_1); @@ -87,7 +87,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple target = "Lnet/minecraft/world/World;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z")) private boolean movableTEsetBlockState1(World world, BlockPos blockPos_1, BlockState blockState_2, int int_1) { - if (!CarpetSettings.movableTileEntities) + if (!CarpetSettings.movableBlockEntities) return world.setBlockState(blockPos_1, blockState_2, int_1); else { @@ -103,7 +103,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple //Handle TNT Explosions or other ways the moving Block is broken //Also /setblock will cause this to be called, and drop e.g. a moving chest's contents. // This is MC-40380 (BlockEntities that aren't Inventories drop stuff when setblock is called ) - if (CarpetSettings.movableTileEntities && this.carriedBlockEntity != null && !this.world.isClient && this.world.getBlockState(this.pos).getBlock() == Blocks.AIR) + if (CarpetSettings.movableBlockEntities && this.carriedBlockEntity != null && !this.world.isClient && this.world.getBlockState(this.pos).getBlock() == Blocks.AIR) { BlockState blockState_2; if (this.source) @@ -118,7 +118,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple @Inject(method = "fromTag", at = @At(value = "TAIL")) private void onFromTag(CompoundTag compoundTag_1, CallbackInfo ci) { - if (CarpetSettings.movableTileEntities && compoundTag_1.containsKey("carriedTileEntityCM", 10)) + if (CarpetSettings.movableBlockEntities && compoundTag_1.containsKey("carriedTileEntityCM", 10)) { if (this.pushedBlock.getBlock() instanceof BlockEntityProvider) this.carriedBlockEntity = ((BlockEntityProvider) (this.pushedBlock.getBlock())).createBlockEntity(this.world); @@ -130,7 +130,7 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple @Inject(method = "toTag", at = @At(value = "RETURN", shift = At.Shift.BEFORE)) private void onToTag(CompoundTag compoundTag_1, CallbackInfoReturnable cir) { - if (CarpetSettings.movableTileEntities && this.carriedBlockEntity != null) + if (CarpetSettings.movableBlockEntities && this.carriedBlockEntity != null) { //Leave name "carriedTileEntityCM" instead of "carriedBlockEntityCM" for upgrade compatibility with 1.13.2 movable TE compoundTag_1.put("carriedTileEntityCM", this.carriedBlockEntity.toTag(new CompoundTag())); diff --git a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java index 7dda8b94..d06b10bb 100644 --- a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java @@ -35,13 +35,13 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock { Block block_1 = blockState_1.getBlock(); //Make CommandBlocks movable, either use instanceof CommandBlock or the 3 cmd block objects, - if (CarpetSettings.movableTileEntities && block_1 instanceof CommandBlock) + if (CarpetSettings.movableBlockEntities && block_1 instanceof CommandBlock) { cir.setReturnValue(true); } } - private static boolean isPushableTileEntityBlock(Block block) + private static boolean isPushableBlockEntity(Block block) { //Making PISTON_EXTENSION (BlockPistonMoving) pushable would not work as its createNewTileEntity()-method returns null return block != Blocks.ENDER_CHEST && block != Blocks.ENCHANTING_TABLE && @@ -58,7 +58,7 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock } else { - return !(CarpetSettings.movableTileEntities && isPushableTileEntityBlock(block)); + return !(CarpetSettings.movableBlockEntities && isPushableBlockEntity(block)); } } @Inject(method = "move", at = @At(value = "INVOKE", shift = At.Shift.BEFORE, @@ -69,7 +69,7 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock Direction direction_2, Set set_1) { //Get the blockEntities and remove them from the world before any magic starts to happen - if (CarpetSettings.movableTileEntities) + if (CarpetSettings.movableBlockEntities) { list1_BlockEntities.set(Lists.newArrayList()); for (int i = 0; i < list_1.size(); ++i) @@ -99,7 +99,7 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock { BlockEntity blockEntityPiston = PistonExtensionBlock.createBlockEntityPiston((BlockState) list_2.get(int_3), direction_1, boolean_1, false); - if (CarpetSettings.movableTileEntities) + if (CarpetSettings.movableBlockEntities) ((PistonBlockEntityInterface) blockEntityPiston).setCarriedBlockEntity(list1_BlockEntities.get().get(int_3)); world_1.setBlockEntity(blockPos_4, blockEntityPiston); } diff --git a/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java b/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java index c21e21f3..17c2e9e4 100644 --- a/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java @@ -66,7 +66,7 @@ public abstract class PistonHandler_movableTEMixin * @author 2No2Name */ private boolean stickToStickySide(BlockPos blockPos_1){ - if(!CarpetSettings.movableTileEntities) + if(!CarpetSettings.movableBlockEntities) return true; BlockState blockState_1 = this.world.getBlockState(blockPos_1); @@ -107,7 +107,7 @@ public abstract class PistonHandler_movableTEMixin * @author 2No2Nameb */ private Block redirectSlimeBlock() { - if (CarpetSettings.movableTileEntities && isStickyOnSide(blockState_1, this.direction.getOpposite())) + if (CarpetSettings.movableBlockEntities && isStickyOnSide(blockState_1, this.direction.getOpposite())) return blockState_1.getBlock(); //this makes the comparison in the while condition "while(blockState_1.getBlock() == redirectSlimeBlock())" evaluate to true, so the block is treated as sticky else return Blocks.SLIME_BLOCK; //vanilla behavior diff --git a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java index 161f72e8..ac1d56d9 100644 --- a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java +++ b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java @@ -48,7 +48,7 @@ public abstract class WorldChunk_movableTEMixin implements WorldChunkInterface private BlockEntity ifGetBlockEntity(WorldChunk worldChunk, BlockPos blockPos_1, WorldChunk.CreationType worldChunk$CreationType_1) { - if (!CarpetSettings.movableTileEntities) + if (!CarpetSettings.movableBlockEntities) { return this.getBlockEntity(blockPos_1, WorldChunk.CreationType.CHECK); } diff --git a/src/main/java/carpet/mixins/World_tickMixin.java b/src/main/java/carpet/mixins/World_tickMixin.java index 0d18805d..2abb4257 100644 --- a/src/main/java/carpet/mixins/World_tickMixin.java +++ b/src/main/java/carpet/mixins/World_tickMixin.java @@ -36,7 +36,7 @@ public abstract class World_tickMixin implements WorldInterface @Inject(method = "tickBlockEntities", at = @At("HEAD")) private void startBlockEntities(CallbackInfo ci) { - currentSection = CarpetProfiler.start_section((World) (Object) this, "Tile Entities", CarpetProfiler.TYPE.GENERAL); + currentSection = CarpetProfiler.start_section((World) (Object) this, "Block Entities", CarpetProfiler.TYPE.GENERAL); } @Inject(method = "tickBlockEntities", at = @At("TAIL")) diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index 85ef7e9a..3400c596 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -147,8 +147,8 @@ public class CarpetSettings @Rule( desc = "Guardians turn into Elder Guardian when struck by lightning", category = FEATURE ) public static boolean renewableSponges = false; - @Rule( desc = "Pistons can push tile entities, like hoppers, chests etc.", category = {EXPERIMENTAL, FEATURE} ) - public static boolean movableTileEntities = false; + @Rule( desc = "Pistons can push block entities, like hoppers, chests etc.", category = {EXPERIMENTAL, FEATURE} ) + public static boolean movableBlockEntities = false; @Rule( desc = "Saplings turn into dead shrubs in hot climates and no water access", category = FEATURE ) public static boolean desertShrubs = false; diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index 70bf4a63..f9facb78 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -25,8 +25,8 @@ public class CarpetProfiler private static String[] DIMENSIONS = {"overworld", "the_end", "the_nether"}; private static String[] SECTIONS = { "Spawning and Random Ticks", "Ticket Manager","Unloading", - "Blocks", "Entities", "Tile Entities", - "Entities (Client)", "Tile Entities (Client)", + "Blocks", "Entities", "Block Entities", + "Entities (Client)", "Block Entities (Client)", "Village", "Environment"}; public enum TYPE