Skip to content

Commit 4b0559a

Browse files
Version 1.3.10.4
1 parent 49a9cbb commit 4b0559a

File tree

52 files changed

+626
-204
lines changed

Some content is hidden

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

52 files changed

+626
-204
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,1.21.9-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.11-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,1.21.9-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.11-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,1.21.9-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.11-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,1.21.9-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.11-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,1.21.9-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.11-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,1.21.9-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.11-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,1.21.9-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.11-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/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 fabric12111 = createNode("1.21.11-fabric", 12111, "yarn")
2324
val fabric12109 = createNode("1.21.9-fabric", 12109, "yarn")
2425
val neoForge12107 = createNode("1.21.7-neoforge", 12107, "srg")
2526
val forge12107 = createNode("1.21.7-forge", 12107, "srg")
@@ -65,6 +66,7 @@ fun Project.configurePreprocessTree(versions: File) {
6566
val forge11202 = createNode("1.12.2-forge", 11202, "srg")
6667
val forge10809 = createNode("1.8.9-forge", 10809, "srg")
6768

69+
fabric12111.link(fabric12109, versions.resolve("1.21.11-1.21.9.txt"))
6870
fabric12109.link(fabric12107, versions.resolve("1.21.9-1.21.7.txt"))
6971
neoForge12107.link(fabric12107)
7072
forge12107.link(fabric12107)

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ dependencies {
132132
12106 -> "0.126.0+1.21.6"
133133
12107 -> "0.128.1+1.21.7"
134134
12109 -> "0.133.13+1.21.9"
135+
12111 -> "0.139.4+1.21.11"
135136
else -> error("No fabric API version configured!")
136137
}
137138
include(modImplementation(fabricApi.module("fabric-api-base", fapiVersion))!!)

changelog/release-1.3.10.4.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Title: Bug Patch
2+
Summary: Minor bug fixes
3+
4+
## New Versions
5+
- Added support for 1.21.11 Fabric
6+
7+
## Bug Fixes
8+
- Fixed Essential screens sometimes not rendering properly on Minecraft 1.17-1.20.6

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.17.2
2+
essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.17.3
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.10.3
13+
version=1.3.10.4

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 = "442"
2+
universalcraft = "446"
33
elementa = "712"
44
vigilance = "306"
55
mixinextras = "0.4.0"

gui/essential/src/main/kotlin/gg/essential/util/guiEssentialPlatform.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ interface GuiEssentialPlatform {
9393

9494
fun identifierFromTexture(texture: RenderBackend.Texture): UIdentifier
9595

96-
fun bindTexture(textureUnit: Int, identifier: UIdentifier)
97-
9896
fun getGlId(identifier: UIdentifier): Int
9997

10098
fun playSound(identifier: UIdentifier)

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ listOf(
122122
"1.21.7-forge",
123123
"1.21.7-neoforge",
124124
"1.21.9-fabric",
125+
"1.21.11-fabric",
125126
).forEach { version ->
126127
include(":$version")
127128
project(":$version").apply {

src/main/java/gg/essential/mixins/impl/client/gui/GuiDragDropEntryHandler.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,11 @@ private void doDrawDraggedEntry(UMatrixStack matrixStack, GuiDrawScreenEvent eve
326326
// entry
327327
//#if MC>=12106
328328
//$$ GuiRenderState guiRenderState = new GuiRenderState();
329-
//$$ DrawContext context = new DrawContext(MinecraftClient.getInstance(), guiRenderState);
329+
//$$ DrawContext context = new DrawContext(MinecraftClient.getInstance(), guiRenderState
330+
//#if MC>=12111
331+
//$$ , event.getMouseX(), event.getMouseY()
332+
//#endif
333+
//$$ );
330334
//#if MC>=12109
331335
//$$ int orgX = draggedEntryState.entry.getX();
332336
//$$ int orgY = draggedEntryState.entry.getY();
@@ -344,6 +348,9 @@ private void doDrawDraggedEntry(UMatrixStack matrixStack, GuiDrawScreenEvent eve
344348
//#else
345349
//$$ draggedEntryState.entry.render(context, 0, y, x, width, height, event.getMouseX(), event.getMouseY(), true, event.getPartialTicks());
346350
//#endif
351+
//#if MC>=12111
352+
//$$ context.drawDeferredElements();
353+
//#endif
347354
//$$ renderGuiRenderStateToRenderTarget(matrixStack, guiRenderState);
348355
//#elseif MC>=12000
349356
//$$ DrawContext context = event.getDrawContext().getMc();

src/main/java/gg/essential/mixins/transformers/client/MixinMinecraft.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ private void runTick(CallbackInfo ci) {
188188
//$$ // Note: This is targeted after the cancelTasks call, such that any tasks we schedule from the event
189189
//$$ // won't immediately be cancelled (which could otherwise result in the game locking up, e.g. when
190190
//$$ // scheduling a resource pack reload which will then never finish).
191-
//#if MC>=12005
191+
//#if MC>=12111
192+
//$$ @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;ZZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;cancelTasks()V", shift = At.Shift.AFTER))
193+
//#elseif MC>=12005
192194
//$$ @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;cancelTasks()V", shift = At.Shift.AFTER))
193195
//#else
194196
//$$ @Inject(method = "unloadWorld(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;dropTasks()V", shift = At.Shift.AFTER))
@@ -344,7 +346,9 @@ private long mouseScroll(long ret) {
344346
//#else
345347
private static final String LAUNCH_INTEGRATED_SERVER = "launchIntegratedServer";
346348
//#endif
347-
//#if MC>=12005
349+
//#if MC>=12111
350+
//$$ private static final String STOP_INTEGRATED_SERVER = "disconnect(Lnet/minecraft/client/gui/screen/Screen;ZZ)V";
351+
//#elseif MC>=12005
348352
//$$ private static final String STOP_INTEGRATED_SERVER = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V";
349353
//#elseif MC>=11600
350354
//$$ private static final String STOP_INTEGRATED_SERVER = "unloadWorld(Lnet/minecraft/client/gui/screen/Screen;)V";

0 commit comments

Comments
 (0)