Last refactor

Changes to be committed:
	modified:   src/main/java/org/dimdev/annotatednbt/AnnotatedNbt.java
	modified:   src/main/java/org/dimdev/dimdoors/block/entity/DetachedRiftBlockEntity.java
	modified:   src/main/java/org/dimdev/dimdoors/block/entity/EntranceRiftBlockEntity.java
	modified:   src/main/java/org/dimdev/dimdoors/block/entity/RiftBlockEntity.java
	modified:   src/main/java/org/dimdev/dimdoors/client/DimensionalPortalRenderer.java
	modified:   src/main/java/org/dimdev/dimdoors/command/DimTeleportCommand.java
	modified:   src/main/java/org/dimdev/dimdoors/command/PocketCommand.java
	modified:   src/main/java/org/dimdev/dimdoors/item/RiftSignatureItem.java
	modified:   src/main/java/org/dimdev/dimdoors/item/StabilizedRiftSignatureItem.java
	modified:   src/main/java/org/dimdev/dimdoors/pockets/PocketTemplate.java
	modified:   src/main/java/org/dimdev/dimdoors/pockets/SchematicHandler.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/registry/Rift.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/registry/RiftRegistry.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/DefaultTargets.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/GlobalReference.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/LocalReference.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/MessageTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/PocketEntranceMarker.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/PocketExitMarker.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/PrivatePocketExitTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/PrivatePocketTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/PublicPocketTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/RandomTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/RelativeReference.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/RestoringTarget.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/RiftReference.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/Targets.java
	modified:   src/main/java/org/dimdev/dimdoors/rift/targets/VirtualTarget.java
	renamed:    src/main/java/org/dimdev/util/EntityUtils.java -> src/main/java/org/dimdev/dimdoors/util/EntityUtils.java
	renamed:    src/main/java/org/dimdev/util/GraphUtils.java -> src/main/java/org/dimdev/dimdoors/util/GraphUtils.java
	renamed:    src/main/java/org/dimdev/util/InstanceMap.java -> src/main/java/org/dimdev/dimdoors/util/InstanceMap.java
	renamed:    src/main/java/org/dimdev/util/Location.java -> src/main/java/org/dimdev/dimdoors/util/Location.java
	renamed:    src/main/java/org/dimdev/util/RGBA.java -> src/main/java/org/dimdev/dimdoors/util/RGBA.java
	renamed:    src/main/java/org/dimdev/util/RotatedLocation.java -> src/main/java/org/dimdev/dimdoors/util/RotatedLocation.java
	renamed:    src/main/java/org/dimdev/util/TeleportUtil.java -> src/main/java/org/dimdev/dimdoors/util/TeleportUtil.java
	renamed:    src/main/java/org/dimdev/util/math/GridUtil.java -> src/main/java/org/dimdev/dimdoors/util/math/GridUtil.java
	renamed:    src/main/java/org/dimdev/util/math/MathUtil.java -> src/main/java/org/dimdev/dimdoors/util/math/MathUtil.java
	renamed:    src/main/java/org/dimdev/util/reference/BlockReference.java -> src/main/java/org/dimdev/dimdoors/util/reference/BlockReference.java
	modified:   src/main/java/org/dimdev/dimdoors/world/pocket/Pocket.java
	modified:   src/main/java/org/dimdev/dimdoors/world/pocket/PocketRegistry.java
	modified:   src/main/java/org/dimdev/dimdoors/world/pocket/VirtualLocation.java
This commit is contained in:
SD 2020-07-23 21:01:44 +05:30
parent 18053982a1
commit 78b4e32eb1
No known key found for this signature in database
GPG key ID: E36B57EE08544BC5
42 changed files with 54 additions and 54 deletions

View file

@ -3,7 +3,7 @@ package org.dimdev.annotatednbt;
import com.google.gson.Gson;
import com.mojang.serialization.Dynamic;
import com.mojang.serialization.JsonOps;
import org.dimdev.util.RotatedLocation;
import org.dimdev.dimdoors.util.RotatedLocation;
import net.minecraft.datafixer.NbtOps;
import net.minecraft.nbt.CompoundTag;

View file

@ -6,7 +6,7 @@ import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.util.TeleportUtil;
import org.dimdev.dimdoors.util.TeleportUtil;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;

