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

Cleanup

Browse source
This commit is contained in:
paulevsGitch 2020-10-13 01:08:07 +03:00
parent 8286b914d7
commit 0d5e6d544c
7 changed files with 795 additions and 805 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/main/java/ru/betterend/mixin/client/ModelVariantMapMixin.java
View file

@ -1,44 +1,43 @@
package ru.betterend.mixin.client;
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 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 ru.betterend.interfaces.Patterned;
@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 Patterned) {
String pattern = ((Patterned) block).blockStatePattern(data[1]);
info.setReturnValue(deserialize(context, new StringReader(pattern)));
info.cancel();
}
}
}
}
package ru.betterend.mixin.client;
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 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 ru.betterend.interfaces.Patterned;
@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 Patterned) {
String pattern = ((Patterned) block).blockStatePattern(data[1]);
info.setReturnValue(deserialize(context, new StringReader(pattern)));
info.cancel();
}
}
}
}