Skip to content

Commit

Permalink
Move namespace, update forge.
Browse files Browse the repository at this point in the history
  • Loading branch information
darkevilmac committed Mar 21, 2019
1 parent f073ff0 commit 52e84ed
Show file tree
Hide file tree
Showing 57 changed files with 180 additions and 189 deletions.
8 changes: 0 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ dependencies {
compile "com.tridevmc.compound:compound-all:${compoundVersion}"
}

sourceSets {
main {
java {
include 'com/tridevmc/compound/**'
}
}
}

repositories {
jcenter()
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions properties.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.elytradev.movingworld.api.rotation;
package com.tridevmc.movingworld.api.rotation;

import net.minecraft.block.state.IBlockState;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.tridevmc.movingworld.client;

import com.tridevmc.movingworld.common.CommonProxy;

public class ClientProxy extends CommonProxy {
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.elytradev.movingworld.common;
package com.tridevmc.movingworld.common;

import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.elytradev.movingworld.common.chunk.assembly;
package com.tridevmc.movingworld.common.chunk.assembly;

public class CanAssemble {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.elytradev.movingworld.common.config;
package com.tridevmc.movingworld.common.config;

import net.minecraft.block.Block;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading

0 comments on commit 52e84ed

Please sign in to comment.