MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Patterns

Browse source
This commit is contained in:
Aleksey 2020-10-13 17:54:18 +03:00
parent 0d5e6d544c
commit f862bc8792
57 changed files with 493 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java
View file

@ -1,5 +1,10 @@
package ru.betterend.mixin.client;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@ -12,8 +17,11 @@ import net.minecraft.block.Block;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.json.JsonUnbakedModel;
import net.minecraft.client.render.model.json.ModelVariantMap.DeserializationContext;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.IdentifiedContext;
import ru.betterend.interfaces.Patterned;
@ -21,19 +29,50 @@ import ru.betterend.interfaces.Patterned;
@Mixin(ModelLoader.class)
public class ModelLoaderMixin {
@Final
@Shadow
private DeserializationContext variantMapDeserializationContext;
@Inject(method = "loadModelFromJson", at = @At("HEAD"), cancellable = true)
private void loadModelFromJson(Identifier id, CallbackInfoReturnable<JsonUnbakedModel> info) {
if (id.getNamespace().equals(BetterEnd.MOD_ID) && id.getPath().contains("pattern")) {
String data[] = id.getPath().split("/");
Identifier blockId = new Identifier(id.getNamespace(), data[1]);
Block block = Registry.BLOCK.get(blockId);
if (block instanceof Patterned) {
String pattern = ((Patterned) block).modelPattern(data[1]);
info.setReturnValue(JsonUnbakedModel.deserialize(pattern));
@Final
@Shadow
private ResourceManager resourceManager;
@Inject(method = "loadModelFromJson", cancellable = true, at = @At(
value = "NEW",
target = "net/minecraft/util/Identifier",
shift = Shift.BEFORE))
private void loadModelPattern(Identifier id, CallbackInfoReturnable<JsonUnbakedModel> info) {
if (id.getNamespace().equals(BetterEnd.MOD_ID)) {
Identifier modelId = new Identifier(id.getNamespace(), "models/" + id.getPath() + ".json");
JsonUnbakedModel model;
try (Resource resource = this.resourceManager.getResource(modelId)) {
Reader reader = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8);
model = JsonUnbakedModel.deserialize(reader);
model.id = id.toString();
info.setReturnValue(model);
info.cancel();
} catch (Exception ex) {
String data[] = id.getPath().split("/");
if (data.length > 1) {
Identifier blockId = new Identifier(id.getNamespace(), data[1]);
Block block = Registry.BLOCK.get(blockId);
if (block instanceof Patterned) {
String pattern;
if (id.getPath().contains("item")) {
pattern = ((Patterned) block).getModelPattern(id.getPath());
} else {
if (data.length > 2) {
pattern = ((Patterned) block).getModelPattern(data[2]);
} else {
pattern = ((Patterned) block).getModelPattern(data[1]);
}
}
model = JsonUnbakedModel.deserialize(pattern);
model.id = id.toString();
info.setReturnValue(model);
info.cancel();
}
}
}
}
}
@ -42,7 +81,7 @@ public class ModelLoaderMixin {
value = "INVOKE",
target = "Lnet/minecraft/client/render/model/json/ModelVariantMap$DeserializationContext;setStateFactory(Lnet/minecraft/state/StateManager;)V",
shift = Shift.AFTER))
private void loadModel(Identifier id, CallbackInfo info) {
private void appendContextID(Identifier id, CallbackInfo info) {
IdentifiedContext context = IdentifiedContext.class.cast(variantMapDeserializationContext);
if (id.getNamespace().equals(BetterEnd.MOD_ID)) {
context.setContextId(BetterEnd.makeID("pattern/" + id.getPath()));