Skip to content

Commit d8cdbaf

Browse files
Version 1.3.5.6
1 parent 212bff9 commit d8cdbaf

File tree

211 files changed

+1284
-4642
lines changed

Some content is hidden

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

211 files changed

+1284
-4642
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Generate checksums
2828
run: sha256sum versions/*/build/libs/* loader/{container,stage{0,1,2}}/{fabric,launchwrapper,modlauncher{8,9}}/build/libs/* | tee checksums.txt
2929

30-
- uses: actions/upload-artifact@v3
30+
- uses: actions/upload-artifact@v4
3131
with:
3232
name: checksums
3333
path: checksums.txt
@@ -75,7 +75,7 @@ jobs:
7575
fi
7676
7777
# Upload the raw jars to aid in debugging non-determinism issues if we got a checksum mismatch
78-
- uses: actions/upload-artifact@v3
78+
- uses: actions/upload-artifact@v4
7979
if: ${{ failure() && steps.verify.conclusion == 'failure' }}
8080
with:
8181
name: mod-jars

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "loader"]
22
path = loader
33
url = ../../EssentialGG/EssentialLoader.git
4+
[submodule "subprojects/pseudotcp/upstream"]
5+
path = subprojects/pseudotcp/upstream
6+
url = https://github.com/jitsi/jitsi-pseudotcp

LICENSE

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,50 @@
1+
Essential Mod TM
2+
Source Available License Agreement
3+
Last Updated: 11th November 2024
4+
5+
This license has been updated on 11th November 2024 to allow
6+
unmodified forks of the repository.
7+
18
In the interest of transparency, ModCore Inc., doing business as
2-
Essential (“Essential”), is making available the code of its
3-
Essential™ modification to the Minecraft® game (collectively with all
4-
updates thereto and versions thereof, the “Mod”) solely to enable you
5-
to view and audit compiled binaries of the Mod as distributed by
6-
Essential and third parties to verify that these distributed versions
7-
of the Mod are authentic and directly derived from Modcore’s published
8-
source code for the Mod without modification or tampering. This
9-
permission does not constitute any license or transfer of rights in
10-
and to the Mod or its underlying code, and you may not copy,
11-
reproduce, modify, sell, license, distribute, commercialize, or
12-
otherwise exploit, or create derivative works based upon, the Mod or
13-
its underlying code, all of which is reserved by Essential.
9+
Essential (“Essential”), is making available the code of its
10+
Essential Mod TM modification to the Minecraft® game
11+
(collectively with all updates there to and versions there of, the
12+
“Mod”) solely to enable you to view, copy or fork
13+
(without modification), and audit compiled binaries of the Mod as
14+
distributed by Essential and third parties solely to verify that
15+
these distributed versions of the Mod are authentic and
16+
directly derived from Essential’s published source code for the
17+
Mod without modification or tampering. This permission does not
18+
constitute any license or transfer of rights in and to the Mod
19+
or its underlying code, and you may not copy or fork (except as
20+
permitted herein), reproduce, modify, sell, license, distribute,
21+
commercialize, or otherwise exploit, or create derivative works
22+
based upon, the Mod or its underlying code, all of which
23+
is reserved by Essential. Essential reserves the right to revoke
24+
this permission at any time, for any reason (including, without
25+
limitation, in the event of its violation), though any failure
26+
or delay by Essential in exercising any of its rights or
27+
remedies, in whole or in part, under applicable law or this
28+
permission in any instance will not be deemed to be a waiver of
29+
those rights or remedies in that instance or any
30+
other instance.
1431

15-
THE MOD IS PROVIDED TO YOU “AS IS” AND WITHOUT ANY WARRANTY OF ANY
16-
KIND, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, INCLUDING,
17-
WITHOUT LIMITATION, ALL WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
18-
PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, OR ARISING OUT OF COURSE
19-
OF DEALING, COURSE OF PERFORMANCE, USAGE, OR TRADE PRACTICE, ALL OF
20-
WHICH ARE HEREBY EXPRESSLY DISCLAIMED TO THE MAXIMUM EXTENT PERMITTED
21-
BY LAW. ESSENTIAL MAKES NO REPRESENTATION OR WARRANTY OF ANY KIND THAT
22-
THE MOD WILL MEET YOUR REQUIREMENTS, BE COMPATIBLE OR WORK WITH ANY
23-
OTHER SOFTWARE, SYSTEMS, OR SERVICES, OPERATE WITHOUT INTERRUPTION,
24-
MEET ANY PERFORMANCE OR RELIABILITY STANDARDS, OR BE ERROR-FREE, OR
25-
THAT ANY ERRORS OR DEFECTS CAN OR WILL BE CORRECTED.
32+
THE MOD IS PROVIDED TO YOU “AS IS” AND WITHOUT ANY
33+
WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED, STATUTORY, OR
34+
OTHERWISE, INCLUDING, WITHOUT LIMITATION, ALL WARRANTIES OF
35+
MERCHANT ABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE,
36+
NON-INFRINGEMENT, OR ARISING OUT OF COURSE OF DEALING, COURSE OF
37+
PERFORMANCE, USAGE, OR TRADE PRACTICE, ALL OF WHICH ARE
38+
HEREBY EXPRESSLY DISCLAIMED TO THE MAXIMUM EXTENT PERMITTED BY
39+
LAW. ESSENTIAL MAKES NO REPRESENTATION OR WARRANTY OF ANY KIND
40+
THAT THE MOD WILL MEET YOUR REQUIREMENTS, BE COMPATIBLE OR WORK
41+
WITH ANY OTHER SOFTWARE, SYSTEMS, OR SERVICES, OPERATE WITHOUT
42+
INTERRUPTION, MEET ANY PERFORMANCE OR RELIABILITY STANDARDS, OR
43+
BE ERROR-FREE, OR THAT ANY ERRORS OR DEFECTS CAN OR WILL BE
44+
CORRECTED.
2645

27-
Please email us at contact@essential.gg if you believe that any
28-
distributed version of Essentialdoes not match the official version
29-
of Essentialas produced by this repository so that we can resolve
30-
any discrepancies and ensure community trust in Essential’s products
31-
and services.
46+
Please email us at legal@essential.gg if you believe
47+
that any distributed version of Essential Mod TM does not match
48+
the official version of Essential Mod TM as produced by this
49+
repository so that we can resolve any discrepancies and ensure
50+
community trust in Essential’s products and services.

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,16 @@ Essential Mod's source code.
178178

179179
**What you CAN do**
180180

181-
- Audit the source code
182-
- Compile the source code to confirm the authenticity of the official releases
181+
- Audit the source code.
182+
- Compile the source code to confirm the authenticity of the official releases.
183+
- Create unmodified forks of the repository.
183184

184185
**What you CANNOT do**
185186

186-
- Utilize any code or assets, including for personal use
187-
- Incorporate the source code in any other projects or use our code as a reference in new projects
188-
- Modify or alter the source code provided here
189-
- Distribute compiled versions of the source code or modified source code
187+
- Utilize any code or assets, including for personal use.
188+
- Incorporate the source code in any other projects or use our code as a reference in new projects.
189+
- Modify or alter the source code provided here.
190+
- Distribute compiled versions of the source code or modified source code.
190191

191192
This summary is not an exhaustive interpretation of the license; for a comprehensive understanding, please refer to [the
192193
full license file](https://github.com/EssentialGG/Essential/blob/main/LICENSE).

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
implementation("org.ow2.asm:asm-commons:9.3")
3737
implementation ("com.google.guava:guava:30.1.1-jre")
3838

39-
implementation("gg.essential:essential-gradle-toolkit:0.6.4")
39+
implementation("gg.essential:essential-gradle-toolkit:0.6.5")
4040
}
4141

4242
gradlePlugin {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ fun Project.universalLibs() {
6666
compileOnly("com.google.guava:guava:17.0")
6767
compileOnly("commons-codec:commons-codec:1.9")
6868
compileOnly("org.apache.httpcomponents:httpclient:4.3.3") // TODO ideally switch to one of the libs we bundle
69+
compileOnly("io.netty:netty-all:4.0.23.Final")
6970
// These versions are configured in gradle/libs.versions.toml
7071
compileOnly("gg.essential:universalcraft-1.8.9-forge:${getVersion("universalcraft")}") {
7172
attributes { attribute(universalAttr, true) }

build.gradle.kts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,14 @@ dependencies {
7070
}
7171
}
7272

73-
implementation(bundle("org.jitsi:ice4j:3.0-52-ga9ba80e") {
74-
exclude(module = "kotlin-osgi-bundle")
75-
exclude(module = "guava") // we use the one which comes with Minecraft (assuming that it is not too old)
76-
exclude(module = "java-sdp-nist-bridge") // sdp is unnecessarily high-level for our use case
77-
exclude(module = "jna") // comes with jitsi-utils but is not needed
78-
})
79-
// upgrade because the old one pulled in by ice4j got compiled by ancient kotlin and fails to remap
80-
implementation(bundle("org.jitsi:jitsi-metaconfig:1.0-9-g5e1b624")!!)
81-
8273
// Some of our dependencies rely on slf4j but that's not included in MC prior to 1.17, so we'll manually bundle a
8374
// log4j adapter for those versions
8475
// We also bundle it for version 1.17-1.19.2 because those ship slf4j 1.x and only 1.19.3+ starts shipping 2.x
8576
if (platform.mcVersion < 11903) {
8677
implementation(bundle(project(":slf4j-to-log4j"))!!)
8778
}
8879
implementation(bundle(project(":quic-connector"))!!)
80+
implementation(bundle(project(":pseudotcp"))!!)
8981

9082
implementation(bundle(project(":clipboard"))!!)
9183
implementation(bundle(project(":utils"))!!)
@@ -205,12 +197,8 @@ tasks.relocatedJar {
205197
relocate("okhttp3", "gg.essential.lib.okhttp3")
206198
relocate("okio", "gg.essential.lib.okio")
207199

208-
// ice4j
200+
// pseudotcp
209201
relocate("org.ice4j", "gg.essential.lib.ice4j")
210-
relocate("org.jitsi", "gg.essential.lib.jitsi")
211-
relocate("com.typesafe.config", "gg.essential.lib.typesafeconfig")
212-
relocate("org.json.simple", "gg.essential.lib.jsonsimple")
213-
relocate("org.bitlet.weupnp", "gg.essential.lib.weupnp")
214202

215203
// connection-manager
216204
relocate("org.java_websocket", "gg.essential.lib.websocket")

changelog/release-1.3.5.6.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Title: Bug Patch
2+
Summary: Minor bug fixes
3+
4+
## Social Menu
5+
- Added name of the world to friends' activity when they're hosting a world you can join
6+
- Improved game activity setting and modal text to better reflect its actual behavior
7+
8+
## Wardrobe
9+
- Improved NEW tags to disappear after you have (pre)viewed the cosmetic
10+
11+
## Bug Fixes
12+
- Fixed capes and elytras not animating with emotes
13+
- Fixed crashes/errors when rendering capes (on 1.21.1 and below) and elytras with "Show Emotes" setting disabled
14+
- Fixed Essential main menu buttons appearing blurry with "Use vanilla button texture" on 1.21.4
15+
- Fixed crash when loading Essential with RandomPatches mod

elementa/layoutdsl/src/main/kotlin/gg/essential/gui/common/constraints/SpacedCramSiblingConstraint.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ class SpacedCramSiblingConstraint(
7373

7474
if (sibling.getRight() + component.getWidth() + minSeparationPixels <= component.parent.getRight() + floatErrorMargin) {
7575
return sibling.getTop()
76-
} else if (sibling.javaClass != component.javaClass) {
77-
// FIXME This workaround is broken and should never have been added in the first place. Instead of mixing
78-
// different components with SpacedCramSiblingConstraints, just put a wrapper component around the
79-
// grid.
80-
// Should be removed once the old CosmeticStudio is dead.
81-
// If the previous item not a cosmetic option, position right after it so vertical padding
82-
// can be made consistent. Otherwise, `itemSep` can vary and lead to inconsistent padding.
83-
return sibling.getBottom()
8476
}
8577
val verticalSep = verticalSeparation?.getWidth(component.parent)
8678
?: itemSep.coerceAtLeast(minSeparationPixels.toFloat())

features.properties

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

0 commit comments

Comments
 (0)