Skip to content

Commit 6f0b999

Browse files
committed
Fixed the Geometry bone infinite loop
1 parent 0da6603 commit 6f0b999

3 files changed

Lines changed: 36 additions & 39 deletions

File tree

.idea/workspace.xml

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

geyser/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ plugins {
33
id("com.gradleup.shadow") version "9.2.2"
44
}
55

6-
group = "me.zimzaza4"
7-
version = "1.0.2"
6+
group = "re.imc"
7+
version = "1.0.3"
88

99
repositories {
1010
mavenCentral()
@@ -27,7 +27,7 @@ dependencies {
2727
tasks.shadowJar {
2828
archiveFileName.set("${rootProject.name}Extension-${version}.jar")
2929

30-
relocate("org.spongepowered.configurate", "me.zimzaza4.geysermodelengineextension.libs.configurate")
30+
relocate("org.spongepowered.configurate", "re.imc.geysermodelengineextension.libs.configurate")
3131
}
3232

3333
tasks.build {

geyser/src/main/java/re/imc/geysermodelengineextension/managers/resourcepack/generator/Geometry.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@ public JsonObject getInternal() {
3939
public void modify() {
4040
JsonArray array = getInternal().get("bones").getAsJsonArray();
4141
Iterator<JsonElement> iterator = array.iterator();
42-
while (iterator.hasNext()) {
42+
while(iterator.hasNext()) {
4343
JsonElement element = iterator.next();
4444
if (element.isJsonObject()) {
4545
String name = element.getAsJsonObject().get("name").getAsString().toLowerCase(Locale.ROOT);
46-
4746
String parent = element.getAsJsonObject().has("parent") ? element.getAsJsonObject().get("parent").getAsString().toLowerCase() : null;
4847
element.getAsJsonObject().remove("name");
4948
element.getAsJsonObject().addProperty("name", name);
@@ -65,17 +64,15 @@ public void modify() {
6564
}
6665
}
6766
}
67+
6868
setId("geometry.meg_" + modelId);
6969
}
7070

71-
public void addAllChildren(BoneData p, BoneData c) {
72-
if (GeyserModelEngineExtension.getExtension().getConfigManager().getConfig().getBoolean("options.debug.geometry-bones")) GeyserModelEngineExtension.getExtension().logger().info(modelId + " " + p.getName());
73-
74-
p.getAllChildren().add(c);
71+
private void addAllChildren(BoneData p, BoneData c) {
72+
if (GeyserModelEngineExtension.getExtension().getConfigManager().getConfig().getBoolean("options.debug.geometry-bones")) GeyserModelEngineExtension.getExtension().logger().info("Model ID: " + modelId + " " + p.getName());
73+
if (!p.getAllChildren().add(c)) return;
7574
BoneData parent = bones.get(p.getParent());
76-
if (parent != null) {
77-
addAllChildren(parent, c);
78-
}
75+
if (parent != null && parent != p) addAllChildren(parent, c);
7976
}
8077

8178
public void setModelId(String modelId) {

0 commit comments

Comments
 (0)