Added support for the part visibility (render_controller addition)

This commit is contained in:
OmeWillem
2024-07-04 02:19:40 +02:00
parent eb599cadce
commit cff7d68737
5 changed files with 94 additions and 6 deletions

View File

@@ -6,6 +6,7 @@ import org.geysermc.geyser.api.event.lifecycle.GeyserLoadResourcePacksEvent;
import org.geysermc.geyser.api.event.lifecycle.GeyserPreInitializeEvent; import org.geysermc.geyser.api.event.lifecycle.GeyserPreInitializeEvent;
import org.geysermc.geyser.api.extension.Extension; import org.geysermc.geyser.api.extension.Extension;
import re.imc.geysermodelenginepackgenerator.generator.Entity; import re.imc.geysermodelenginepackgenerator.generator.Entity;
import re.imc.geysermodelenginepackgenerator.generator.Geometry;
import re.imc.geysermodelenginepackgenerator.util.ZipUtil; import re.imc.geysermodelenginepackgenerator.util.ZipUtil;
import java.io.File; import java.io.File;
@@ -44,6 +45,13 @@ public class ExtensionMain implements Extension {
for (String entity : GeneratorMain.entityMap.keySet()) { for (String entity : GeneratorMain.entityMap.keySet()) {
String id = "modelengine:" + entity; String id = "modelengine:" + entity;
GeyserUtils.addCustomEntity(id); GeyserUtils.addCustomEntity(id);
Geometry geometry = GeneratorMain.geometryMap.get(entity);
geometry.getBones().forEach(bone -> {
GeyserUtils.addProperty(id, bone, Boolean.class);
});
GeyserUtils.registerProperties(id);
} }
} }

View File

@@ -102,6 +102,7 @@ public class GeneratorMain {
File modelsFolder = new File(output, "models/entity"); File modelsFolder = new File(output, "models/entity");
File texturesFolder = new File(output, "textures/entity"); File texturesFolder = new File(output, "textures/entity");
File animationControllersFolder = new File(output, "animation_controllers"); File animationControllersFolder = new File(output, "animation_controllers");
File renderControllersFolder = new File(output, "render_controllers");
File manifestFile = new File(output, "manifest.json"); File manifestFile = new File(output, "manifest.json");
@@ -140,6 +141,7 @@ public class GeneratorMain {
modelsFolder.mkdirs(); modelsFolder.mkdirs();
texturesFolder.mkdirs(); texturesFolder.mkdirs();
animationControllersFolder.mkdirs(); animationControllersFolder.mkdirs();
renderControllersFolder.mkdirs();
for (Map.Entry<String, Animation> entry : animationMap.entrySet()) { for (Map.Entry<String, Animation> entry : animationMap.entrySet()) {
entry.getValue().modify(); entry.getValue().modify();
@@ -190,14 +192,33 @@ public class GeneratorMain {
} }
for (Map.Entry<String, Entity> entry : entityMap.entrySet()) { for (Map.Entry<String, Entity> entry : entityMap.entrySet()) {
entry.getValue().modify(); Entity entity = entry.getValue();
Path path = entityFolder.toPath().resolve(entry.getValue().getPath() + entry.getKey() + ".entity.json"); entity.getProperties().setProperty("render_controller", "controller.render." + entry.getKey());
path.toFile().getParentFile().mkdirs(); entity.modify();
if (path.toFile().exists()) {
Path entityPath = entityFolder.toPath().resolve(entity.getPath() + entry.getKey() + ".entity.json");
entityPath.toFile().getParentFile().mkdirs();
if (entityPath.toFile().exists()) {
continue; continue;
} }
try { try {
Files.writeString(path, entry.getValue().getJson(), StandardCharsets.UTF_8); Files.writeString(entityPath, entity.getJson(), StandardCharsets.UTF_8);
} catch (IOException e) {
e.printStackTrace();
}
// render controller part
String id = entity.getModelId();
if (!geometryMap.containsKey(id)) continue;
RenderController controller = new RenderController(id, geometryMap.get(id).getBones());
Path renderPath = new File(renderControllersFolder, "controller.render." + id + ".json").toPath();
if (renderPath.toFile().exists()) {
continue;
}
try {
Files.writeString(renderPath, controller.generate(), StandardCharsets.UTF_8);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }

View File

@@ -9,7 +9,9 @@ import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
@Getter @Getter
@Setter @Setter
@@ -19,6 +21,7 @@ public class Geometry {
String modelId; String modelId;
JsonObject json; JsonObject json;
List<String> bones = new ArrayList<>();
String path; String path;
public void load(String json) { public void load(String json) {
@@ -46,7 +49,7 @@ public class Geometry {
name.startsWith("b_") || name.startsWith("b_") ||
name.startsWith("ob_")) { name.startsWith("ob_")) {
iterator.remove(); iterator.remove();
} } else bones.add(name);
} }
} }
setId("geometry.modelengine_" + modelId); setId("geometry.modelengine_" + modelId);

View File

@@ -0,0 +1,56 @@
package re.imc.geysermodelenginepackgenerator.generator;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import java.util.List;
public class RenderController {
String modelId;
List<String> bones;
public RenderController(String modelId, List<String> bones) {
this.modelId = modelId;
this.bones = bones;
}
// look, I'm fine with your other code and stuff, but I ain't using templates for JSON lmao
public String generate() {
JsonObject root = new JsonObject();
root.addProperty("format_version", "1.8.0");
JsonObject renderControllers = new JsonObject();
root.add("render_controllers", renderControllers);
JsonObject controller = new JsonObject();
renderControllers.add("controller.render." + modelId, controller);
controller.addProperty("geometry", "Geometry.default");
JsonArray materials = new JsonArray();
JsonObject materialItem = new JsonObject();
materialItem.addProperty("*", "Material.default");
materials.add(materialItem);
controller.add("materials", materials);
JsonArray textures = new JsonArray();
textures.add("Texture.default");
controller.add("textures", textures);
JsonArray partVisibility = new JsonArray();
JsonObject visibilityDefault = new JsonObject();
visibilityDefault.addProperty("*", true);
partVisibility.add(visibilityDefault);
for (String bone : bones) {
JsonObject visibilityItem = new JsonObject();
visibilityItem.addProperty(bone, "query.property('" + modelId + ":" + bone + "')");
partVisibility.add(visibilityItem);
}
controller.add("part_visibility", partVisibility);
return root.toString();
}
}