Skip to content

Commit 8662465

Browse files
Version 1.3.5.13
1 parent 3c1a2e8 commit 8662465

File tree

94 files changed

+1235
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1235
-560
lines changed

LICENSE

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
Essential Mod TM
2-
Source Available License Agreement
3-
Last Updated: 22nd January 2025
1+
Essential Mod TM
2+
Source Available License Agreement
3+
Last Updated: 22nd January 2025
44

55
This license has been updated on 22nd January 2025 to allow
66
unmodified forks of the repository.
77

8+
* * *
9+
810
In the interest of transparency, ModCore Inc., doing business as
911
Essential (“Essential”), is making available the code of its
1012
Essential Mod TM modification to the Minecraft® game
@@ -48,3 +50,5 @@ that any distributed version of Essential Mod TM does not match
4850
the official version of Essential Mod TM as produced by this
4951
repository so that we can resolve any discrepancies and ensure
5052
community trust in Essential’s products and services.
53+
54+
[End of Agreement]

api/api/api.api

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ public class gg/essential/api/gui/EssentialGUI : gg/essential/elementa/WindowScr
299299
public fun <init> (Ljava/lang/String;IZ)V
300300
public synthetic fun <init> (Ljava/lang/String;IZILkotlin/jvm/internal/DefaultConstructorMarker;)V
301301
public final fun getBackButtonVisible ()Z
302+
protected final fun getContainer ()Lgg/essential/elementa/components/UIContainer;
302303
public final fun getContent ()Lgg/essential/elementa/components/UIContainer;
303304
public final fun getDiscordActivityDescription ()Ljava/lang/String;
304305
public final fun getRightDivider ()Lgg/essential/elementa/components/UIBlock;
@@ -423,13 +424,13 @@ public abstract interface class gg/essential/api/utils/GuiUtil {
423424
public abstract fun openScreen (Lnet/minecraft/client/gui/screens/Screen;)V
424425
@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
425426
public abstract fun openedScreen ()Lnet/minecraft/client/gui/screens/Screen;
426-
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
427+
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
427428
public static fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
428-
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
429+
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
429430
public static fun open (Lnet/minecraft/client/gui/screen/Screen;)V
430-
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
431+
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
431432
public abstract fun openScreen (Lnet/minecraft/client/gui/screen/Screen;)V
432-
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
433+
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
433434
public abstract fun openedScreen ()Lnet/minecraft/client/gui/screen/Screen;
434435
@1.12.2-forge,1.8.9-forge
435436
public static fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -446,9 +447,9 @@ public final class gg/essential/api/utils/GuiUtil$Companion {
446447
public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screens/Screen;
447448
@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
448449
public final fun open (Lnet/minecraft/client/gui/screens/Screen;)V
449-
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
450+
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
450451
public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
451-
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
452+
@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
452453
public final fun open (Lnet/minecraft/client/gui/screen/Screen;)V
453454
@1.12.2-forge,1.8.9-forge
454455
public final fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -512,15 +513,15 @@ public final class gg/essential/api/utils/KotlinAdapter : net/minecraftforge/fml
512513
public abstract interface class gg/essential/api/utils/MinecraftUtils {
513514
@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
514515
public abstract fun getResourceImage (Lnet/minecraft/resources/ResourceLocation;)Ljava/awt/image/BufferedImage;
515-
@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
516+
@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
516517
public abstract fun getResourceImage (Lnet/minecraft/util/Identifier;)Ljava/awt/image/BufferedImage;
517518
@1.12.2-forge,1.16.2-forge,1.8.9-forge
518519
public abstract fun getResourceImage (Lnet/minecraft/util/ResourceLocation;)Ljava/awt/image/BufferedImage;
519520
public abstract fun isDevelopment ()Z
520521
public abstract fun isHypixel ()Z
521522
public abstract fun sendChatMessageAndFormat (Ljava/lang/String;)V
522523
public abstract fun sendChatMessageAndFormat (Ljava/lang/String;[Ljava/lang/Object;)V
523-
@1.12.2-forge,1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.2-fabric,1.18.2-forge,1.19-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21-fabric,1.21.3-fabric,1.21.4-fabric,1.8.9-forge
524+
@1.12.2-forge,1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.2-fabric,1.18.2-forge,1.19-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.8.9-forge
524525
public abstract fun sendMessage (Lgg/essential/universal/wrappers/message/UTextComponent;)V
525526
public abstract fun sendMessage (Ljava/lang/String;)V
526527
public abstract fun sendMessage (Ljava/lang/String;Ljava/lang/String;)V

api/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ dependencies {
5757

5858
// Core Gui Libraries
5959
val ucMcVersion = when (platform.mcVersion) {
60+
12101 -> "1.21"
6061
11802 -> "1.18.1"
6162
else -> mcVersionStr
6263
}

api/src/main/kotlin/gg/essential/api/gui/EssentialGUI.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ open class EssentialGUI(
9898
height = 75.percent
9999
} childOf window
100100

101-
private val container by UIContainer().constrain {
101+
protected val container by UIContainer().constrain {
102102
x = CenterConstraint()
103103
y = CenterConstraint()
104104
width = 85.percent.coerceAtMost(100.percent - basicWidthConstraint { backContainer.getWidth() * 2 }).coerceAtLeast(0.pixels)

api/src/main/kotlin/gg/essential/api/gui/essentialComponentFactory.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import gg.essential.api.EssentialAPI
1616
import gg.essential.api.profile.WrappedGameProfile
1717
import gg.essential.api.profile.wrapped
1818
import gg.essential.elementa.UIComponent
19+
import gg.essential.elementa.components.inspector.Inspector
1920
import gg.essential.elementa.state.BasicState
2021
import gg.essential.elementa.state.State
2122
import org.jetbrains.annotations.ApiStatus
@@ -193,3 +194,11 @@ inline fun EssentialComponentFactory.buildConfirmationModal(block: ConfirmationM
193194
inline fun EssentialComponentFactory.buildIconButton(block: IconButtonBuilder.() -> Unit): UIComponent =
194195
IconButtonBuilder().apply(block).build(this)
195196

197+
@Suppress("unused")
198+
private val init = run {
199+
Inspector.registerComponentFactory(null)
200+
Inspector.registerComponentFactory(EssentialComponentFactory::class.java)
201+
Inspector.registerComponentFactory(EmulatedPlayerBuilder::class.java)
202+
Inspector.registerComponentFactory(IconButtonBuilder::class.java)
203+
Inspector.registerComponentFactory(ConfirmationModalBuilder::class.java)
204+
}

build-logic/src/main/kotlin/essential/preprocessor.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fun Project.configurePreprocessTree(versions: File) {
2323
val fabric12105 = createNode("1.21.5-fabric", 12105, "yarn")
2424
val fabric12104 = createNode("1.21.4-fabric", 12104, "yarn")
2525
val fabric12103 = createNode("1.21.3-fabric", 12103, "yarn")
26-
val fabric12100 = createNode("1.21-fabric", 12100, "yarn")
26+
val fabric12101 = createNode("1.21.1-fabric", 12101, "yarn")
2727
val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn")
2828
val forge12004 = createNode("1.20.4-forge", 12004, "srg")
2929
val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn")
@@ -51,8 +51,8 @@ fun Project.configurePreprocessTree(versions: File) {
5151

5252
fabric12105.link(fabric12104)
5353
fabric12104.link(fabric12103, versions.resolve("1.21.4-1.21.3.txt"))
54-
fabric12103.link(fabric12100)
55-
fabric12100.link(fabric12006)
54+
fabric12103.link(fabric12101)
55+
fabric12101.link(fabric12006)
5656
fabric12006.link(fabric12004)
5757
forge12004.link(fabric12004)
5858
fabric12004.link(fabric12002, versions.resolve("1.20.4-1.20.2.txt"))

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ dependencies {
121121
if (platform.isFabric && platform.mcVersion >= 12006) {
122122
val fapiVersion = when (platform.mcVersion) {
123123
12006 -> "0.97.8+1.20.6"
124-
12100 -> "0.99.2+1.21"
124+
12101 -> "0.99.2+1.21"
125125
12103 -> "0.106.0+1.21.2"
126126
12104 -> "0.110.0+1.21.4"
127127
12105 -> "0.119.0+1.21.5"

changelog/release-1.3.5.13.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Title: Bug Patch
2+
Summary: Minor bug fixes
3+
4+
## Bug Fixes
5+
- Fixed particles being emitted incorrectly from emotes when in first-person
6+
- Fixed unprompted "Error obtaining coin bundles" notifications
7+
8+
## Compatibility
9+
- Fixed crash caused by marking a server as a favorite in the Discover tab with CherishedWorlds

elementa/layoutdsl/src/main/kotlin/gg/essential/gui/layoutdsl/containers.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ package gg.essential.gui.layoutdsl
1515

1616
import gg.essential.elementa.UIComponent
1717
import gg.essential.elementa.components.ScrollComponent
18+
import gg.essential.elementa.components.inspector.Inspector
1819
import gg.essential.elementa.constraints.ChildBasedMaxSizeConstraint
1920
import gg.essential.elementa.constraints.ChildBasedSizeConstraint
2021
import gg.essential.elementa.dsl.boundTo
@@ -183,3 +184,8 @@ fun LayoutScope.floatingBox(
183184
}
184185
return box
185186
}
187+
188+
@Suppress("unused")
189+
private val init = run {
190+
Inspector.registerComponentFactory(null)
191+
}

elementa/layoutdsl/src/main/kotlin/gg/essential/gui/layoutdsl/lazy.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ package gg.essential.gui.layoutdsl
1313

1414
import gg.essential.elementa.components.UIContainer
1515
import gg.essential.elementa.components.Window
16+
import gg.essential.elementa.components.inspector.Inspector
1617
import gg.essential.gui.elementa.state.v2.MutableState
1718
import gg.essential.gui.elementa.state.v2.mutableStateOf
1819
import gg.essential.universal.UMatrixStack
@@ -46,3 +47,8 @@ private class LazyComponent(private val initialized: MutableState<Boolean>) : UI
4647
}
4748
}
4849
}
50+
51+
@Suppress("unused")
52+
private val init = run {
53+
Inspector.registerComponentFactory(null)
54+
}

0 commit comments

Comments
 (0)