mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 12:42:26 +00:00
* Bump pack.mcmeta formats * 1.19 biome modifiers * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable * Add docs and package-info to client extension interfaces package * Move RenderBlockOverlayEvent hooks to ForgeHooksClient * Add package-infos to client events package * Rename SoundLoadEvent to SoundEngineLoadEvent This reduces confusion from consumers which may think the name SoundLoadEvent refers to an individual sound being loaded rather than the sound engine. * Document and change SoundLoadEvent to fire on mod bus Previously, it fired on both the mod bus and the Forge bus, which is confusing for consumers. * Delete SoundSetupEvent Looking at its original implementation shows that there isn't an appropriate place in the new sound code to reinsert the event, and the place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. * Perform some cleanup on client events - Removed nullable annotations from ClientPlayerNetworkEvent - Renamed #getPartialTicks methods to #getPartialTick, to be consistent with vanilla's naming of the partial tick - Cleanup documentation to remove line breaks, use the spelling 'cancelled' over 'canceled', and improve docs on existing and new methods. * Remove EntityEvent.CanUpdate Closes MinecraftForge/MinecraftForge#6394 * Switch to Jetbrains nullability annotations * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent * Remove ForgeWorldPresetScreens * Remove IForgeRegistryEntry * Remove use of List<Throwable> in FML's CompletableFutures * Add docs to mod loading stages, stages, and phases * Gradle 7.4.2 * Use SLF4J in FMLLoader and other subprojects * Switch dynamic versions in subprojects to pinned ones * Switch ForgeRoot and MDK to FG plugin markers * Configure Forge javadoc task The task now uses a custom stylesheet with MCForge elements, and configured to combine the generation from the four FML subprojects (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project into the javadoc output. * Update docs/md files, for 1.19 update and the move away from IRC to Discord. * Make "Potentially dangerous alternative prefix" a debug warning, not info. Co-authored-by: Curle <[email protected]> Co-authored-by: sciwhiz12 <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
|
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
|
@@ -85,7 +_,7 @@
|
|
this.m_93228_(p_93676_, this.f_93620_, this.f_93621_, 0, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
|
|
this.m_93228_(p_93676_, this.f_93620_ + this.f_93618_ / 2, this.f_93621_, 200 - this.f_93618_ / 2, 46 + i * 20, this.f_93618_ / 2, this.f_93619_);
|
|
this.m_7906_(p_93676_, minecraft, p_93677_, p_93678_);
|
|
- int j = this.f_93623_ ? 16777215 : 10526880;
|
|
+ int j = getFGColor();
|
|
m_93215_(p_93676_, font, this.m_6035_(), this.f_93620_ + this.f_93618_ / 2, this.f_93621_ + (this.f_93619_ - 8) / 2, j | Mth.m_14167_(this.f_93625_ * 255.0F) << 24);
|
|
}
|
|
|
|
@@ -180,6 +_,10 @@
|
|
this.f_93618_ = p_93675_;
|
|
}
|
|
|
|
+ public void setHeight(int value) {
|
|
+ this.f_93619_ = value;
|
|
+ }
|
|
+
|
|
public void m_93650_(float p_93651_) {
|
|
this.f_93625_ = p_93651_;
|
|
}
|
|
@@ -202,6 +_,19 @@
|
|
|
|
protected void m_93692_(boolean p_93693_) {
|
|
this.f_93616_ = p_93693_;
|
|
+ }
|
|
+
|
|
+ public static final int UNSET_FG_COLOR = -1;
|
|
+ protected int packedFGColor = UNSET_FG_COLOR;
|
|
+ public int getFGColor() {
|
|
+ if (packedFGColor != UNSET_FG_COLOR) return packedFGColor;
|
|
+ return this.f_93623_ ? 16777215 : 10526880; // White : Light Grey
|
|
+ }
|
|
+ public void setFGColor(int color) {
|
|
+ this.packedFGColor = color;
|
|
+ }
|
|
+ public void clearFGColor() {
|
|
+ this.packedFGColor = UNSET_FG_COLOR;
|
|
}
|
|
|
|
public NarratableEntry.NarrationPriority m_142684_() {
|