Leisuretimedock/JsonEM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改第五部分

Browse Source 
去掉了不是很必要的塔吊API，目前全局使用Service来替代
This commit is contained in:
叁玖领域 2025-05-29 05:14:02 +08:00
parent d305b932ed
commit 3c6416d7ca
10 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build.gradle
View File

@ -8,5 +8,5 @@ dependencies {
// Do NOT use other classes from Fabric Loader.
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
// modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
}

6
common/src/main/java/com/leisuretimedock/jsonem/JsonEm.java
View File

@ -1,9 +1,7 @@
package com.leisuretimedock.jsonem;
import dev.architectury.registry.client.level.entity.EntityModelLayerRegistry;
import com.leisuretimedock.jsonem.platform.Services;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.model.geom.builders.LayerDefinition;
import net.minecraft.client.model.geom.builders.MeshDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -14,6 +12,6 @@ public final class JsonEm {
// Write common init code here.
}
public static void registerModelLayer(ModelLayerLocation layer) {
EntityModelLayerRegistry.register(layer, () -> LayerDefinition.create(new MeshDefinition(), 32, 32));
Services.PLATFORM.registerModelLayer(layer);
}
}

3
common/src/main/java/com/leisuretimedock/jsonem/platform/IPlatFormHelper.java
View File

@ -1,8 +1,11 @@
package com.leisuretimedock.jsonem.platform;
import net.minecraft.client.model.geom.ModelLayerLocation;
import java.nio.file.Path;
public interface IPlatFormHelper {
boolean shouldDumpModels();
Path getDumpModelsPath();
void registerModelLayer(ModelLayerLocation layer);
}

2
fabric/build.gradle
View File

@ -29,7 +29,7 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
// modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
shadowBundle project(path: ':common', configuration: 'transformProductionFabric')

11
fabric/src/main/java/com/leisuretimedock/jsonem/fabric/platform/FabricPlatformHelper.java
View File

@ -2,9 +2,14 @@ package com.leisuretimedock.jsonem.fabric.platform;
import com.leisuretimedock.jsonem.fabric.JsonEmFabric;
import com.leisuretimedock.jsonem.platform.IPlatFormHelper;
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.model.geom.builders.LayerDefinition;
import net.minecraft.client.model.geom.builders.MeshDefinition;
import java.nio.file.Path;
import java.util.Objects;
public class FabricPlatformHelper implements IPlatFormHelper {
@Override
@ -16,4 +21,10 @@ public class FabricPlatformHelper implements IPlatFormHelper {
public Path getDumpModelsPath() {
return FabricLoader.getInstance().getGameDir().resolve("jsonem_dump");
}
@Override
public void registerModelLayer(ModelLayerLocation layer) {
Objects.requireNonNull(layer);
EntityModelLayerRegistry.registerModelLayer(layer, () -> LayerDefinition.create(new MeshDefinition(), 32, 32));
}
}

1
fabric/src/main/resources/fabric.mod.json
View File

@ -26,7 +26,6 @@
"fabricloader": ">=0.16.14",
"minecraft": "~1.20.1",
"java": ">=17",
"architectury": ">=9.2.14",
"fabric-api": "*"
},
"suggests": {

2
forge/build.gradle
View File

@ -36,7 +36,7 @@ dependencies {
forge "net.minecraftforge:forge:$rootProject.forge_version"
modImplementation "dev.architectury:architectury-forge:$rootProject.architectury_api_version"
// modImplementation "dev.architectury:architectury-forge:$rootProject.architectury_api_version"
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
}

8
forge/src/main/java/com/leisuretimedock/jsonem/forge/JsonEmForge.java
View File

@ -2,8 +2,7 @@ package com.leisuretimedock.jsonem.forge;
import com.leisuretimedock.jsonem.JsonEm;
import com.leisuretimedock.jsonem.forge.config.JsonEmConfig;
import dev.architectury.platform.forge.EventBuses;
import net.minecraftforge.eventbus.api.IEventBus;
import com.leisuretimedock.jsonem.forge.platform.ForgePlatformHelper;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@ -11,11 +10,8 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@Mod(JsonEm.MOD_ID)
public final class JsonEmForge {
public JsonEmForge(FMLJavaModLoadingContext context) {
// Submit our event bus to let Architectury API register our content on the right time.
IEventBus modEventBus = context.getModEventBus();
EventBuses.registerModEventBus(JsonEm.MOD_ID, modEventBus);
context.registerConfig(ModConfig.Type.CLIENT, JsonEmConfig.spec, "jsonem.toml");
// Run our common setup.
JsonEm.init();
context.getModEventBus().register(ForgePlatformHelper.class);
}
}

21
forge/src/main/java/com/leisuretimedock/jsonem/forge/platform/ForgePlatformHelper.java
View File

@ -2,11 +2,20 @@ package com.leisuretimedock.jsonem.forge.platform;
import com.leisuretimedock.jsonem.forge.config.JsonEmConfig;
import com.leisuretimedock.jsonem.platform.IPlatFormHelper;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.model.geom.builders.LayerDefinition;
import net.minecraft.client.model.geom.builders.MeshDefinition;
import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.loading.FMLPaths;
import java.nio.file.Path;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
public class ForgePlatformHelper implements IPlatFormHelper {
private static final Map<ModelLayerLocation, Supplier<LayerDefinition>> DEFINITIONS = new ConcurrentHashMap<>();
@Override
public boolean shouldDumpModels() {
try {
@ -21,4 +30,16 @@ public class ForgePlatformHelper implements IPlatFormHelper {
return FMLPaths.GAMEDIR.get().resolve("jsonem_dump");
}
@Override
public void registerModelLayer(ModelLayerLocation layer) {
DEFINITIONS.put(layer, () -> LayerDefinition.create(new MeshDefinition(), 32, 32));
}
@SubscribeEvent
public static void event(EntityRenderersEvent.RegisterLayerDefinitions event) {
for (Map.Entry<ModelLayerLocation, Supplier<LayerDefinition>> modelLayerLocationSupplierEntry : DEFINITIONS.entrySet()) {
event.registerLayerDefinition(modelLayerLocationSupplierEntry.getKey(), modelLayerLocationSupplierEntry.getValue());
}
}
}

6
forge/src/main/resources/META-INF/mods.toml
View File

@ -29,9 +29,3 @@ versionRange = "[1.20.1,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.jsonem]]
modId = "architectury"
mandatory = true
versionRange = "[9.2.14,)"
ordering = "AFTER"
side = "BOTH"