diff --git a/build.gradle b/build.gradle index 8ba8eb71..7ab56388 100644 --- a/build.gradle +++ b/build.gradle @@ -76,14 +76,6 @@ dependencies { compile "com.tridevmc.compound:compound-all:${compoundVersion}" } -sourceSets { - main { - java { - include 'com/tridevmc/compound/**' - } - } -} - repositories { jcenter() mavenCentral() diff --git a/properties.gradle b/properties.gradle index ea533134..b61e5c97 100644 --- a/properties.gradle +++ b/properties.gradle @@ -4,8 +4,8 @@ ext { modBaseName = "movingworld" //Forge Stuff - forgeVersion = "1.13.2-25.0.77" - mappingsVersion = "20190311-1.13.2" + forgeVersion = "1.13.2-25.0.90" + mappingsVersion = "20190320-1.13.2" //Trident Stuff compoundVersion = "1.1.2-SNAPSHOT" diff --git a/src/main/java/com/elytradev/movingworld/client/ClientProxy.java b/src/main/java/com/elytradev/movingworld/client/ClientProxy.java deleted file mode 100644 index cba77e2d..00000000 --- a/src/main/java/com/elytradev/movingworld/client/ClientProxy.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.elytradev.movingworld.client; - -import com.elytradev.movingworld.common.CommonProxy; - -public class ClientProxy extends CommonProxy { -} diff --git a/src/main/java/com/elytradev/movingworld/MovingWorldMod.java b/src/main/java/com/tridevmc/movingworld/MovingWorldMod.java similarity index 82% rename from src/main/java/com/elytradev/movingworld/MovingWorldMod.java rename to src/main/java/com/tridevmc/movingworld/MovingWorldMod.java index 309b48b4..5cd8f202 100644 --- a/src/main/java/com/elytradev/movingworld/MovingWorldMod.java +++ b/src/main/java/com/tridevmc/movingworld/MovingWorldMod.java @@ -1,9 +1,9 @@ -package com.elytradev.movingworld; +package com.tridevmc.movingworld; -import com.elytradev.movingworld.client.ClientProxy; -import com.elytradev.movingworld.common.CommonProxy; -import com.elytradev.movingworld.common.config.MovingWorldConfig; -import com.elytradev.movingworld.common.config.priority.MovingWorldAssemblePriorityConfig; +import com.tridevmc.movingworld.client.ClientProxy; +import com.tridevmc.movingworld.common.CommonProxy; +import com.tridevmc.movingworld.common.config.MovingWorldConfig; +import com.tridevmc.movingworld.common.config.priority.MovingWorldAssemblePriorityConfig; import com.tridevmc.compound.config.CompoundConfig; import com.tridevmc.compound.network.core.CompoundNetwork; import net.minecraftforge.common.MinecraftForge; @@ -16,7 +16,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import static com.elytradev.movingworld.MovingWorldMod.MOD_ID; +import static com.tridevmc.movingworld.MovingWorldMod.MOD_ID; @Mod(MOD_ID) public class MovingWorldMod { diff --git a/src/main/java/com/elytradev/movingworld/api/CapabilityMovingTileHandler.java b/src/main/java/com/tridevmc/movingworld/api/CapabilityMovingTileHandler.java similarity index 95% rename from src/main/java/com/elytradev/movingworld/api/CapabilityMovingTileHandler.java rename to src/main/java/com/tridevmc/movingworld/api/CapabilityMovingTileHandler.java index 5a335cea..2a74269b 100644 --- a/src/main/java/com/elytradev/movingworld/api/CapabilityMovingTileHandler.java +++ b/src/main/java/com/tridevmc/movingworld/api/CapabilityMovingTileHandler.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.api; +package com.tridevmc.movingworld.api; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import net.minecraft.nbt.INBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/com/elytradev/movingworld/api/IMovingTile.java b/src/main/java/com/tridevmc/movingworld/api/IMovingTile.java similarity index 74% rename from src/main/java/com/elytradev/movingworld/api/IMovingTile.java rename to src/main/java/com/tridevmc/movingworld/api/IMovingTile.java index 92663201..07cf01db 100644 --- a/src/main/java/com/elytradev/movingworld/api/IMovingTile.java +++ b/src/main/java/com/tridevmc/movingworld/api/IMovingTile.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.api; +package com.tridevmc.movingworld.api; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import net.minecraft.util.math.BlockPos; public interface IMovingTile { diff --git a/src/main/java/com/elytradev/movingworld/api/rotation/IRotationBlock.java b/src/main/java/com/tridevmc/movingworld/api/rotation/IRotationBlock.java similarity index 86% rename from src/main/java/com/elytradev/movingworld/api/rotation/IRotationBlock.java rename to src/main/java/com/tridevmc/movingworld/api/rotation/IRotationBlock.java index 7ff1ad97..96a9c79a 100644 --- a/src/main/java/com/elytradev/movingworld/api/rotation/IRotationBlock.java +++ b/src/main/java/com/tridevmc/movingworld/api/rotation/IRotationBlock.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.api.rotation; +package com.tridevmc.movingworld.api.rotation; -import com.elytradev.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; /** diff --git a/src/main/java/com/elytradev/movingworld/api/rotation/IRotationProperty.java b/src/main/java/com/tridevmc/movingworld/api/rotation/IRotationProperty.java similarity index 92% rename from src/main/java/com/elytradev/movingworld/api/rotation/IRotationProperty.java rename to src/main/java/com/tridevmc/movingworld/api/rotation/IRotationProperty.java index b252e62f..12492168 100644 --- a/src/main/java/com/elytradev/movingworld/api/rotation/IRotationProperty.java +++ b/src/main/java/com/tridevmc/movingworld/api/rotation/IRotationProperty.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.api.rotation; +package com.tridevmc.movingworld.api.rotation; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/tridevmc/movingworld/client/ClientProxy.java b/src/main/java/com/tridevmc/movingworld/client/ClientProxy.java new file mode 100644 index 00000000..41b95859 --- /dev/null +++ b/src/main/java/com/tridevmc/movingworld/client/ClientProxy.java @@ -0,0 +1,6 @@ +package com.tridevmc.movingworld.client; + +import com.tridevmc.movingworld.common.CommonProxy; + +public class ClientProxy extends CommonProxy { +} diff --git a/src/main/java/com/elytradev/movingworld/client/render/MobileChunkRenderer.java b/src/main/java/com/tridevmc/movingworld/client/render/MobileChunkRenderer.java similarity index 98% rename from src/main/java/com/elytradev/movingworld/client/render/MobileChunkRenderer.java rename to src/main/java/com/tridevmc/movingworld/client/render/MobileChunkRenderer.java index a67a9178..41bf9a54 100644 --- a/src/main/java/com/elytradev/movingworld/client/render/MobileChunkRenderer.java +++ b/src/main/java/com/tridevmc/movingworld/client/render/MobileChunkRenderer.java @@ -1,8 +1,8 @@ -package com.elytradev.movingworld.client.render; +package com.tridevmc.movingworld.client.render; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunkClient; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunkClient; import com.google.common.collect.Maps; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/elytradev/movingworld/client/render/RenderMovingWorld.java b/src/main/java/com/tridevmc/movingworld/client/render/RenderMovingWorld.java similarity index 92% rename from src/main/java/com/elytradev/movingworld/client/render/RenderMovingWorld.java rename to src/main/java/com/tridevmc/movingworld/client/render/RenderMovingWorld.java index d8b63627..6f88eebb 100644 --- a/src/main/java/com/elytradev/movingworld/client/render/RenderMovingWorld.java +++ b/src/main/java/com/tridevmc/movingworld/client/render/RenderMovingWorld.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.client.render; +package com.tridevmc.movingworld.client.render; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunkClient; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunkClient; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/elytradev/movingworld/common/CommonProxy.java b/src/main/java/com/tridevmc/movingworld/common/CommonProxy.java similarity index 92% rename from src/main/java/com/elytradev/movingworld/common/CommonProxy.java rename to src/main/java/com/tridevmc/movingworld/common/CommonProxy.java index a4e379d3..4b51e46d 100644 --- a/src/main/java/com/elytradev/movingworld/common/CommonProxy.java +++ b/src/main/java/com/tridevmc/movingworld/common/CommonProxy.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common; +package com.tridevmc.movingworld.common; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; diff --git a/src/main/java/com/elytradev/movingworld/common/block/BlockMovingWorldMarker.java b/src/main/java/com/tridevmc/movingworld/common/block/BlockMovingWorldMarker.java similarity index 91% rename from src/main/java/com/elytradev/movingworld/common/block/BlockMovingWorldMarker.java rename to src/main/java/com/tridevmc/movingworld/common/block/BlockMovingWorldMarker.java index 9eec62e7..b712f381 100644 --- a/src/main/java/com/elytradev/movingworld/common/block/BlockMovingWorldMarker.java +++ b/src/main/java/com/tridevmc/movingworld/common/block/BlockMovingWorldMarker.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.block; +package com.tridevmc.movingworld.common.block; -import com.elytradev.movingworld.common.tile.TileMovingMarkingBlock; +import com.tridevmc.movingworld.common.tile.TileMovingMarkingBlock; import net.minecraft.block.BlockContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/CompressedChunkData.java b/src/main/java/com/tridevmc/movingworld/common/chunk/CompressedChunkData.java similarity index 95% rename from src/main/java/com/elytradev/movingworld/common/chunk/CompressedChunkData.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/CompressedChunkData.java index 2f4fbbd0..1c355121 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/CompressedChunkData.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/CompressedChunkData.java @@ -1,8 +1,8 @@ -package com.elytradev.movingworld.common.chunk; +package com.tridevmc.movingworld.common.chunk; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; -import com.elytradev.movingworld.common.util.LocatedBlockList; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.util.LocatedBlockList; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/LocatedBlock.java b/src/main/java/com/tridevmc/movingworld/common/chunk/LocatedBlock.java similarity index 97% rename from src/main/java/com/elytradev/movingworld/common/chunk/LocatedBlock.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/LocatedBlock.java index 625368e6..e7c7cfe7 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/LocatedBlock.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/LocatedBlock.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.chunk; +package com.tridevmc.movingworld.common.chunk; import com.google.common.base.MoreObjects; import net.minecraft.block.Block; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/MovingWorldAssemblyInteractor.java b/src/main/java/com/tridevmc/movingworld/common/chunk/MovingWorldAssemblyInteractor.java similarity index 90% rename from src/main/java/com/elytradev/movingworld/common/chunk/MovingWorldAssemblyInteractor.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/MovingWorldAssemblyInteractor.java index 155c20a1..61d72d2c 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/MovingWorldAssemblyInteractor.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/MovingWorldAssemblyInteractor.java @@ -1,10 +1,10 @@ -package com.elytradev.movingworld.common.chunk; +package com.tridevmc.movingworld.common.chunk; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.block.BlockMovingWorldMarker; -import com.elytradev.movingworld.common.chunk.assembly.AssembleResult; -import com.elytradev.movingworld.common.chunk.assembly.CanAssemble; -import com.elytradev.movingworld.common.tile.TileMovingMarkingBlock; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.block.BlockMovingWorldMarker; +import com.tridevmc.movingworld.common.chunk.assembly.AssembleResult; +import com.tridevmc.movingworld.common.chunk.assembly.CanAssemble; +import com.tridevmc.movingworld.common.tile.TileMovingMarkingBlock; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/MovingWorldSizeOverflowException.java b/src/main/java/com/tridevmc/movingworld/common/chunk/MovingWorldSizeOverflowException.java similarity index 80% rename from src/main/java/com/elytradev/movingworld/common/chunk/MovingWorldSizeOverflowException.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/MovingWorldSizeOverflowException.java index 42bb8bbb..313a7857 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/MovingWorldSizeOverflowException.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/MovingWorldSizeOverflowException.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.chunk; +package com.tridevmc.movingworld.common.chunk; public class MovingWorldSizeOverflowException extends RuntimeException { private static final long serialVersionUID = 1995L; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/AssembleResult.java b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/AssembleResult.java similarity index 95% rename from src/main/java/com/elytradev/movingworld/common/chunk/assembly/AssembleResult.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/assembly/AssembleResult.java index c79ea5e3..e3ac5a57 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/AssembleResult.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/AssembleResult.java @@ -1,13 +1,13 @@ -package com.elytradev.movingworld.common.chunk.assembly; +package com.tridevmc.movingworld.common.chunk.assembly; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.MovingWorldAssemblyInteractor; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.tile.TileMovingMarkingBlock; -import com.elytradev.movingworld.common.util.LocatedBlockList; -import com.elytradev.movingworld.common.util.MaterialDensity; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.MovingWorldAssemblyInteractor; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.tile.TileMovingMarkingBlock; +import com.tridevmc.movingworld.common.util.LocatedBlockList; +import com.tridevmc.movingworld.common.util.MaterialDensity; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/CanAssemble.java b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/CanAssemble.java similarity index 82% rename from src/main/java/com/elytradev/movingworld/common/chunk/assembly/CanAssemble.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/assembly/CanAssemble.java index ff976024..fbeb4624 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/CanAssemble.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/CanAssemble.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.chunk.assembly; +package com.tridevmc.movingworld.common.chunk.assembly; public class CanAssemble { diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/ChunkAssembler.java b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/ChunkAssembler.java similarity index 95% rename from src/main/java/com/elytradev/movingworld/common/chunk/assembly/ChunkAssembler.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/assembly/ChunkAssembler.java index bfc7dce2..51eca8f7 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/ChunkAssembler.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/ChunkAssembler.java @@ -1,10 +1,10 @@ -package com.elytradev.movingworld.common.chunk.assembly; +package com.tridevmc.movingworld.common.chunk.assembly; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.MovingWorldAssemblyInteractor; -import com.elytradev.movingworld.common.chunk.MovingWorldSizeOverflowException; -import com.elytradev.movingworld.common.event.AssembleBlockEvent; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.MovingWorldAssemblyInteractor; +import com.tridevmc.movingworld.common.chunk.MovingWorldSizeOverflowException; +import com.tridevmc.movingworld.common.event.AssembleBlockEvent; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/ChunkDisassembler.java b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/ChunkDisassembler.java similarity index 94% rename from src/main/java/com/elytradev/movingworld/common/chunk/assembly/ChunkDisassembler.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/assembly/ChunkDisassembler.java index 11654e47..831e7721 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/assembly/ChunkDisassembler.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/assembly/ChunkDisassembler.java @@ -1,14 +1,14 @@ -package com.elytradev.movingworld.common.chunk.assembly; - -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.api.IMovingTile; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.MovingWorldAssemblyInteractor; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.event.DisassembleBlockEvent; -import com.elytradev.movingworld.common.tile.TileMovingMarkingBlock; -import com.elytradev.movingworld.common.util.*; +package com.tridevmc.movingworld.common.chunk.assembly; + +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.api.IMovingTile; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.MovingWorldAssemblyInteractor; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.event.DisassembleBlockEvent; +import com.tridevmc.movingworld.common.tile.TileMovingMarkingBlock; +import com.tridevmc.movingworld.common.util.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/FakeChunk.java b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/FakeChunk.java similarity index 93% rename from src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/FakeChunk.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/FakeChunk.java index 76f8649c..48488b90 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/FakeChunk.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/FakeChunk.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.chunk.mobilechunk; +package com.tridevmc.movingworld.common.chunk.mobilechunk; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunk.java b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunk.java similarity index 98% rename from src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunk.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunk.java index a6bdc13a..baae7ea2 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunk.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunk.java @@ -1,12 +1,12 @@ -package com.elytradev.movingworld.common.chunk.mobilechunk; - -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.api.IMovingTile; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.mobilechunk.world.FakeWorld; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.util.AABBRotator; -import com.elytradev.movingworld.common.util.Vec3dMod; +package com.tridevmc.movingworld.common.chunk.mobilechunk; + +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.api.IMovingTile; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.mobilechunk.world.FakeWorld; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.util.AABBRotator; +import com.tridevmc.movingworld.common.util.Vec3dMod; import com.google.common.collect.HashBiMap; import com.tridevmc.compound.core.reflect.WrappedField; import net.minecraft.block.Block; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunkClient.java b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunkClient.java similarity index 92% rename from src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunkClient.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunkClient.java index 76cb1ded..69ca53c3 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunkClient.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunkClient.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.chunk.mobilechunk; +package com.tridevmc.movingworld.common.chunk.mobilechunk; -import com.elytradev.movingworld.client.render.MobileChunkRenderer; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.client.render.MobileChunkRenderer; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import com.google.common.collect.Maps; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunkServer.java b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunkServer.java similarity index 93% rename from src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunkServer.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunkServer.java index 44c04ef0..111ce4cf 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/MobileChunkServer.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/MobileChunkServer.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.chunk.mobilechunk; +package com.tridevmc.movingworld.common.chunk.mobilechunk; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/world/FakeWorld.java b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/world/FakeWorld.java similarity index 95% rename from src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/world/FakeWorld.java rename to src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/world/FakeWorld.java index 1df1a4df..88ca407e 100644 --- a/src/main/java/com/elytradev/movingworld/common/chunk/mobilechunk/world/FakeWorld.java +++ b/src/main/java/com/tridevmc/movingworld/common/chunk/mobilechunk/world/FakeWorld.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.chunk.mobilechunk.world; +package com.tridevmc.movingworld.common.chunk.mobilechunk.world; -import com.elytradev.movingworld.common.chunk.mobilechunk.FakeChunk; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.chunk.mobilechunk.FakeChunk; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.fluid.Fluid; diff --git a/src/main/java/com/elytradev/movingworld/common/config/BlockDensityData.java b/src/main/java/com/tridevmc/movingworld/common/config/BlockDensityData.java similarity index 88% rename from src/main/java/com/elytradev/movingworld/common/config/BlockDensityData.java rename to src/main/java/com/tridevmc/movingworld/common/config/BlockDensityData.java index fd147170..81081ecd 100644 --- a/src/main/java/com/elytradev/movingworld/common/config/BlockDensityData.java +++ b/src/main/java/com/tridevmc/movingworld/common/config/BlockDensityData.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.config; +package com.tridevmc.movingworld.common.config; import net.minecraft.block.Block; diff --git a/src/main/java/com/elytradev/movingworld/common/config/BlockDensityDataSerializer.java b/src/main/java/com/tridevmc/movingworld/common/config/BlockDensityDataSerializer.java similarity index 96% rename from src/main/java/com/elytradev/movingworld/common/config/BlockDensityDataSerializer.java rename to src/main/java/com/tridevmc/movingworld/common/config/BlockDensityDataSerializer.java index bba987d7..822c1278 100644 --- a/src/main/java/com/elytradev/movingworld/common/config/BlockDensityDataSerializer.java +++ b/src/main/java/com/tridevmc/movingworld/common/config/BlockDensityDataSerializer.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.config; +package com.tridevmc.movingworld.common.config; import com.tridevmc.compound.config.IConfigObjectSerializer; import com.tridevmc.compound.config.RegisteredConfigObjectSerializer; diff --git a/src/main/java/com/elytradev/movingworld/common/config/MovingWorldConfig.java b/src/main/java/com/tridevmc/movingworld/common/config/MovingWorldConfig.java similarity index 99% rename from src/main/java/com/elytradev/movingworld/common/config/MovingWorldConfig.java rename to src/main/java/com/tridevmc/movingworld/common/config/MovingWorldConfig.java index 2df875ed..427a31f8 100644 --- a/src/main/java/com/elytradev/movingworld/common/config/MovingWorldConfig.java +++ b/src/main/java/com/tridevmc/movingworld/common/config/MovingWorldConfig.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.config; +package com.tridevmc.movingworld.common.config; import com.google.common.collect.Lists; import com.tridevmc.compound.config.ConfigType; diff --git a/src/main/java/com/elytradev/movingworld/common/config/priority/MovingWorldAssemblePriorityConfig.java b/src/main/java/com/tridevmc/movingworld/common/config/priority/MovingWorldAssemblePriorityConfig.java similarity index 97% rename from src/main/java/com/elytradev/movingworld/common/config/priority/MovingWorldAssemblePriorityConfig.java rename to src/main/java/com/tridevmc/movingworld/common/config/priority/MovingWorldAssemblePriorityConfig.java index ae58100e..38c113a8 100644 --- a/src/main/java/com/elytradev/movingworld/common/config/priority/MovingWorldAssemblePriorityConfig.java +++ b/src/main/java/com/tridevmc/movingworld/common/config/priority/MovingWorldAssemblePriorityConfig.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.config.priority; +package com.tridevmc.movingworld.common.config.priority; import com.google.common.collect.Lists; import com.tridevmc.compound.config.ConfigType; diff --git a/src/main/java/com/elytradev/movingworld/common/entity/EntityMovingWorld.java b/src/main/java/com/tridevmc/movingworld/common/entity/EntityMovingWorld.java similarity index 97% rename from src/main/java/com/elytradev/movingworld/common/entity/EntityMovingWorld.java rename to src/main/java/com/tridevmc/movingworld/common/entity/EntityMovingWorld.java index db0d5015..d3839293 100644 --- a/src/main/java/com/elytradev/movingworld/common/entity/EntityMovingWorld.java +++ b/src/main/java/com/tridevmc/movingworld/common/entity/EntityMovingWorld.java @@ -1,17 +1,17 @@ -package com.elytradev.movingworld.common.entity; - -import com.elytradev.movingworld.api.IMovingTile; -import com.elytradev.movingworld.common.chunk.CompressedChunkData; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.MovingWorldAssemblyInteractor; -import com.elytradev.movingworld.common.chunk.assembly.AssembleResult; -import com.elytradev.movingworld.common.chunk.assembly.ChunkDisassembler; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunkClient; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunkServer; -import com.elytradev.movingworld.common.util.AABBRotator; -import com.elytradev.movingworld.common.util.MathHelperMod; -import com.elytradev.movingworld.common.util.Vec3dMod; +package com.tridevmc.movingworld.common.entity; + +import com.tridevmc.movingworld.api.IMovingTile; +import com.tridevmc.movingworld.common.chunk.CompressedChunkData; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.MovingWorldAssemblyInteractor; +import com.tridevmc.movingworld.common.chunk.assembly.AssembleResult; +import com.tridevmc.movingworld.common.chunk.assembly.ChunkDisassembler; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunkClient; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunkServer; +import com.tridevmc.movingworld.common.util.AABBRotator; +import com.tridevmc.movingworld.common.util.MathHelperMod; +import com.tridevmc.movingworld.common.util.Vec3dMod; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; diff --git a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldCapabilities.java b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldCapabilities.java similarity index 94% rename from src/main/java/com/elytradev/movingworld/common/entity/MovingWorldCapabilities.java rename to src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldCapabilities.java index cd049fa1..d5269441 100644 --- a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldCapabilities.java +++ b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldCapabilities.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.entity; +package com.tridevmc.movingworld.common.entity; -import com.elytradev.movingworld.common.util.MaterialDensity; +import com.tridevmc.movingworld.common.util.MaterialDensity; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerClient.java b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerClient.java similarity index 82% rename from src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerClient.java rename to src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerClient.java index 8c2d7f6b..27a5498b 100644 --- a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerClient.java +++ b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerClient.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.entity; +package com.tridevmc.movingworld.common.entity; -import com.elytradev.movingworld.common.network.message.FarInteractMessage; +import com.tridevmc.movingworld.common.network.message.FarInteractMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumHand; diff --git a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerCommon.java b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerCommon.java similarity index 94% rename from src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerCommon.java rename to src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerCommon.java index d508d400..a3957587 100644 --- a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerCommon.java +++ b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerCommon.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.entity; +package com.tridevmc.movingworld.common.entity; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerServer.java b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerServer.java similarity index 86% rename from src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerServer.java rename to src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerServer.java index 077a8e8f..7dcdc5d9 100644 --- a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldHandlerServer.java +++ b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldHandlerServer.java @@ -1,11 +1,11 @@ -package com.elytradev.movingworld.common.entity; +package com.tridevmc.movingworld.common.entity; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.CompressedChunkData; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunkServer; -import com.elytradev.movingworld.common.network.message.MovingWorldBlockChangeMessage; -import com.elytradev.movingworld.common.network.message.MovingWorldTileChangeMessage; -import com.elytradev.movingworld.common.tile.TileMovingMarkingBlock; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.CompressedChunkData; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunkServer; +import com.tridevmc.movingworld.common.network.message.MovingWorldBlockChangeMessage; +import com.tridevmc.movingworld.common.network.message.MovingWorldTileChangeMessage; +import com.tridevmc.movingworld.common.tile.TileMovingMarkingBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldInfo.java b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldInfo.java similarity index 92% rename from src/main/java/com/elytradev/movingworld/common/entity/MovingWorldInfo.java rename to src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldInfo.java index b6d0a6b6..7025755c 100644 --- a/src/main/java/com/elytradev/movingworld/common/entity/MovingWorldInfo.java +++ b/src/main/java/com/tridevmc/movingworld/common/entity/MovingWorldInfo.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.entity; +package com.tridevmc.movingworld.common.entity; import java.util.UUID; diff --git a/src/main/java/com/elytradev/movingworld/common/event/AssembleBlockEvent.java b/src/main/java/com/tridevmc/movingworld/common/event/AssembleBlockEvent.java similarity index 66% rename from src/main/java/com/elytradev/movingworld/common/event/AssembleBlockEvent.java rename to src/main/java/com/tridevmc/movingworld/common/event/AssembleBlockEvent.java index 1c325fd4..75fb429c 100644 --- a/src/main/java/com/elytradev/movingworld/common/event/AssembleBlockEvent.java +++ b/src/main/java/com/tridevmc/movingworld/common/event/AssembleBlockEvent.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.event; +package com.tridevmc.movingworld.common.event; -import com.elytradev.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; import net.minecraftforge.eventbus.api.Event; public class AssembleBlockEvent extends Event { diff --git a/src/main/java/com/elytradev/movingworld/common/event/DisassembleBlockEvent.java b/src/main/java/com/tridevmc/movingworld/common/event/DisassembleBlockEvent.java similarity index 66% rename from src/main/java/com/elytradev/movingworld/common/event/DisassembleBlockEvent.java rename to src/main/java/com/tridevmc/movingworld/common/event/DisassembleBlockEvent.java index 6cfa9bb4..93feb454 100644 --- a/src/main/java/com/elytradev/movingworld/common/event/DisassembleBlockEvent.java +++ b/src/main/java/com/tridevmc/movingworld/common/event/DisassembleBlockEvent.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.event; +package com.tridevmc.movingworld.common.event; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import net.minecraftforge.eventbus.api.Event; public class DisassembleBlockEvent extends Event { diff --git a/src/main/java/com/elytradev/movingworld/common/network/MovingWorldClientAction.java b/src/main/java/com/tridevmc/movingworld/common/network/MovingWorldClientAction.java similarity index 53% rename from src/main/java/com/elytradev/movingworld/common/network/MovingWorldClientAction.java rename to src/main/java/com/tridevmc/movingworld/common/network/MovingWorldClientAction.java index 72e9872d..e1900686 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/MovingWorldClientAction.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/MovingWorldClientAction.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.network; +package com.tridevmc.movingworld.common.network; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.network.message.MovingWorldClientActionMessage; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.network.message.MovingWorldClientActionMessage; public enum MovingWorldClientAction { NONE, ALIGN, DISASSEMBLE, DISASSEMBLEWITHOVERWRITE; diff --git a/src/main/java/com/elytradev/movingworld/common/network/marshallers/ByteBufMarshaller.java b/src/main/java/com/tridevmc/movingworld/common/network/marshallers/ByteBufMarshaller.java similarity index 93% rename from src/main/java/com/elytradev/movingworld/common/network/marshallers/ByteBufMarshaller.java rename to src/main/java/com/tridevmc/movingworld/common/network/marshallers/ByteBufMarshaller.java index f3b06080..29e2a766 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/marshallers/ByteBufMarshaller.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/marshallers/ByteBufMarshaller.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.network.marshallers; +package com.tridevmc.movingworld.common.network.marshallers; import com.tridevmc.compound.network.marshallers.Marshaller; import com.tridevmc.compound.network.marshallers.RegisteredMarshaller; diff --git a/src/main/java/com/elytradev/movingworld/common/network/marshallers/ChunkDataMarshaller.java b/src/main/java/com/tridevmc/movingworld/common/network/marshallers/ChunkDataMarshaller.java similarity index 83% rename from src/main/java/com/elytradev/movingworld/common/network/marshallers/ChunkDataMarshaller.java rename to src/main/java/com/tridevmc/movingworld/common/network/marshallers/ChunkDataMarshaller.java index ef7cc51b..392d42e3 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/marshallers/ChunkDataMarshaller.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/marshallers/ChunkDataMarshaller.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.network.marshallers; +package com.tridevmc.movingworld.common.network.marshallers; -import com.elytradev.movingworld.common.chunk.CompressedChunkData; +import com.tridevmc.movingworld.common.chunk.CompressedChunkData; import com.tridevmc.compound.network.marshallers.Marshaller; import com.tridevmc.compound.network.marshallers.RegisteredMarshaller; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/elytradev/movingworld/common/network/marshallers/EntityMarshaller.java b/src/main/java/com/tridevmc/movingworld/common/network/marshallers/EntityMarshaller.java similarity index 90% rename from src/main/java/com/elytradev/movingworld/common/network/marshallers/EntityMarshaller.java rename to src/main/java/com/tridevmc/movingworld/common/network/marshallers/EntityMarshaller.java index 8d9133c8..7684a132 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/marshallers/EntityMarshaller.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/marshallers/EntityMarshaller.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.network.marshallers; +package com.tridevmc.movingworld.common.network.marshallers; -import com.elytradev.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.MovingWorldMod; import com.tridevmc.compound.network.marshallers.Marshaller; import com.tridevmc.compound.network.marshallers.RegisteredMarshaller; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/elytradev/movingworld/common/network/message/FarInteractMessage.java b/src/main/java/com/tridevmc/movingworld/common/network/message/FarInteractMessage.java similarity index 85% rename from src/main/java/com/elytradev/movingworld/common/network/message/FarInteractMessage.java rename to src/main/java/com/tridevmc/movingworld/common/network/message/FarInteractMessage.java index 057788bb..8b0420b2 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/message/FarInteractMessage.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/message/FarInteractMessage.java @@ -1,6 +1,6 @@ -package com.elytradev.movingworld.common.network.message; +package com.tridevmc.movingworld.common.network.message; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import com.tridevmc.compound.network.message.Message; import com.tridevmc.compound.network.message.RegisteredMessage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldBlockChangeMessage.java b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldBlockChangeMessage.java similarity index 84% rename from src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldBlockChangeMessage.java rename to src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldBlockChangeMessage.java index 1e026445..98a1f96a 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldBlockChangeMessage.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldBlockChangeMessage.java @@ -1,8 +1,8 @@ -package com.elytradev.movingworld.common.network.message; +package com.tridevmc.movingworld.common.network.message; -import com.elytradev.movingworld.common.chunk.CompressedChunkData; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.chunk.CompressedChunkData; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import com.tridevmc.compound.network.message.Message; import com.tridevmc.compound.network.message.RegisteredMessage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldClientActionMessage.java b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldClientActionMessage.java similarity index 90% rename from src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldClientActionMessage.java rename to src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldClientActionMessage.java index 4dd74ce2..96a0aff7 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldClientActionMessage.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldClientActionMessage.java @@ -1,8 +1,8 @@ -package com.elytradev.movingworld.common.network.message; +package com.tridevmc.movingworld.common.network.message; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.network.MovingWorldClientAction; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.network.MovingWorldClientAction; import com.tridevmc.compound.network.message.Message; import com.tridevmc.compound.network.message.RegisteredMessage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldDataRequestMessage.java b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldDataRequestMessage.java similarity index 89% rename from src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldDataRequestMessage.java rename to src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldDataRequestMessage.java index 0caf5751..a7a559a5 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldDataRequestMessage.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldDataRequestMessage.java @@ -1,8 +1,8 @@ -package com.elytradev.movingworld.common.network.message; +package com.tridevmc.movingworld.common.network.message; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.tile.TileMovingMarkingBlock; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.tile.TileMovingMarkingBlock; import com.tridevmc.compound.network.message.Message; import com.tridevmc.compound.network.message.RegisteredMessage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldTileChangeMessage.java b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldTileChangeMessage.java similarity index 90% rename from src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldTileChangeMessage.java rename to src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldTileChangeMessage.java index e7c067cb..b2432aac 100644 --- a/src/main/java/com/elytradev/movingworld/common/network/message/MovingWorldTileChangeMessage.java +++ b/src/main/java/com/tridevmc/movingworld/common/network/message/MovingWorldTileChangeMessage.java @@ -1,8 +1,8 @@ -package com.elytradev.movingworld.common.network.message; +package com.tridevmc.movingworld.common.network.message; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunkClient; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunkClient; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; import com.tridevmc.compound.network.message.Message; import com.tridevmc.compound.network.message.RegisteredMessage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/elytradev/movingworld/common/rotation/RotationEnumProperty.java b/src/main/java/com/tridevmc/movingworld/common/rotation/RotationEnumProperty.java similarity index 88% rename from src/main/java/com/elytradev/movingworld/common/rotation/RotationEnumProperty.java rename to src/main/java/com/tridevmc/movingworld/common/rotation/RotationEnumProperty.java index 1fe4b3f8..a138e395 100644 --- a/src/main/java/com/elytradev/movingworld/common/rotation/RotationEnumProperty.java +++ b/src/main/java/com/tridevmc/movingworld/common/rotation/RotationEnumProperty.java @@ -1,7 +1,6 @@ -package com.elytradev.movingworld.common.rotation; +package com.tridevmc.movingworld.common.rotation; -import com.elytradev.movingworld.api.rotation.IRotationProperty; -import net.minecraft.block.BlockLever; +import com.tridevmc.movingworld.api.rotation.IRotationProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.state.IProperty; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/com/elytradev/movingworld/common/rotation/RotationIntegerProperty.java b/src/main/java/com/tridevmc/movingworld/common/rotation/RotationIntegerProperty.java similarity index 85% rename from src/main/java/com/elytradev/movingworld/common/rotation/RotationIntegerProperty.java rename to src/main/java/com/tridevmc/movingworld/common/rotation/RotationIntegerProperty.java index 8d001245..b359f188 100644 --- a/src/main/java/com/elytradev/movingworld/common/rotation/RotationIntegerProperty.java +++ b/src/main/java/com/tridevmc/movingworld/common/rotation/RotationIntegerProperty.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.rotation; +package com.tridevmc.movingworld.common.rotation; -import com.elytradev.movingworld.api.rotation.IRotationProperty; -import com.elytradev.movingworld.common.util.RotationHelper; +import com.tridevmc.movingworld.api.rotation.IRotationProperty; +import com.tridevmc.movingworld.common.util.RotationHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.state.IntegerProperty; diff --git a/src/main/java/com/elytradev/movingworld/common/tile/TileMovingMarkingBlock.java b/src/main/java/com/tridevmc/movingworld/common/tile/TileMovingMarkingBlock.java similarity index 94% rename from src/main/java/com/elytradev/movingworld/common/tile/TileMovingMarkingBlock.java rename to src/main/java/com/tridevmc/movingworld/common/tile/TileMovingMarkingBlock.java index e6c0b294..a57d1861 100644 --- a/src/main/java/com/elytradev/movingworld/common/tile/TileMovingMarkingBlock.java +++ b/src/main/java/com/tridevmc/movingworld/common/tile/TileMovingMarkingBlock.java @@ -1,13 +1,13 @@ -package com.elytradev.movingworld.common.tile; - -import com.elytradev.movingworld.api.IMovingTile; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.MovingWorldAssemblyInteractor; -import com.elytradev.movingworld.common.chunk.assembly.AssembleResult; -import com.elytradev.movingworld.common.chunk.assembly.ChunkAssembler; -import com.elytradev.movingworld.common.entity.EntityMovingWorld; -import com.elytradev.movingworld.common.entity.MovingWorldInfo; -import com.elytradev.movingworld.common.util.LocatedBlockList; +package com.tridevmc.movingworld.common.tile; + +import com.tridevmc.movingworld.api.IMovingTile; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.MovingWorldAssemblyInteractor; +import com.tridevmc.movingworld.common.chunk.assembly.AssembleResult; +import com.tridevmc.movingworld.common.chunk.assembly.ChunkAssembler; +import com.tridevmc.movingworld.common.entity.EntityMovingWorld; +import com.tridevmc.movingworld.common.entity.MovingWorldInfo; +import com.tridevmc.movingworld.common.util.LocatedBlockList; import com.tridevmc.compound.core.reflect.WrappedField; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/elytradev/movingworld/common/util/AABBRotator.java b/src/main/java/com/tridevmc/movingworld/common/util/AABBRotator.java similarity index 98% rename from src/main/java/com/elytradev/movingworld/common/util/AABBRotator.java rename to src/main/java/com/tridevmc/movingworld/common/util/AABBRotator.java index 93c8d596..d72bf93c 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/AABBRotator.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/AABBRotator.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/elytradev/movingworld/common/util/FloodFiller.java b/src/main/java/com/tridevmc/movingworld/common/util/FloodFiller.java similarity index 94% rename from src/main/java/com/elytradev/movingworld/common/util/FloodFiller.java rename to src/main/java/com/tridevmc/movingworld/common/util/FloodFiller.java index 932828c3..4d2cd02b 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/FloodFiller.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/FloodFiller.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.chunk.mobilechunk.MobileChunk; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.chunk.mobilechunk.MobileChunk; import net.minecraft.block.BlockAir; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/elytradev/movingworld/common/util/LocatedBlockList.java b/src/main/java/com/tridevmc/movingworld/common/util/LocatedBlockList.java similarity index 97% rename from src/main/java/com/elytradev/movingworld/common/util/LocatedBlockList.java rename to src/main/java/com/tridevmc/movingworld/common/util/LocatedBlockList.java index eb5a1207..df51e589 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/LocatedBlockList.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/LocatedBlockList.java @@ -1,7 +1,7 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; -import com.elytradev.movingworld.MovingWorldMod; -import com.elytradev.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.MovingWorldMod; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; import com.google.common.collect.HashBiMap; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/elytradev/movingworld/common/util/MaterialDensity.java b/src/main/java/com/tridevmc/movingworld/common/util/MaterialDensity.java similarity index 96% rename from src/main/java/com/elytradev/movingworld/common/util/MaterialDensity.java rename to src/main/java/com/tridevmc/movingworld/common/util/MaterialDensity.java index ea4deb04..f42f8a5c 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/MaterialDensity.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/MaterialDensity.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/elytradev/movingworld/common/util/MathHelperMod.java b/src/main/java/com/tridevmc/movingworld/common/util/MathHelperMod.java similarity index 88% rename from src/main/java/com/elytradev/movingworld/common/util/MathHelperMod.java rename to src/main/java/com/tridevmc/movingworld/common/util/MathHelperMod.java index caaa3b5a..26f83999 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/MathHelperMod.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/MathHelperMod.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; public class MathHelperMod { diff --git a/src/main/java/com/elytradev/movingworld/common/util/RotationHelper.java b/src/main/java/com/tridevmc/movingworld/common/util/RotationHelper.java similarity index 91% rename from src/main/java/com/elytradev/movingworld/common/util/RotationHelper.java rename to src/main/java/com/tridevmc/movingworld/common/util/RotationHelper.java index c5c26462..7561c74c 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/RotationHelper.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/RotationHelper.java @@ -1,10 +1,10 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; -import com.elytradev.movingworld.api.rotation.IRotationBlock; -import com.elytradev.movingworld.api.rotation.IRotationProperty; -import com.elytradev.movingworld.common.chunk.LocatedBlock; -import com.elytradev.movingworld.common.rotation.RotationEnumProperty; -import com.elytradev.movingworld.common.rotation.RotationIntegerProperty; +import com.tridevmc.movingworld.api.rotation.IRotationBlock; +import com.tridevmc.movingworld.api.rotation.IRotationProperty; +import com.tridevmc.movingworld.common.chunk.LocatedBlock; +import com.tridevmc.movingworld.common.rotation.RotationEnumProperty; +import com.tridevmc.movingworld.common.rotation.RotationIntegerProperty; import com.google.common.collect.Maps; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/elytradev/movingworld/common/util/Vec3dMod.java b/src/main/java/com/tridevmc/movingworld/common/util/Vec3dMod.java similarity index 98% rename from src/main/java/com/elytradev/movingworld/common/util/Vec3dMod.java rename to src/main/java/com/tridevmc/movingworld/common/util/Vec3dMod.java index a41b27b8..23734106 100644 --- a/src/main/java/com/elytradev/movingworld/common/util/Vec3dMod.java +++ b/src/main/java/com/tridevmc/movingworld/common/util/Vec3dMod.java @@ -1,4 +1,4 @@ -package com.elytradev.movingworld.common.util; +package com.tridevmc.movingworld.common.util; import net.minecraft.util.math.BlockPos;