Skip to content
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.

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

Deco block #3511

Merged
merged 21 commits into from
Mar 24, 2019
Merged

Deco block #3511

merged 21 commits into from
Mar 24, 2019

Conversation

Raycoms
Copy link
Contributor

@Raycoms Raycoms commented Mar 24, 2019

Closes #332
Closes #3508
Closes #3507

Changes proposed in this pull request:

  • Adds a decoration block which allows to connect a decoration with a block to upgrade/repair it.
  • Fixes rotation and mirror of tile entities (includes it)
  • Fixes issues with entity placement
  • Fixes issues where the blockhut would not rotate accordingly on placement

Review please

@@ -239,6 +240,7 @@ public static AbstractBuilding create(final Colony colony, @NotNull final TileEn

if (building != null && parent.getWorld() != null && !(building instanceof PostBox))
{
building.setRotation(BlockUtils.getRotationFromFacing(parent.getWorld().getBlockState(parent.getPosition()).getValue(AbstractBlockHut.FACING)));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This here is the default rotation, for when placed by hand, the real rotation is set later then, if existent

Copy link
Member

@Nightenom Nightenom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for me, I just have some questions and notes:

  1. why does the window have no view?
  2. maybe some background image for the gui
  3. can you do schematics in standalone prs (as you were doing before)?

/**
* If the player opening the GUI is an admin.
*/
private boolean admin = Minecraft.getMinecraft().player.isCreative();
Copy link
Member

@Nightenom Nightenom Mar 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe a better variable name?
since admin does not equal to creative imho

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true

@Raycoms
Copy link
Contributor Author

Raycoms commented Mar 24, 2019

why does the window have no view?

  • it doesn't need, we can sync the tileEntity to client/server side easily.
    maybe some background image for the gui - I think it fits well considering it's the same style as the other structurize guis
    can you do schematics in standalone prs (as you were doing before)? - that wasn't on purpose

marchermans
marchermans previously approved these changes Mar 24, 2019
@Raycoms Raycoms merged commit 8a70e67 into version/1.12 Mar 24, 2019
@Raycoms Raycoms deleted the deco-block branch March 24, 2019 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants