Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
844bed4
Remove old geyser logic
dima-dencep Feb 21, 2025
fc8a96e
Update gradle
dima-dencep Feb 21, 2025
c32ce1d
Base geyser ext
dima-dencep Feb 21, 2025
9f99d3f
Remove
dima-dencep Feb 22, 2025
e181e14
More work
dima-dencep Feb 22, 2025
61bc635
More work
dima-dencep Feb 22, 2025
8b2c1be
Working
dima-dencep Feb 22, 2025
bae623b
Fix config
dima-dencep Feb 22, 2025
c1451b2
Fully work bedrock2java
dima-dencep Feb 25, 2025
2b5d067
Check
dima-dencep Feb 25, 2025
e663848
Merge branch 'dev' of https://github.com/KosmX/emotes into geyser-ext
dima-dencep Jul 23, 2025
fb5effc
Rebase issues
dima-dencep Jul 23, 2025
3646c35
Update
dima-dencep Jul 23, 2025
f65c939
Run emotecraftext in dev
dima-dencep Jul 23, 2025
5ce7dd7
Fix networking
dima-dencep Jul 24, 2025
99ae7bd
Merge branch 'dev' of https://github.com/KosmX/emotes into geyser-ext
dima-dencep Aug 26, 2025
019929f
Remove custom classloader
dima-dencep Aug 26, 2025
38c3eae
Fix build
dima-dencep Aug 26, 2025
cb55b11
Remove debug code
dima-dencep Aug 26, 2025
34eaf63
Add publishing
dima-dencep Aug 26, 2025
d3c802c
Update build.gradle.kts
dima-dencep Aug 26, 2025
d7e359b
Update build.gradle.kts
dima-dencep Aug 26, 2025
9c3588e
Remove reflection
dima-dencep Aug 26, 2025
f84d5b7
Add @Override
dima-dencep Aug 26, 2025
b9feb83
Update geyser
dima-dencep Aug 26, 2025
8ab99ca
Oops
dima-dencep Aug 26, 2025
5135ae6
Remove ASM dep
dima-dencep Aug 26, 2025
b6554aa
Form and more
dima-dencep Aug 27, 2025
942e437
Remove space
dima-dencep Aug 27, 2025
ecbd208
Merge branch 'dev' of https://github.com/KosmX/emotes into geyser-ext
dima-dencep Oct 31, 2025
4764720
Update
dima-dencep Oct 31, 2025
36b7f56
Less internals
dima-dencep Oct 31, 2025
14991f7
Java2Bedrock WIP
dima-dencep Nov 1, 2025
248c8ca
Fix rotation
dima-dencep Nov 1, 2025
4949605
Update only used bones
dima-dencep Nov 1, 2025
62df432
Interpolation
dima-dencep Nov 1, 2025
808e790
Bone fixes
dima-dencep Nov 1, 2025
395d29a
Fix stopping
dima-dencep Nov 1, 2025
e25a433
Update GeyserAnimationController.java
dima-dencep Nov 2, 2025
4a20c12
Update build.gradle.kts
dima-dencep Nov 2, 2025
974c9b0
Merge branch 'dev' of https://github.com/KosmX/emotes into geyser-ext
dima-dencep Nov 2, 2025
ee6d176
Move
dima-dencep Nov 3, 2025
db7c60e
Create GeyserRun.run.xml
dima-dencep Nov 7, 2025
82d7abd
Fix patch
dima-dencep Nov 7, 2025
71fe796
Merge branch 'dev' of https://github.com/KosmX/emotes into geyser-ext
dima-dencep Nov 8, 2025
0cf9bfa
Merge branch 'dev' of https://github.com/KosmX/emotes into geyser-ext
dima-dencep Nov 8, 2025
77a028e
Publish geyser ext on modrinth
dima-dencep Nov 8, 2025
20c6a8b
dsfMerge branch 'dev' of https://github.com/kosmx/emotes into geyser-ext
dima-dencep Nov 14, 2025
6f3d720
Merge branch 'dev' of https://github.com/kosmx/emotes into geyser-ext
dima-dencep Nov 22, 2025
38f2e0e
Update geyser
dima-dencep Nov 22, 2025
d56f916
Merge branch 'dev' into geyser-ext
dima-dencep Dec 18, 2025
feb4575
Update
dima-dencep Dec 18, 2025
8d91964
avatar
dima-dencep Dec 18, 2025
f577f79
Fix network
dima-dencep Dec 18, 2025
b110800
Update GeyserRun.run.xml
dima-dencep Dec 18, 2025
f21cacf
MethodHandles
dima-dencep Dec 19, 2025
6f5d0ff
waist
dima-dencep Dec 19, 2025
37b0ebc
Fixes
dima-dencep Dec 19, 2025
7aef428
More ids
dima-dencep Dec 20, 2025
426a7af
bends
dima-dencep Dec 20, 2025
fe597b8
Fix uv
dima-dencep Dec 20, 2025
40c2cd6
Refactor executor
dima-dencep Dec 20, 2025
7fe18b9
smooth
dima-dencep Dec 20, 2025
9da9e7d
Fix lerp
dima-dencep Dec 20, 2025
b4eb6d0
Update PAL
dima-dencep Dec 20, 2025
3aa0a03
Merge branch 'dev' into geyser-ext
dima-dencep Dec 20, 2025
a22715d
Merge branch 'dev' into geyser-ext
dima-dencep Dec 22, 2025
08a53b6
Fix lerp
dima-dencep Dec 22, 2025
10a1fbd
Merge branch 'dev' into geyser-ext
dima-dencep Dec 26, 2025
9820f2e
Fix scale
dima-dencep Dec 26, 2025
ff3de7c
Disable lerp for rotate
dima-dencep Dec 26, 2025
94b13a5
Update GeyserAnimationController.java
dima-dencep Dec 27, 2025
de3ea58
Optimization
dima-dencep Dec 27, 2025
b749d02
Fix ticking
dima-dencep Dec 27, 2025
65b339b
fixes
dima-dencep Dec 27, 2025
b9c3ca4
Fix stop
dima-dencep Dec 27, 2025
8505669
Debug
dima-dencep Dec 27, 2025
c03cb8c
Fix
dima-dencep Dec 27, 2025
efb6c17
Bends
dima-dencep Dec 27, 2025
e1baaaf
Fix events
dima-dencep Dec 28, 2025
a0e2a7b
add bend fix command
dima-dencep Dec 28, 2025
d6f4b65
api.redlance.org
dima-dencep Dec 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .run/GeyserRun.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="GeyserRun" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.redlance.dima_dencep.mods.emotecraft.geyser.GeyserBootstrap" />
<module name="emotecraft.geyser.main" />
<option name="VM_PARAMETERS" value="-Djava.awt.headless=true -XX:+AllowEnhancedClassRedefinition" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/geyser/run" />
<method v="2" />
</configuration>
</component>
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import org.redlance.dima_dencep.gradle.publish2discord.utils.Emoji
import me.modmuss50.mpp.ReleaseType