View file

@ -4,8 +4,8 @@ import java.util.Random;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.dimdoors.ModConfig;
import org.dimdev.util.RGBA;
import org.dimdev.util.TeleportUtil;
import org.dimdev.dimdoors.util.RGBA;
import org.dimdev.dimdoors.util.TeleportUtil;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;

View file

@ -13,8 +13,8 @@ import org.dimdev.dimdoors.rift.registry.Rift;
import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.rift.targets.*;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import org.dimdev.util.EntityUtils;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.EntityUtils;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;

View file

@ -16,7 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.mixin.DirectionMixin;
import org.dimdev.util.RGBA;
import org.dimdev.dimdoors.util.RGBA;
import org.lwjgl.opengl.GL11;
import net.minecraft.block.Block;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.command;
import com.mojang.brigadier.CommandDispatcher;
import org.dimdev.util.TeleportUtil;
import org.dimdev.dimdoors.util.TeleportUtil;
import net.minecraft.command.arguments.DimensionArgumentType;
import net.minecraft.command.arguments.Vec3ArgumentType;

View file

@ -14,8 +14,8 @@ import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.rift.targets.EntityTarget;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.util.Location;
import org.dimdev.util.TeleportUtil;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.TeleportUtil;
import net.minecraft.command.CommandException;
import net.minecraft.server.command.CommandManager;

View file

@ -6,8 +6,8 @@ import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.rift.targets.RiftReference;
import org.dimdev.dimdoors.sound.ModSoundEvents;
import org.dimdev.util.Location;
import org.dimdev.util.RotatedLocation;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.RotatedLocation;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.player.PlayerEntity;

View file

@ -6,8 +6,8 @@ import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.block.entity.DetachedRiftBlockEntity;
import org.dimdev.dimdoors.rift.targets.RiftReference;
import org.dimdev.dimdoors.sound.ModSoundEvents;
import org.dimdev.util.Location;
import org.dimdev.util.RotatedLocation;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.RotatedLocation;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.player.PlayerEntity;

View file

@ -19,8 +19,8 @@ import org.dimdev.dimdoors.rift.targets.PocketExitMarker;
import org.dimdev.dimdoors.rift.targets.VirtualTarget;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.dimdoors.world.pocket.PocketRegistry;
import org.dimdev.util.Location;
import org.dimdev.util.math.MathUtil;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.math.MathUtil;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;

View file

@ -18,7 +18,7 @@ import org.apache.logging.log4j.Logger;
import org.dimdev.dimcore.schematic.Schematic;
import org.dimdev.dimdoors.DimensionalDoorsInitializer;
import org.dimdev.dimdoors.ModConfig;
import org.dimdev.util.math.MathUtil;
import org.dimdev.dimdoors.util.math.MathUtil;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtIo;

View file

@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;

View file

@ -8,8 +8,8 @@ import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.dimdoors.world.pocket.PocketRegistry;
import org.dimdev.dimdoors.world.pocket.PrivatePocketData;
import org.dimdev.util.GraphUtils;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.GraphUtils;
import org.dimdev.dimdoors.util.Location;
import org.jgrapht.graph.DefaultDirectedGraph;
import org.jgrapht.graph.DefaultEdge;

View file

