New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AccurateBlockPlacement now support FacingBlocks #228

Closed

aria1th wants to merge 19 commits into gnembon:1.17 from aria1th:1.17

aria1th commented Aug 19, 2021

tested with fence gate, lentern, end portal frame, stairs, hoppers, chest(somehow buggy), barrel, redstone components, bed, bee hive, grindstone.

aria1th added 6 commits

August 18, 2021 16:21


          FacingBlock has Facing so should not return null

fc894c2


          Update BlockPlacer.java

ff13143


          Update BlockPlacer.java

a0656d8


          Uhhhh

8fa254c


          make it work

7b5e11d


          Supports all facingblock

149bf04

chest has wierdness, so maybe should be checked next time

Contributor

DragonEggBedrockBreaking commented Aug 19, 2021

Fixes #169 #206


          WallMountedBlock(button, lever, etc) is not supported

13a7f4d

its not coded in tweakeroo / litematica, so we can't define its defaultstate (FACE) property.

Author

aria1th commented Aug 20, 2021

Let's see what's still not supported..
Bell is not supported.
Levers / Buttons are not supported since it needs 'face' too, its problematic because it needs actual hit vector.
Signs, yes, needs hit vector.
Rails does not have facing, and can be updated when nearby blocks are placed.

Grindstone, however, it can be placed 'facing' correctly but it does not refelect its 'attached side' so I removed all wallmountedblocks, to prevent ghost block and errors.

Doorblock needs 'hinge' too, but usually it does nothing so its remaining.

aria1th added 2 commits

August 20, 2021 22:59


          Fix ChestBlock

a24b9c7


          disable chestblock

1085cd8

urgh

Author

aria1th commented Aug 20, 2021

Chest is not supported: its rotation can work correctly, but its double/single behavior is locational. Should be fixed when its solved.


          Now supports ChestBlock and replicates vanilla placing behavior

b878f56

Author

aria1th commented Aug 21, 2021

Fixed ChestBlock behavior, it mimics vanilla.

aria1th added 3 commits

August 25, 2021 16:13


          Update BlockPlacer.java

ca07715


          support RailShape

0d2ec7a


          Update BlockPlacer.java

fa9bc70

altrisi reviewed

View reviewed changes

Collaborator

altrisi left a comment

Small review, not really code review, mostly code style (not tested).

Also some changes to style could be reverted (like lines 25-26 being changed), and there's places where code look better with spaces after the commas.

src/main/java/carpetextra/utils/BlockPlacer.java Outdated

Comment on lines 32 to 41

+                  private static Boolean HasDirectionProperty(BlockState state) {
+                      //malilib code
+                      for (Property<?> prop : state.getProperties()) {
+                          if (prop instanceof DirectionProperty) {
+                              return true;
+                          }
+                      }
+                      return false;
+                  }

Collaborator

altrisi Sep 11, 2021

I'd remove this and instead save the result of getFirstDirectionProperty in a field (since it will be needed later anyway) and check != null

src/main/java/carpetextra/utils/BlockPlacer.java Outdated

Comment on lines 52 to 59

