Skip to content

Allow vertical orientations with component #940

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

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Allow vertical orientations with component #940

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acdac82
Allow vertical orientations with component
Swedz Nov 25, 2024
ab2f216
Add comment noting the purpose and use of canBeVertical
Swedz Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public boolean useWrench(Player player, InteractionHand hand, Direction face) {
return true;
}
} else {
if (face.getAxis().isHorizontal()) {
if (params.canBeVertical || face.getAxis().isHorizontal()) {
facingDirection = face;
}
// We consume the event to prevent the GUI from opening.
Expand All @@ -100,7 +100,7 @@ public boolean useWrench(Player player, InteractionHand hand, Direction face) {

public void onPlaced(@Nullable LivingEntity placer, ItemStack itemStack) {
// The placer can be null using some mods' automatic placement: pick NORTH arbitrarily.
Direction dir = placer != null ? placer.getDirection() : Direction.NORTH;
Direction dir = placer != null ? (params.canBeVertical ? placer.getNearestViewDirection() : placer.getDirection()) : Direction.NORTH;
facingDirection = dir.getOpposite();
if (params.hasOutput) {
outputDirection = dir;
Expand All @@ -111,11 +111,21 @@ public static class Params {
public final boolean hasOutput;
public final boolean hasExtractItems;
public final boolean hasExtractFluids;
/**
* MI itself does not make use of this field, and it purely exists for addons. If you want to use this field, you will need to make your own
* model loader.
*/
public final boolean canBeVertical;

public Params(boolean hasOutput, boolean hasExtractItems, boolean hasExtractFluids) {
public Params(boolean hasOutput, boolean hasExtractItems, boolean hasExtractFluids, boolean canBeVertical) {
this.hasOutput = hasOutput;
this.hasExtractItems = hasExtractItems;
this.hasExtractFluids = hasExtractFluids;
this.canBeVertical = canBeVertical;
}

public Params(boolean hasOutput, boolean hasExtractItems, boolean hasExtractFluids) {
this(hasOutput, hasExtractItems, hasExtractFluids, false);
}
}

Expand Down
Loading