@ -1,6 +1,6 @@
package org.dimdev.dimdoors.rift.targets;
import org.dimdev.util.InstanceMap;
import org.dimdev.dimdoors.util.InstanceMap;
public final class DefaultTargets {
private static final InstanceMap DEFAULT_TARGETS = new InstanceMap();

View file

@ -6,8 +6,8 @@ import org.dimdev.dimdoors.block.entity.RiftBlockEntity;
import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import org.dimdev.util.Location;
import org.dimdev.util.TeleportUtil;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.TeleportUtil;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.CompoundTag;
@ -15,7 +15,7 @@ import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.TranslatableText;
import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
import static org.dimdev.util.EntityUtils.chat;
import static org.dimdev.dimdoors.util.EntityUtils.chat;
public class EscapeTarget extends VirtualTarget implements EntityTarget { // TODO: createRift option
protected boolean canEscapeLimbo = false;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.rift.targets;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.rift.targets;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.BlockPos;

View file

@ -1,6 +1,6 @@
package org.dimdev.dimdoors.rift.targets;
import org.dimdev.util.EntityUtils;
import org.dimdev.dimdoors.util.EntityUtils;
import net.minecraft.entity.Entity;
import net.minecraft.text.TranslatableText;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.rift.targets;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.util.EntityUtils;
import org.dimdev.dimdoors.util.EntityUtils;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.CompoundTag;

View file

@ -1,6 +1,6 @@
package org.dimdev.dimdoors.rift.targets;
import org.dimdev.util.EntityUtils;
import org.dimdev.dimdoors.util.EntityUtils;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.CompoundTag;

View file

@ -8,8 +8,8 @@ import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.dimdoors.world.pocket.PocketRegistry;
import org.dimdev.dimdoors.world.pocket.PrivatePocketData;
import org.dimdev.util.EntityUtils;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.EntityUtils;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.CompoundTag;

View file

@ -9,8 +9,8 @@ import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.dimdoors.world.pocket.PrivatePocketData;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import org.dimdev.util.EntityUtils;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.EntityUtils;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.entity.Entity;

View file

@ -4,7 +4,7 @@ import org.dimdev.dimdoors.pockets.PocketGenerator;
import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;

View file

@ -16,8 +16,8 @@ import org.dimdev.dimdoors.rift.registry.Rift;
import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.dimdoors.world.pocket.Pocket;
import org.dimdev.dimdoors.world.pocket.VirtualLocation;
import org.dimdev.util.Location;
import org.dimdev.util.math.MathUtil;
import org.dimdev.dimdoors.util.Location;
import org.dimdev.dimdoors.util.math.MathUtil;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.world.ServerWorld;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.rift.targets;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.Vec3i;

View file

@ -1,6 +1,6 @@
package org.dimdev.dimdoors.rift.targets;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;

View file

@ -3,7 +3,7 @@ package org.dimdev.dimdoors.rift.targets;
import java.util.Set;
import org.dimdev.dimdoors.rift.registry.RiftRegistry;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.util.math.Vec3i;

View file

@ -1,6 +1,6 @@
package org.dimdev.dimdoors.rift.targets;
import org.dimdev.util.EntityUtils;
import org.dimdev.dimdoors.util.EntityUtils;
import net.minecraft.fluid.Fluid;
import net.minecraft.text.TranslatableText;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.rift.targets;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
import net.minecraft.entity.Entity;
import net.minecraft.entity.ItemEntity;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
import org.jgrapht.Graph;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
import java.util.HashMap;
import java.util.Map;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
import org.dimdev.annotatednbt.AutoSerializable;
import org.dimdev.annotatednbt.Saved;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
public class RGBA {
float red;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.AutoSerializable;

View file

@ -1,4 +1,4 @@
package org.dimdev.util;
package org.dimdev.dimdoors.util;
import net.minecraft.block.pattern.BlockPattern;
import net.minecraft.entity.Entity;

View file

@ -1,4 +1,4 @@
package org.dimdev.util.math;
package org.dimdev.dimdoors.util.math;
public final class GridUtil {
public static final class GridPos {

View file

@ -1,4 +1,4 @@
package org.dimdev.util.math;
package org.dimdev.dimdoors.util.math;
import java.util.Map;
import java.util.Random;

View file

@ -1,4 +1,4 @@
package org.dimdev.util.reference;
package org.dimdev.dimdoors.util.reference;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

View file

@ -2,7 +2,7 @@ package org.dimdev.dimdoors.world.pocket;
import com.flowpowered.math.vector.Vector3i;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.util.EntityUtils;
import org.dimdev.dimdoors.util.EntityUtils;
import net.minecraft.entity.Entity;
import net.minecraft.server.world.ServerWorld;

View file

@ -7,7 +7,7 @@ import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.util.math.GridUtil;
import org.dimdev.dimdoors.util.math.GridUtil;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.world.ServerWorld;

View file

@ -4,7 +4,7 @@ import org.dimdev.annotatednbt.AnnotatedNbt;
import org.dimdev.annotatednbt.Saved;
import org.dimdev.dimdoors.ModConfig;
import org.dimdev.dimdoors.world.ModDimensions;
import org.dimdev.util.Location;
import org.dimdev.dimdoors.util.Location;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.world.ServerWorld;