Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First schema

Browse source
This commit is contained in:
SD 2021-03-08 22:17:56 +05:30
parent 918c81c047
commit 72a50f4c57
24 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/dimdev/dimdoors/block/entity/RiftBlockEntity.java
View file

@ -19,7 +19,7 @@ import org.dimdev.dimdoors.util.EntityUtils;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.RGBA;
import org.dimdev.dimdoors.util.math.TransformationMatrix3d;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import org.jetbrains.annotations.NotNull;

2
src/main/java/org/dimdev/dimdoors/listener/ChunkLoadListener.java
View file

@ -6,7 +6,7 @@ import net.minecraft.world.chunk.WorldChunk;
import org.dimdev.dimdoors.pockets.generator.LazyPocketGenerator;
import org.dimdev.dimdoors.pockets.modifier.LazyCompatibleModifier;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.LazyGenerationPocket;
import org.dimdev.dimdoors.world.pocket.type.Pocket;

2
src/main/java/org/dimdev/dimdoors/listener/pocket/PocketListenerUtil.java
View file

@ -9,7 +9,7 @@ import org.dimdev.dimdoors.network.ClientPacketHandler;
import org.dimdev.dimdoors.network.ExtendedClientPlayNetworkHandler;
import org.dimdev.dimdoors.util.math.GridUtil;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import java.util.Collections;

2
src/main/java/org/dimdev/dimdoors/network/ServerPacketHandler.java
View file

@ -21,7 +21,7 @@ import org.dimdev.dimdoors.network.c2s.HitBlockWithItemC2SPacket;
import org.dimdev.dimdoors.network.c2s.NetworkHandlerInitializedC2SPacket;
import org.dimdev.dimdoors.network.s2c.SyncPocketAddonsS2CPacket;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.PocketDirectory;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.type.addon.AutoSyncedAddon;

2
src/main/java/org/dimdev/dimdoors/pockets/TemplateUtils.java
View file

@ -17,7 +17,7 @@ import org.dimdev.dimdoors.rift.registry.LinkProperties;
import org.dimdev.dimdoors.rift.targets.PocketEntranceMarker;
import org.dimdev.dimdoors.rift.targets.PocketExitMarker;
import org.dimdev.dimdoors.rift.targets.VirtualTarget;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.math.MathUtil;
import org.dimdev.dimdoors.util.schematic.Schematic;

2
src/main/java/org/dimdev/dimdoors/pockets/generator/ChunkGenerator.java
View file

@ -26,7 +26,7 @@ import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.block.entity.ModBlockEntityTypes;
import org.dimdev.dimdoors.rift.targets.PocketEntranceMarker;
import org.dimdev.dimdoors.util.PocketGenerationParameters;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;

2
src/main/java/org/dimdev/dimdoors/pockets/generator/SchematicGenerator.java
View file

@ -17,7 +17,7 @@ import org.dimdev.dimdoors.pockets.modifier.RiftManager;
import org.dimdev.dimdoors.util.BlockPlacementType;
import org.dimdev.dimdoors.util.PocketGenerationParameters;
import org.dimdev.dimdoors.util.schematic.Schematic;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.LazyGenerationPocket;
import org.dimdev.dimdoors.world.pocket.type.Pocket;

2
src/main/java/org/dimdev/dimdoors/pockets/generator/VoidGenerator.java
View file

@ -8,7 +8,7 @@ import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.util.PocketGenerationParameters;
import org.dimdev.dimdoors.util.math.Equation;
import org.dimdev.dimdoors.util.math.Equation.EquationParseException;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import java.util.HashMap;

2
src/main/java/org/dimdev/dimdoors/rift/registry/Rift.java
View file

@ -6,7 +6,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import net.minecraft.nbt.CompoundTag;

2
src/main/java/org/dimdev/dimdoors/rift/registry/RiftRegistry.java
View file

@ -10,7 +10,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.util.GraphUtils;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.PocketDirectory;
import org.jgrapht.graph.DefaultDirectedGraph;

2
src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java
View file

@ -10,7 +10,7 @@ import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.TeleportUtil;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import net.minecraft.entity.Entity;

2
src/main/java/org/dimdev/dimdoors/rift/targets/PrivatePocketExitTarget.java
View file

@ -9,7 +9,7 @@ import org.dimdev.dimdoors.util.EntityUtils;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.RGBA;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.PocketDirectory;

3
src/main/java/org/dimdev/dimdoors/rift/targets/PrivatePocketTarget.java
View file

