diff --git a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java index 7ac0a24..48836e0 100644 --- a/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java @@ -261,7 +261,7 @@ public class BlockHelper { if (state.getBlock() instanceof BaseRailBlock) { placeRailWithoutUpdate(world, state, target); } else { - world.setBlock(target, state, 18); + world.setBlock(target, state, 2); //Changed flag from 18 to 3 } if (data != null) { diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java index 3b10d16..960bf98 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java @@ -15,11 +15,9 @@ import net.minecraft.core.Direction; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.util.RandomSource; -import nl.requios.effortlessbuilding.AllIcons; import nl.requios.effortlessbuilding.ClientEvents; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.EffortlessBuildingClient; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java index fd956e0..df8f035 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/BaseModifierEntry.java @@ -105,6 +105,9 @@ public abstract class BaseModifierEntry extends Modifier nameLabel.x = left + 18; nameLabel.y = top + 4; nameLabel.render(ms, mouseX, mouseY, partialTicks); + + moveUpButton.visible = screen.canMoveUp(this); + moveDownButton.visible = screen.canMoveDown(this); moveUpButton.x = right - 31; moveUpButton.y = top + 3; @@ -126,8 +129,5 @@ public abstract class BaseModifierEntry extends Modifier enableButton.setToolTip(Components.literal("Disable this modifier")); else enableButton.setToolTip(Components.literal("Enable this modifier")); - - moveUpButton.visible = screen.canMoveUp(this); - moveDownButton.visible = screen.canMoveDown(this); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java index 077aa38..caddbb4 100644 --- a/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java +++ b/src/main/java/nl/requios/effortlessbuilding/systems/BuilderChain.java @@ -249,17 +249,7 @@ public class BuilderChain { } var blockEntry = new BlockEntry(startPos); - - //Place upside-down stairs if we aim high at block - var hitVec = lookingAt.getLocation(); - //Format hitvec to 0.x - hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z))); - if (hitVec.y > 0.5) { - blockEntry.mirrorY = true; - } - startPosForPlacing = blockEntry; - return blockEntry; } diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java index fbd3c18..cf276d2 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/BlockEntry.java @@ -45,6 +45,7 @@ public class BlockEntry { //TODO mirror and rotate relativeHitVec? var blockPlaceContext = new MyPlaceContext(world, blockPos, direction, itemStack, clickedFace, relativeHitVec); newBlockState = block.getStateForPlacement(blockPlaceContext); + applyMirrorToBlockState(); } private Direction applyMirror(Direction direction) { @@ -53,6 +54,10 @@ public class BlockEntry { if (mirrorZ && direction.getAxis() == Direction.Axis.Z) direction = direction.getOpposite(); return direction; } + + private void applyMirrorToBlockState() { + if (mirrorY) newBlockState = BlockUtilities.getVerticalMirror(newBlockState); + } public static void encode(FriendlyByteBuf buf, BlockEntry block) { buf.writeBlockPos(block.blockPos); diff --git a/src/main/java/nl/requios/effortlessbuilding/utilities/MyPlaceContext.java b/src/main/java/nl/requios/effortlessbuilding/utilities/MyPlaceContext.java index dd3156a..fe148c8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/utilities/MyPlaceContext.java +++ b/src/main/java/nl/requios/effortlessbuilding/utilities/MyPlaceContext.java @@ -24,14 +24,6 @@ public class MyPlaceContext extends BlockPlaceContext { return this.getHitResult().getBlockPos(); } - public boolean canPlace() { - return this.getLevel().getBlockState(this.getHitResult().getBlockPos()).canBeReplaced(this); - } - - public boolean replacingClickedOnBlock() { - return this.canPlace(); - } - public Direction getNearestLookingDirection() { return Direction.DOWN; } diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/circle.png b/src/main/resources/assets/effortlessbuilding/textures/icons/circle.png deleted file mode 100644 index 66d5a04..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/circle.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/circle_start_center.png b/src/main/resources/assets/effortlessbuilding/textures/icons/circle_start_center.png deleted file mode 100644 index 6f1a623..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/circle_start_center.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/circle_start_corner.png b/src/main/resources/assets/effortlessbuilding/textures/icons/circle_start_corner.png deleted file mode 100644 index f64e3eb..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/circle_start_corner.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/cone.png b/src/main/resources/assets/effortlessbuilding/textures/icons/cone.png deleted file mode 100644 index 0444196..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/cone.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/cube.png b/src/main/resources/assets/effortlessbuilding/textures/icons/cube.png deleted file mode 100644 index 9976bd2..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/cube.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/cube_full.png b/src/main/resources/assets/effortlessbuilding/textures/icons/cube_full.png deleted file mode 100644 index c4ba566..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/cube_full.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/cube_hollow.png b/src/main/resources/assets/effortlessbuilding/textures/icons/cube_hollow.png deleted file mode 100644 index 3651e48..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/cube_hollow.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/cube_skeleton.png b/src/main/resources/assets/effortlessbuilding/textures/icons/cube_skeleton.png deleted file mode 100644 index 35f6dfb..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/cube_skeleton.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/cylinder.png b/src/main/resources/assets/effortlessbuilding/textures/icons/cylinder.png deleted file mode 100644 index 4964d33..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/cylinder.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/diagonal_line.png b/src/main/resources/assets/effortlessbuilding/textures/icons/diagonal_line.png deleted file mode 100644 index 69e565e..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/diagonal_line.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/diagonal_wall.png b/src/main/resources/assets/effortlessbuilding/textures/icons/diagonal_wall.png deleted file mode 100644 index ac20e48..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/diagonal_wall.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/disabled.png b/src/main/resources/assets/effortlessbuilding/textures/icons/disabled.png deleted file mode 100644 index b8b3c9e..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/disabled.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/dome.png b/src/main/resources/assets/effortlessbuilding/textures/icons/dome.png deleted file mode 100644 index 316e5dd..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/dome.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/fast_speed.png b/src/main/resources/assets/effortlessbuilding/textures/icons/fast_speed.png deleted file mode 100644 index 1011152..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/fast_speed.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/floor.png b/src/main/resources/assets/effortlessbuilding/textures/icons/floor.png deleted file mode 100644 index bcf4a22..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/floor.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/full.png b/src/main/resources/assets/effortlessbuilding/textures/icons/full.png deleted file mode 100644 index 41d27e1..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/full.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/hollow.png b/src/main/resources/assets/effortlessbuilding/textures/icons/hollow.png deleted file mode 100644 index 7bf2725..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/hollow.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/line.png b/src/main/resources/assets/effortlessbuilding/textures/icons/line.png deleted file mode 100644 index 8109177..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/line.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/long_edge.png b/src/main/resources/assets/effortlessbuilding/textures/icons/long_edge.png deleted file mode 100644 index 45a5185..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/long_edge.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/normal_speed.png b/src/main/resources/assets/effortlessbuilding/textures/icons/normal_speed.png deleted file mode 100644 index b7f1ae4..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/normal_speed.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/open_modifier_settings.png b/src/main/resources/assets/effortlessbuilding/textures/icons/open_modifier_settings.png deleted file mode 100644 index 2bdf91e..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/open_modifier_settings.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/open_player_settings.png b/src/main/resources/assets/effortlessbuilding/textures/icons/open_player_settings.png deleted file mode 100644 index 2bdf91e..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/open_player_settings.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/pyramid.png b/src/main/resources/assets/effortlessbuilding/textures/icons/pyramid.png deleted file mode 100644 index 4c3d72f..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/pyramid.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/redo.png b/src/main/resources/assets/effortlessbuilding/textures/icons/redo.png deleted file mode 100644 index e83074a..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/redo.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/replace.png b/src/main/resources/assets/effortlessbuilding/textures/icons/replace.png deleted file mode 100644 index 22913ed..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/replace.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/short_edge.png b/src/main/resources/assets/effortlessbuilding/textures/icons/short_edge.png deleted file mode 100644 index cc1b6ae..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/short_edge.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/single.png b/src/main/resources/assets/effortlessbuilding/textures/icons/single.png deleted file mode 100644 index 2d846ea..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/single.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/slope_floor.png b/src/main/resources/assets/effortlessbuilding/textures/icons/slope_floor.png deleted file mode 100644 index c786eaf..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/slope_floor.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/sphere.png b/src/main/resources/assets/effortlessbuilding/textures/icons/sphere.png deleted file mode 100644 index 73a804a..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/sphere.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_1.png b/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_1.png deleted file mode 100644 index 7268df3..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_1.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_3.png b/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_3.png deleted file mode 100644 index 63ece94..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_3.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_5.png b/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_5.png deleted file mode 100644 index b2efdbc..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/thickness_5.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/undo.png b/src/main/resources/assets/effortlessbuilding/textures/icons/undo.png deleted file mode 100644 index b8dec76..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/undo.png and /dev/null differ diff --git a/src/main/resources/assets/effortlessbuilding/textures/icons/wall.png b/src/main/resources/assets/effortlessbuilding/textures/icons/wall.png deleted file mode 100644 index e40ab14..0000000 Binary files a/src/main/resources/assets/effortlessbuilding/textures/icons/wall.png and /dev/null differ