diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2024-08-15 22:44:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 21:44:13 +0000 |
| commit | 5decfda1dd1b3bbfdb1098f409aa50162ea32dc2 (patch) | |
| tree | fd3dd1c237a0c8c4d4953dd7e529f5b5d89e6e34 /src/main/java/gregtech/api/enums | |
| parent | 799d5edf98e7e9f6152f432cdc48eac858398c8a (diff) | |
| download | GT5-Unofficial-5decfda1dd1b3bbfdb1098f409aa50162ea32dc2.tar.gz GT5-Unofficial-5decfda1dd1b3bbfdb1098f409aa50162ea32dc2.tar.bz2 GT5-Unofficial-5decfda1dd1b3bbfdb1098f409aa50162ea32dc2.zip | |
Electric jukebox (#2827)
* GT music system
* Minor fix for some glitches when switching dimensions with P2Ps on both sides
* Most features implemented except headphones
* Implement wireless headphones
* Disable debug mode
* Spotless
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
4 files changed, 22 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index a27c5ee43b..a7fde53b66 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -677,6 +677,11 @@ public class GT_Values { + "Gold"; public static final String AuthorVolence = "Author: " + EnumChatFormatting.AQUA + "Volence"; + public static final String AuthorEigenRaven = "Author: " + EnumChatFormatting.DARK_PURPLE + + "Eigen" + + EnumChatFormatting.BOLD + + "Raven"; + public static final String AuthorNotAPenguin = "Author: " + EnumChatFormatting.WHITE + EnumChatFormatting.BOLD + "Not" diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 77fc88bd30..6533aca304 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2518,7 +2518,15 @@ public enum ItemList implements IItemContainer { Automation_ChestBuffer_UEV, Automation_ChestBuffer_UIV, Automation_ChestBuffer_UMV, - Automation_ChestBuffer_UXV,; + Automation_ChestBuffer_UXV, + BetterJukebox_LV, + BetterJukebox_MV, + BetterJukebox_HV, + BetterJukebox_EV, + BetterJukebox_IV, + WirelessHeadphones, + // semicolon after the comment to reduce merge conflicts + ; public static final ItemList[] DYE_ONLY_ITEMS = { Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 6772f4dc12..464a8b2710 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -1301,6 +1301,11 @@ public enum MetaTileEntityIDs { lsc(13106), tfftHatch(13109), WORMHOLE_GENERATOR_CONTROLLER(13115), + BETTER_JUKEBOX_LV(14301), + BETTER_JUKEBOX_MV(14302), + BETTER_JUKEBOX_HV(14303), + BETTER_JUKEBOX_EV(14304), + BETTER_JUKEBOX_IV(14305), MegaChemicalReactor(13366), MegaOilCracker(13367), ExtremeEntityCrusherController(14201), diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 049fd97361..53125ec454 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -637,6 +637,7 @@ public class Textures { OVERLAY_TOP_STEAM_FURNACE_GLOW, OVERLAY_TOP_STEAM_ALLOY_SMELTER, OVERLAY_TOP_STEAM_ALLOY_SMELTER_GLOW, + OVERLAY_TOP_JUKEBOX, OVERLAY_TOP_STEAM_MACERATOR, OVERLAY_TOP_STEAM_MACERATOR_GLOW, @@ -757,6 +758,7 @@ public class Textures { OVERLAY_SIDE_SCANNER_GLOW, OVERLAY_SIDE_INDUSTRIAL_APIARY, OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW, + OVERLAY_SIDE_JUKEBOX, OVERLAY_TOP_POTIONBREWER_ACTIVE, OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW, @@ -1895,6 +1897,7 @@ public class Textures { TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE, + WIRELESS_HEADPHONES, POCKET_MULTITOOL_CLOSED, POCKET_MULTITOOL_BRANCHCUTTER, POCKET_MULTITOOL_FILE, |