@ -10,7 +10,7 @@ import org.dimdev.dimdoors.pockets.PocketGenerator;
import org.dimdev.dimdoors.util.EntityUtils;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.RGBA;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
@ -20,7 +20,6 @@ import net.minecraft.entity.ItemEntity;
import net.minecraft.item.DyeItem;
import net.minecraft.item.Item;
import org.dimdev.dimdoors.world.pocket.type.PrivatePocket;
import org.dimdev.dimdoors.world.pocket.type.addon.DyeableAddon;
public class PrivatePocketTarget extends VirtualTarget implements EntityTarget {
private static final Logger LOGGER = LogManager.getLogger();

2
src/main/java/org/dimdev/dimdoors/rift/targets/PublicPocketTarget.java
View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.rift.targets;
import org.dimdev.dimdoors.pockets.PocketGenerator;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;

5
src/main/java/org/dimdev/dimdoors/rift/targets/RandomTarget.java
View file

@ -8,9 +8,6 @@ import java.util.Set;
import java.util.stream.Collectors;
import com.google.common.collect.Sets;
import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import org.dimdev.dimdoors.DimensionalDoorsInitializer;
import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
@ -20,7 +17,7 @@ import org.dimdev.dimdoors.rift.registry.LinkProperties;
import org.dimdev.dimdoors.rift.registry.Rift;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.math.MathUtil;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.type.Pocket;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;

2
src/main/java/org/dimdev/dimdoors/rift/targets/RiftReference.java
View file

@ -4,7 +4,7 @@ import java.util.Set;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.RGBA;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import net.minecraft.util.math.Vec3i;

1
src/main/java/org/dimdev/dimdoors/world/level/DimensionalDoorsComponents.java
View file

@ -11,6 +11,7 @@ import dev.onyxstudios.cca.api.v3.item.ItemComponentInitializer;
import dev.onyxstudios.cca.api.v3.level.LevelComponentFactoryRegistry;
import dev.onyxstudios.cca.api.v3.level.LevelComponentInitializer;
import org.dimdev.dimdoors.item.ModItems;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
@SuppressWarnings("UnstableApiUsage")
public class DimensionalDoorsComponents implements LevelComponentInitializer, ItemComponentInitializer, ChunkComponentInitializer {

3
src/main/java/org/dimdev/dimdoors/world/level/DimensionalRegistry.java → src/main/java/org/dimdev/dimdoors/world/level/registry/DimensionalRegistry.java
View file

@ -1,4 +1,4 @@
package org.dimdev.dimdoors.world.level;
package org.dimdev.dimdoors.world.level.registry;
import java.util.ArrayList;
import java.util.HashMap;
@ -19,6 +19,7 @@ import net.minecraft.world.level.LevelProperties;
import dev.onyxstudios.cca.api.v3.component.ComponentV3;
import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.level.DimensionalDoorsComponents;
import org.dimdev.dimdoors.world.pocket.PocketDirectory;
import org.dimdev.dimdoors.world.pocket.PrivateRegistry;

4
src/main/java/org/dimdev/dimdoors/world/level/RiftSchemas.java → src/main/java/org/dimdev/dimdoors/world/level/registry/RiftSchemas.java
View file

@ -1,4 +1,4 @@
package org.dimdev.dimdoors.world.level;
package org.dimdev.dimdoors.world.level.registry;
import java.util.function.BiFunction;
@ -7,6 +7,7 @@ import com.mojang.datafixers.DataFixer;
import com.mojang.datafixers.DataFixerBuilder;
import com.mojang.datafixers.schemas.Schema;
import com.mojang.serialization.Dynamic;
import org.dimdev.dimdoors.world.level.registry.schema.Schema1;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtOps;
@ -17,6 +18,7 @@ public class RiftSchemas {
public static final int RIFT_DATA_VERSION = DimensionalRegistry.RIFT_DATA_VERSION;
public static final BiFunction<Integer, Schema, Schema> EMPTY = Schema::new;
public static final DataFixer DATA_FIXER = Util.make(new DataFixerBuilder(RIFT_DATA_VERSION), builder -> {
builder.addSchema(1, Schema1::new);
// TODO: add schemas if schema changes
}).build(Runnable::run);

20
src/main/java/org/dimdev/dimdoors/world/level/registry/schema/Schema1.java Normal file
View file

@ -0,0 +1,20 @@
package org.dimdev.dimdoors.world.level.registry.schema;
import java.util.Map;
import java.util.function.Supplier;
import com.mojang.datafixers.DSL;
import com.mojang.datafixers.schemas.Schema;
import com.mojang.datafixers.types.templates.TypeTemplate;
import org.dimdev.dimdoors.world.level.registry.RiftSchemas;
public class Schema1 extends Schema {
public Schema1(int versionKey, Schema parent) {
super(versionKey, parent);
}
@Override
public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
schema.registerType(false, RiftSchemas.RIFT_DATA_TYPE_REF, DSL::remainder);
}
}

2
src/main/java/org/dimdev/dimdoors/world/pocket/PrivateRegistry.java
View file

@ -10,7 +10,7 @@ import com.google.common.collect.HashBiMap;
import net.minecraft.nbt.Tag;
import net.minecraft.util.Pair;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Identifier;

2
src/main/java/org/dimdev/dimdoors/world/pocket/VirtualLocation.java
View file

@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import org.dimdev.dimdoors.DimensionalDoorsInitializer;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.world.ModDimensions;

2
src/main/java/org/dimdev/dimdoors/world/pocket/type/IdReferencePocket.java
View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.world.pocket.type;
import net.fabricmc.fabric.api.util.NbtType;
import net.minecraft.nbt.CompoundTag;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
public class IdReferencePocket extends AbstractPocket<IdReferencePocket> {
public static String KEY = "id_reference";

2
src/main/java/org/dimdev/dimdoors/world/pocket/type/Pocket.java
View file

@ -11,7 +11,7 @@ import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
import net.minecraft.util.Identifier;
import org.dimdev.dimdoors.DimensionalDoorsInitializer;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.level.registry.DimensionalRegistry;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.nbt.CompoundTag;