Altarik/ReFramed
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

where we're going we don't need backwards compat

Browse Source
This commit is contained in:
quat1024 2023-06-15 01:53:46 -04:00
parent ac61d3082c
commit fb457d1b37
2 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/cottonmc/templates/block/entity/TemplateEntity.java
View File

@ -1,10 +1,8 @@
package io.github.cottonmc.templates.block.entity; package io.github.cottonmc.templates.block.entity;
import io.github.cottonmc.templates.util.BlockStateUtil;
import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable; import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity; import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity;
import net.fabricmc.fabric.api.server.PlayerStream; import net.fabricmc.fabric.api.server.PlayerStream;
import net.fabricmc.fabric.api.util.NbtType;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
@ -39,8 +37,7 @@ public abstract class TemplateEntity extends BlockEntity implements BlockEntityC
@Override @Override
public void fromTag(CompoundTag tag) { public void fromTag(CompoundTag tag) {
super.fromTag(tag); super.fromTag(tag);
if (tag.contains("BlockState", NbtType.COMPOUND)) renderedState = NbtHelper.toBlockState(tag.getCompound("BlockState")); renderedState = NbtHelper.toBlockState(tag.getCompound("BlockState"));
else renderedState = BlockStateUtil.fromTag(tag);
glowstone = tag.getBoolean("Glowstone"); glowstone = tag.getBoolean("Glowstone");
redstone = tag.getBoolean("Redstone"); redstone = tag.getBoolean("Redstone");
if (world != null && world.isClient) { if (world != null && world.isClient) {

48
src/main/java/io/github/cottonmc/templates/util/BlockStateUtil.java
View File

@ -1,48 +0,0 @@
package io.github.cottonmc.templates.util;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.Property;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import java.util.Optional;
/**
* use {@link net.minecraft.nbt.NbtHelper}, which I should have been using from the start oops
*/
@Deprecated
public class BlockStateUtil {
public static BlockState fromTag(CompoundTag tag) {
Block block = Registry.BLOCK.get(new Identifier(tag.getString("Block")));
CompoundTag properties = tag.getCompound("Properties");
StateManager<Block, BlockState> factory = block.getStateManager();
BlockState state = factory.getDefaultState();
for (String key : properties.getKeys()) {
Property<?> prop = factory.getProperty(key);
if (prop != null) state = parseProperty(state, prop, properties.getString(key));
}
return state;
}
public static CompoundTag toTag(CompoundTag tag, BlockState state) {
tag.putString("Block", Registry.BLOCK.getId(state.getBlock()).toString());
CompoundTag properties = new CompoundTag();
for (Property<?> prop : state.getProperties()) {
String value = state.get(prop).toString();
properties.putString(prop.getName(), value);
}
tag.put("Properties", properties);
return tag;
}
public static <T extends Comparable<T>> BlockState parseProperty(BlockState state, Property<T> property, String value) {
Optional<T> optional = property.parse(value);
if (optional.isPresent()) {
state = state.with(property, optional.get());
}
return state;
}
}