-
-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/1.20.x' into 1.20.x
- Loading branch information
Showing
10 changed files
with
159 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 63 additions & 1 deletion
64
shared/src/main/java/net/blay09/mods/waystones/api/WaystoneVisibility.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,69 @@ | ||
| package net.blay09.mods.waystones.api; | ||
|
|
||
| import net.minecraft.resources.ResourceLocation; | ||
|
|
||
| public enum WaystoneVisibility { | ||
| ACTIVATION, | ||
| GLOBAL, | ||
| SHARD_ONLY | ||
| SHARD_ONLY, | ||
| SHARESTONE, | ||
| WHITE_SHARESTONE, | ||
| ORANGE_SHARESTONE, | ||
| MAGENTA_SHARESTONE, | ||
| LIGHT_BLUE_SHARESTONE, | ||
| YELLOW_SHARESTONE, | ||
| LIME_SHARESTONE, | ||
| PINK_SHARESTONE, | ||
| GRAY_SHARESTONE, | ||
| LIGHT_GRAY_SHARESTONE, | ||
| CYAN_SHARESTONE, | ||
| PURPLE_SHARESTONE, | ||
| BLUE_SHARESTONE, | ||
| BROWN_SHARESTONE, | ||
| GREEN_SHARESTONE, | ||
| RED_SHARESTONE, | ||
| BLACK_SHARESTONE; | ||
|
|
||
| public static WaystoneVisibility fromWaystoneType(ResourceLocation waystoneType) { | ||
| if (WaystoneTypes.isSharestone(waystoneType)) { | ||
| return switch (waystoneType.getPath()) { | ||
| case "white_sharestone" -> WaystoneVisibility.WHITE_SHARESTONE; | ||
| case "orange_sharestone" -> WaystoneVisibility.ORANGE_SHARESTONE; | ||
| case "magenta_sharestone" -> WaystoneVisibility.MAGENTA_SHARESTONE; | ||
| case "light_blue_sharestone" -> WaystoneVisibility.LIGHT_BLUE_SHARESTONE; | ||
| case "yellow_sharestone" -> WaystoneVisibility.YELLOW_SHARESTONE; | ||
| case "lime_sharestone" -> WaystoneVisibility.LIME_SHARESTONE; | ||
| case "pink_sharestone" -> WaystoneVisibility.PINK_SHARESTONE; | ||
| case "gray_sharestone" -> WaystoneVisibility.GRAY_SHARESTONE; | ||
| case "light_gray_sharestone" -> WaystoneVisibility.LIGHT_GRAY_SHARESTONE; | ||
| case "cyan_sharestone" -> WaystoneVisibility.CYAN_SHARESTONE; | ||
| case "purple_sharestone" -> WaystoneVisibility.PURPLE_SHARESTONE; | ||
| case "blue_sharestone" -> WaystoneVisibility.BLUE_SHARESTONE; | ||
| case "brown_sharestone" -> WaystoneVisibility.BROWN_SHARESTONE; | ||
| case "green_sharestone" -> WaystoneVisibility.GREEN_SHARESTONE; | ||
| case "red_sharestone" -> WaystoneVisibility.RED_SHARESTONE; | ||
| case "black_sharestone" -> WaystoneVisibility.BLACK_SHARESTONE; | ||
| default -> WaystoneVisibility.SHARESTONE; | ||
| }; | ||
| } else if (waystoneType.equals(WaystoneTypes.WARP_PLATE)) { | ||
| return WaystoneVisibility.SHARD_ONLY; | ||
| } else if (waystoneType.equals(WaystoneTypes.LANDING_STONE)) { | ||
| return WaystoneVisibility.SHARD_ONLY; | ||
| } else { | ||
| return WaystoneVisibility.ACTIVATION; | ||
| } | ||
| } | ||
|
|
||
| public int getIconX() { | ||
| return 176; | ||
| } | ||
|
|
||
| public int getIconY() { | ||
| return switch (this) { | ||
| case ACTIVATION -> 32; | ||
| case GLOBAL -> 50; | ||
| case SHARD_ONLY -> 68; | ||
| default -> 86; | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-1.56 KB
(89%)
shared/src/main/resources/assets/waystones/textures/gui/menu/waystone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.