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

WIP: patterns

Browse source
This commit is contained in:
Aleksey 2020-10-12 17:58:12 +03:00
parent bd5d7e3937
commit 7e1d018140
48 changed files with 787 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/ru/betterend/blocks/basis/BlockSlab.java
View file

@ -4,19 +4,36 @@ import java.util.Collections;
import java.util.List;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.SlabBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext;
import net.minecraft.util.Identifier;
public class BlockSlab extends SlabBlock {
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.Patterned;
public class BlockSlab extends SlabBlock implements Patterned {
public BlockSlab(Block source) {
super(FabricBlockSettings.copyOf(source).nonOpaque());
super(FabricBlockSettings.copyOf(source));
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(this));
}
@Override
public String blockStatePattern(String name) {
Identifier patternId = BetterEnd.makeID("patterns/blockstate/pattern_slab.json");
return Patterned.createJson(patternId, name.replace("_slab", ""));
}
@Override
public String modelPattern(String name) {
Identifier patternId = BetterEnd.makeID("patterns/block/pattern_slab.json");
return Patterned.createJson(patternId, name.replace("_slab", ""));
}
}

3
src/main/java/ru/betterend/blocks/model/EndModelProvider.java
View file

@ -19,7 +19,6 @@ public class EndModelProvider implements ModelResourceProvider {
public static final UnbakedModel FLAVOLITE_BLOCK = new BaseBlockModel("block/flavolite");
public static final UnbakedModel FLAVOLITE_SLAB = new SlabModel("block/flavolite");
public static final UnbakedModel FLAVOLITE_SLAB_TOP = new SlabTopModel("block/flavolite");
public static void registerModel(String path, UnbakedModel model) {
MODELS.put(BetterEnd.makeID(path), model);
@ -39,7 +38,5 @@ public class EndModelProvider implements ModelResourceProvider {
registerModel("item/flavolite", FLAVOLITE_BLOCK);
registerModel("block/flavolite", FLAVOLITE_BLOCK);
registerModel("item/flavolite_slab", FLAVOLITE_SLAB);
registerModel("block/flavolite_slab", FLAVOLITE_SLAB);
registerModel("block/flavolite_slab_top", FLAVOLITE_SLAB_TOP);
}
}

8
src/main/java/ru/betterend/interfaces/IdentifiedContext.java Normal file
View file

@ -0,0 +1,8 @@
package ru.betterend.interfaces;
import net.minecraft.util.Identifier;
public interface IdentifiedContext {
public Identifier getContextId();
public void setContextId(Identifier id);
}

32
src/main/java/ru/betterend/interfaces/Patterned.java Normal file
View file

@ -0,0 +1,32 @@
package ru.betterend.interfaces;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.stream.Collectors;
import net.minecraft.client.MinecraftClient;
import net.minecraft.resource.ResourceManager;
import net.minecraft.util.Identifier;
public interface Patterned {
default String blockStatePattern(String name) {
return null;
}
default String modelPattern(String name) {
return null;
}
public static String createJson(Identifier patternId, String name) {
ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager();
try (InputStream input = resourceManager.getResource(patternId).getInputStream()) {
return new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8))
.lines()
.collect(Collectors.joining()).replace("%name%", name);
} catch (Exception ex) {}
return null;
}
}

23
src/main/java/ru/betterend/mixin/client/DeserializationContextMixin.java Normal file
View file

@ -0,0 +1,23 @@
package ru.betterend.mixin.client;
import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.client.render.model.json.ModelVariantMap.DeserializationContext;
import net.minecraft.util.Identifier;
import ru.betterend.interfaces.IdentifiedContext;
@Mixin(DeserializationContext.class)
public class DeserializationContextMixin implements IdentifiedContext {
private Identifier contextId;
@Override
public Identifier getContextId() {
return this.contextId;
}
@Override
public void setContextId(Identifier id) {
this.contextId = id;
}
}

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

@ -1,23 +1,55 @@
package ru.betterend.mixin.client;
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.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
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.util.Identifier;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.IdentifiedContext;
import ru.betterend.interfaces.Patterned;
@Mixin(ModelLoader.class)
public class ModelLoaderMixin {
@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")) {
System.out.println(id.getPath());
info.cancel();
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));
info.cancel();
}
}
}
@Inject(method = "loadModel", at = @At(
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) {
IdentifiedContext context = IdentifiedContext.class.cast(variantMapDeserializationContext);
if (id.getNamespace().equals(BetterEnd.MOD_ID)) {
Identifier blockstateId = new Identifier(id.getNamespace(), "pattern/" + id.getPath());
context.setContextId(blockstateId);
} else {
context.setContextId(null);
}
}
}

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

@ -0,0 +1,44 @@
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);
if (block instanceof Patterned) {
String pattern = ((Patterned) block).blockStatePattern(data[1]);
idContext.setContextId(null);
info.setReturnValue(deserialize(context, new StringReader(pattern)));
info.cancel();
}
}
}
}