BlockStates pattern loading optimization

This commit is contained in:
Aleksey 2021-01-08 23:54:17 +03:00
parent 1847b25aa9
commit 3b96ee6307
7 changed files with 27 additions and 94 deletions

View file

@ -4,40 +4,29 @@ import java.io.Reader;
import java.io.StringReader;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.google.gson.Gson;
import net.minecraft.block.Block;
import net.minecraft.client.render.model.json.ModelVariantMap;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.interfaces.IdentifiedContext;
import net.minecraft.util.JsonHelper;
import ru.betterend.patterns.BlockPatterned;
@Mixin(ModelVariantMap.class)
public abstract class ModelVariantMapMixin {
@Shadow
static ModelVariantMap deserialize(ModelVariantMap.DeserializationContext context, Reader reader) {
return null;
}
@Inject(method = "deserialize", at = @At("HEAD"), cancellable = true)
private static void deserializeBlockState(ModelVariantMap.DeserializationContext context, Reader reader, CallbackInfoReturnable<ModelVariantMap> info) {
IdentifiedContext idContext = IdentifiedContext.class.cast(context);
Identifier id = idContext.getContextId();
if (id != null && id.getPath().contains("pattern")) {
String[] data = id.getPath().split("/");
Identifier blockId = new Identifier(id.getNamespace(), data[1]);
Block block = Registry.BLOCK.get(blockId);
idContext.removeId();
if (block instanceof BlockPatterned) {
String pattern = ((BlockPatterned) block).getStatesPattern(reader);
info.setReturnValue(deserialize(context, new StringReader(pattern)));
info.cancel();
}
Block block = context.getStateFactory().getDefaultState().getBlock();
if (block instanceof BlockPatterned) {
String pattern = ((BlockPatterned) block).getStatesPattern(reader);
Gson gson = ContextGsonAccessor.class.cast(context).getGson();
ModelVariantMap map = JsonHelper.deserialize(gson, new StringReader(pattern), ModelVariantMap.class);
info.setReturnValue(map);
}
}
}