Skip to content

Commit 55b2788

Browse files
Version 1.3.9.2
1 parent 417b5e7 commit 55b2788

File tree

160 files changed

+2937
-474
lines changed

Some content is hidden

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

160 files changed

+2937
-474
lines changed

api/api/api.api

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -424,13 +424,13 @@ public abstract interface class gg/essential/api/utils/GuiUtil {
424424
public abstract fun openScreen (Lnet/minecraft/client/gui/screens/Screen;)V
425425
@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,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge,1.21.7-forge,1.21.7-neoforge
426426
public abstract fun openedScreen ()Lnet/minecraft/client/gui/screens/Screen;
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
428428
public static fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
430430
public static fun open (Lnet/minecraft/client/gui/screen/Screen;)V
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
432432
public abstract fun openScreen (Lnet/minecraft/client/gui/screen/Screen;)V
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
434434
public abstract fun openedScreen ()Lnet/minecraft/client/gui/screen/Screen;
435435
@1.12.2-forge,1.8.9-forge
436436
public static fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -447,9 +447,9 @@ public final class gg/essential/api/utils/GuiUtil$Companion {
447447
public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screens/Screen;
448448
@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,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge,1.21.7-forge,1.21.7-neoforge
449449
public final fun open (Lnet/minecraft/client/gui/screens/Screen;)V
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
451451
public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
453453
public final fun open (Lnet/minecraft/client/gui/screen/Screen;)V
454454
@1.12.2-forge,1.8.9-forge
455455
public final fun getOpenedScreen ()Lnet/minecraft/client/gui/GuiScreen;
@@ -513,7 +513,7 @@ public final class gg/essential/api/utils/KotlinAdapter : net/minecraftforge/fml
513513
public abstract interface class gg/essential/api/utils/MinecraftUtils {
514514
@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,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge,1.21.7-forge,1.21.7-neoforge
515515
public abstract fun getResourceImage (Lnet/minecraft/resources/ResourceLocation;)Ljava/awt/image/BufferedImage;
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,1.21.6-fabric,1.21.7-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,1.21.6-fabric,1.21.7-fabric,1.21.9-fabric
517517
public abstract fun getResourceImage (Lnet/minecraft/util/Identifier;)Ljava/awt/image/BufferedImage;
518518
@1.12.2-forge,1.16.2-forge,1.8.9-forge
519519
public abstract fun getResourceImage (Lnet/minecraft/util/ResourceLocation;)Ljava/awt/image/BufferedImage;

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
implementation ("com.google.guava:guava:30.1.1-jre")
3939

4040
implementation("gg.essential:essential-gradle-toolkit:0.6.10")
41-
implementation("gg.essential.loom:gg.essential.loom.gradle.plugin:1.7.30") // TODO remove once EGT has updated
41+
implementation("gg.essential.loom:gg.essential.loom.gradle.plugin:1.7.35") // TODO remove once EGT has updated
4242
}
4343

4444
gradlePlugin {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ fun Project.configurePreprocessTree(versions: File) {
2020
configure<RootPreprocessExtension> {
2121
strictExtraMappings.set(true)
2222

23+
val fabric12109 = createNode("1.21.9-fabric", 12109, "yarn")
2324
val neoForge12107 = createNode("1.21.7-neoforge", 12107, "srg")
2425
val forge12107 = createNode("1.21.7-forge", 12107, "srg")
2526
val fabric12107 = createNode("1.21.7-fabric", 12107, "yarn")
@@ -64,6 +65,7 @@ fun Project.configurePreprocessTree(versions: File) {
6465
val forge11202 = createNode("1.12.2-forge", 11202, "srg")
6566
val forge10809 = createNode("1.8.9-forge", 10809, "srg")
6667

68+
fabric12109.link(fabric12107, versions.resolve("1.21.9-1.21.7.txt"))
6769
neoForge12107.link(fabric12107)
6870
forge12107.link(fabric12107)
6971
fabric12107.link(fabric12106)

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ dependencies {
130130
12105 -> "0.119.0+1.21.5"
131131
12106 -> "0.126.0+1.21.6"
132132
12107 -> "0.128.1+1.21.7"
133+
12109 -> "0.133.13+1.21.9"
133134
else -> error("No fabric API version configured!")
134135
}
135136
include(modImplementation(fabricApi.module("fabric-api-base", fapiVersion))!!)

changelog/release-1.3.9.2.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Title: Bug Patch
2+
Summary: Minor bug fixes
3+
4+
## New Versions
5+
- Added support for 1.21.9 Fabric
6+
7+
## Wardrobe
8+
- Added purchase confirmation when gifting items
9+
10+
## Bug Fixes
11+
- Fixed confusing disconnect message when Mojang Authentication servers are unavailable
12+
- Fixed other player's cosmetic particles appearing in your emote preview
13+
- Fixed failed screenshot uploads locking out player inputs
14+
- Fixed transparent outer skin layers not rendering correctly in the Wardrobe on 1.8.9

features.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
always=true
2-
nameplate_improvements=true
32
server_discovery=true
43
updated_gifting_modal=true
54
updated_coins_purchase_modal=true

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
essential.defaults.loom=0
2-
essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.16.13
2+
essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.17.2
33
kotlin.stdlib.default.dependency=false
44
org.gradle.daemon=false
55
org.gradle.parallel=true
@@ -10,4 +10,4 @@ minecraftVersion=11202
1010
# TODO remove once upgrading to Loom 1.10
1111
# fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though
1212
loom.ignoreDependencyLoomVersionValidation=true
13-
version=1.3.9.1
13+
version=1.3.9.2

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
universalcraft = "427"
2+
universalcraft = "430"
33
elementa = "708"
44
vigilance = "306"
55
mixinextras = "0.4.0"

gui/elementa/src/main/kotlin/gg/essential/gui/common/extensions.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,13 @@ import kotlin.reflect.KProperty
3030

3131
import gg.essential.gui.elementa.state.v2.State as StateV2
3232

33-
fun <T : UIComponent, S> T.bindConstraints(state: State<S>, config: UIConstraints.(S) -> Unit) = apply {
34-
state.onSetValueAndNow {
35-
constraints.config(it)
36-
}
37-
}
33+
@Deprecated("Using StateV2 instead")
34+
fun <T : UIComponent, S> T.bindConstraints(state: State<S>, config: UIConstraints.(S) -> Unit) =
35+
bindConstraints(state.toV2(), config)
3836

3937
fun <T : UIComponent, S> T.bindConstraints(state: gg.essential.gui.elementa.state.v2.State<S>, config: UIConstraints.(S) -> Unit) = apply {
40-
constraints.config(state.get())
41-
state.onSetValue(this) {
42-
constraints.config(it)
38+
effect(this) {
39+
constraints.config(state())
4340
}
4441
}
4542

gui/essential/src/main/kotlin/gg/essential/config/EssentialConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,13 +436,13 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
436436

437437
selector(cosmeticArmorSettingSelfState.bimap(swapFirstTwo, swapFirstTwo)) {
438438
name = "Cosmetics & armor visibility on me"
439-
description = "Cosmetics and armor may conflict with each other on your player. This setting does not effect what other players see."
439+
description = "Cosmetics and armor may conflict with each other on your player. This setting does not affect what other players see."
440440
options = listOf("Only cosmetics", "Only armor", "Cosmetics and armor")
441441
}
442442

443443
selector(cosmeticArmorSettingOtherState.bimap(swapFirstTwo, swapFirstTwo)) {
444444
name = "Cosmetics & armor visibility on others"
445-
description = "Cosmetics and armor may conflict with each other on other players. This setting does not effect what other players see."
445+
description = "Cosmetics and armor may conflict with each other on other players. This setting does not affect what other players see."
446446
options = listOf("Only cosmetics", "Only armor", "Cosmetics and armor")
447447
}
448448

0 commit comments

Comments
 (0)