plugins {
id("xyz.wagyourtail.jvmdowngrader") version("1.3.3") apply false
id("dev.architectury.loom") version "1.13.467" apply false
id("architectury-plugin") version "3.4.162" apply true
id("com.gradleup.shadow") version "9.3.0" apply false
Expand Down Expand Up @@ -36,6 +37,9 @@ allprojects {
}
}
maven("https://maven.neoforged.net/releases")
maven("https://repo.opencollab.dev/main/") {
name = "Geyser"
}
mavenLocal()
}

Expand Down Expand Up @@ -105,6 +109,7 @@ val ds = publishDiscord {
links {
from(":minecraft:neoforge", "modrinth")
from(":minecraft:fabric", "modrinth")
from(":geyser", "modrinth")

val paper = project(":paper")
from(paper, "modrinth")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.github.kosmx.emotes.common.tools;

import io.netty.buffer.ByteBuf;

import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
Expand All @@ -23,4 +25,10 @@ public static byte[] safeGetBytesFromBuffer(ByteBuffer byteBuffer) {
}
else return byteBuffer.array();
}

public static byte[] readBytes(ByteBuf buf) {
byte[] bytes = new byte[buf.readableBytes()];
buf.readBytes(bytes);
return bytes;
}
}
117 changes: 117 additions & 0 deletions geyser/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
import me.modmuss50.mpp.ReleaseType

plugins {
java
`maven-publish`
id("com.gradleup.shadow")
id("xyz.wagyourtail.jvmdowngrader")
id("me.modmuss50.mod-publish-plugin")
}

base.archivesName = "${archives_base_name}-${name}-for-MC${minecraft_version}"
version = mod_version

val compileApi = configurations.register("compileApi").get()
configurations.api.configure { extendsFrom(compileApi) }

dependencies {
compileOnly("org.geysermc.geyser:core:${properties["geyser_version"] as String}")
implementation("org.geysermc.geyser:standalone:${properties["geyser_version"] as String}")

compileApi(project(":emotesAssets"))
compileApi(project(":emotesServer")) {
exclude(group = "org.jetbrains", module = "annotations")

exclude(module = "gson")
exclude(module = "slf4j-api")
// exclude(module = "fastutil")
exclude(module = "netty-buffer")
exclude(module = "jspecify")
exclude(module = "guava")
exclude(module = "error_prone_annotations")
exclude(module = "netty-buffer")
}
}

tasks {
processResources {
inputs.property("version", version)
inputs.property("description", mod_description)

filesMatching("extension.yml") {
expand("version" to version, "description" to mod_description)
}
}

shadowJar {
configurations = listOf(compileApi)
archiveClassifier.set("shaded")
mergeServiceFiles()

relocate("team.unnamed.mocha", "com.zigythebird.playeranim.lib.mochafloats")
relocate("javassist", "com.zigythebird.playeranim.lib.javassist")
}

downgradeJar {
dependsOn(shadowJar)

downgradeTo = JavaVersion.VERSION_17
inputFile = shadowJar.get().archiveFile
archiveClassifier.set("")
}

jar {
archiveClassifier.set("dev")
}

assemble {
dependsOn(downgradeJar)
}
}

java {
withSourcesJar()
}

publishing {
publications {
register<MavenPublication>("mavenJava") {
artifactId = "emotesGeyser"
from(components["java"])
withCustomPom("emotesGeyser", "Minecraft Emotecraft Geyser extension")
}
}

repositories {
if (shouldPublishMaven) {
kosmxRepo(project)
} else {
mavenLocal()
}
}
}

publishMods {
modLoaders.add("geyser")

file.set(tasks.downgradeJar.get().archiveFile) // Java 17
// additionalFiles.from(tasks.shadowJar.get().archiveFile) // Java 21

type = ReleaseType.of(releaseType)
changelog = changes
dryRun = gradle.startParameter.isDryRun

github {
accessToken = providers.environmentVariable("GH_TOKEN")
parent(rootProject.tasks.named("publishGithub"))
}

modrinth {
announcementTitle = "Modrinth (Geyser)"
accessToken = providers.environmentVariable("MODRINTH_TOKEN")
projectId = providers.gradleProperty("modrinth_id")
minecraftVersions.addAll(release_minecraft_versions)
displayName = mod_version
version = "${mod_version}+${removePreRc(minecraft_version)}-geyser"
}
}
Loading
Loading