+                  private static Boolean IsBlockAttachableChest(Block originBlock, Direction Facing, BlockPos checkPos, World world) {
+                      BlockState checkState = world.getBlockState(checkPos);
+                      if (checkState == null) {
+                          return false;
+                      }
+                      if (originBlock.getName().equals(checkState.getBlock().getName())) {
+                          return checkState.get(ChestBlock.FACING).equals(Facing) && checkState.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE;
+                      }

Collaborator

altrisi Sep 11, 2021

Suggested change

      
                private static Boolean IsBlockAttachableChest(Block originBlock, Direction Facing, BlockPos checkPos, World world) {
          
                    BlockState checkState = world.getBlockState(checkPos);
          
                    if (checkState == null) {
          
                        return false;
          
                    }
          
                    if (originBlock.getName().equals(checkState.getBlock().getName())) {
          
                        return checkState.get(ChestBlock.FACING).equals(Facing) && checkState.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE;
          
                    }
          
                private static boolean isBlockAttachableChest(Block originBlock, Direction facing, BlockPos checkPos, World world) {
          
                    BlockState checkState = world.getBlockState(checkPos);
          
                    if (checkState == null) {
          
                        return false;
          
                    }
          
                    if (originBlock.getName().equals(checkState.getBlock().getName())) {
          
                        return checkState.get(ChestBlock.FACING).equals(facing) && checkState.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE;
          
                    }

Also isn't there a better way than checking the name of the block? I think there must be some other method to checking the state equals.

src/main/java/carpetextra/utils/BlockPlacer.java Outdated

                       Vec3d vec3d = context.getHitPos();
                       BlockPos pos = context.getBlockPos();
                       double hitX = vec3d.x - pos.getX();
-                      if (hitX<2) // vanilla
+                      BlockState state = block.getDefaultState();
+                      if (hitX < 2 || !(block instanceof AbstractRailBlock) && !HasDirectionProperty(state)) // vanilla

Collaborator

altrisi Sep 11, 2021 •

edited

Loading

Here this could be something like

DirectionProperty directionProperty = getFirstDirectionProperty(state);
if (... && directionProperty != null)

and then keep the directionProperty for use later.

src/main/java/carpetextra/utils/BlockPlacer.java Outdated

Comment on lines 95 to 96

		int FacingId = code % 16;
		facing = Direction.byId(FacingId);

Collaborator

altrisi Sep 11, 2021

Suggested change

      
                        int FacingId = code % 16;
          
                        facing = Direction.byId(FacingId);
          
                        int facingId = code % 16;
          
                        facing = Direction.byId(facingId);

src/main/java/carpetextra/utils/BlockPlacer.java Outdated

Comment on lines 131 to 163

+                          if (facing == Direction.SOUTH) {
+                              if (IsBlockAttachableChest(block, facing, pos.west(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.LEFT);
+                              }
+                              if (IsBlockAttachableChest(block, facing, pos.east(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.RIGHT);
+                              }
+                          } else if (facing == Direction.WEST)  //-z +z
+                          {
+                              if (IsBlockAttachableChest(block, facing, pos.north(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.LEFT);
+                              }
+                              if (IsBlockAttachableChest(block, facing, pos.south(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.RIGHT);
+                              }
+                          } else if (facing == Direction.NORTH) //+x -x
+                          {
+                              if (IsBlockAttachableChest(block, facing, pos.east(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.LEFT);
+                              }
+                              if (IsBlockAttachableChest(block, facing, pos.west(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.RIGHT);
+                              }
+                          } else if (facing == Direction.EAST) //+z -z
+                          {
+                              if (IsBlockAttachableChest(block, facing, pos.south(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.LEFT);
+                              }
+                              if (IsBlockAttachableChest(block, facing, pos.north(), world)) {
+                                  return state.with(ChestBlock.CHEST_TYPE, ChestType.RIGHT);
+                              }
+                          }
+                          return state.with(ChestBlock.CHEST_TYPE, ChestType.SINGLE);

Collaborator

altrisi Sep 11, 2021

Is this the only way of doing this?

Author

aria1th Sep 11, 2021

I guess it can use .Direction.rotateYClockwise() and rotateYCounterclockwise() instead of repeated facing checks, I'll try it


          code optimization

021cea7

senseiwells commented Sep 18, 2021

Should probably fix this

Author

aria1th commented Sep 22, 2021

I'll work on that


          Fix bed bug

5ddd5b0

Author

aria1th commented Sep 22, 2021 •

edited

Loading

Fixed bed bug, will not rotate when its impossible to place. but I found new bug related to this,yes, doors. will fix it soon.


          Fix bed and door block (offset)

8180a63

Author

aria1th commented Sep 22, 2021

Fixed bed and door block bug.

aria1th added 3 commits

January 13, 2022 23:33


          Merge branch 'gnembon:1.17' into 1.17

3e7f511


          update gradle

7f7d98b


          update

b930c95

altrisi reviewed

View reviewed changes

gradle.properties

Comment on lines +25 to +33

    
              	#release-curse-versions = 1.16.4,1.16.5

              	# Whether or not to build another branch on release

              	release-extra-branch = true

              	#release-extra-branch = true

              	# The name of the second branch to release

              	release-extra-branch-name = 1.17

              	#release-extra-branch-name = 1.17

              	# The "name" or id of the Curseforge version for the secondary branch

              	# This is needed because CF uses too vague names for snapshots

              	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]

              	release-extra-curse-version = 1.17.1

              	#release-extra-curse-version = 1.17.1

Collaborator

altrisi Mar 13, 2022

Why comment those?

aria1th added a commit to aria1th/carpet-extra that referenced this pull request


          Allow Double Chest placement via protocol

22056fc

Closes gnembon#241 gnembon#228 
extends gnembon#251

aria1th mentioned this pull request

Allow Double Chest placement via protocol #267

Open

Collaborator

altrisi commented Jul 27, 2022

Closing in favour of #267.

altrisi closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet