Skip to content

Commit

Permalink
Change package name, and group id.
Browse files Browse the repository at this point in the history
  • Loading branch information
darkevilmac committed Sep 2, 2016
1 parent 3cd8a0e commit ef116f9
Show file tree
Hide file tree
Showing 60 changed files with 200 additions and 200 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'idea'

version = 'MC1.10-INDEV'
group = "darkevilmac.movingworld"
group = "io.github.elytra.movingworld"
archivesBaseName = "movingworld"

sourceCompatibility = 1.8
Expand Down Expand Up @@ -69,7 +69,7 @@ dependencies {
shadowJar {
exclude 'dummyThing'

relocate 'com.unascribed.lambdanetwork', "darkevilmac.movingworld.repackage.com.unascribed.lambdanetwork"
relocate 'com.unascribed.lambdanetwork', "io.github.elytra.movingworld.repackage.com.unascribed.lambdanetwork"
dependencies {
include(dependency('org.spongepowered:mixin'))
include(dependency('com.unascribed:lambdanetwork'))
Expand All @@ -93,7 +93,7 @@ jar {
'MixinConfigs': 'mixins.movingworld.json',
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
'TweakOrder': '0',
'FMLCorePlugin': 'darkevilmac.movingworld.common.asm.coremod.MovingWorldCoreMod',
'FMLCorePlugin': 'io.github.elytra.movingworld.common.asm.coremod.MovingWorldCoreMod',
'FMLCorePluginContainsFMLMod': 'true',
'ForceLoadAsMod': 'true',
'FMLAT': 'MovingWorld_at.cfg'
Expand Down Expand Up @@ -133,12 +133,12 @@ idea {
it.@name == 'Minecraft Server' && it.@type == 'Application'
}

def minecraftClientVMArgs = '-Xincgc -Xmx1024M -Xms1024M -Dfml.coreMods.load=darkevilmac.movingworld.common.asm.coremod.MovingWorldCoreMod -Dmixin.debug=true'
def minecraftClientVMArgs = '-Xincgc -Xmx1024M -Xms1024M -Dfml.coreMods.load=io.github.elytra.movingworld.common.asm.coremod.MovingWorldCoreMod -Dmixin.debug=true'
minecraftClientDefaults.option.find { it.@name == 'VM_PARAMETERS' }.replaceNode {
option(name: 'VM_PARAMETERS', value: minecraftClientVMArgs)
}

def minecraftServerVMArgs = '-Xincgc -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.coreMods.load=darkevilmac.movingworld.common.asm.coremod.MovingWorldCoreMod -Dmixin.debug=true'
def minecraftServerVMArgs = '-Xincgc -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.coreMods.load=io.github.elytra.movingworld.common.asm.coremod.MovingWorldCoreMod -Dmixin.debug=true'
minecraftServerDefaults.option.find { it.@name == 'VM_PARAMETERS' }.replaceNode {
option(name: 'VM_PARAMETERS', value: minecraftServerVMArgs)
}
Expand Down
13 changes: 0 additions & 13 deletions src/main/java/darkevilmac/movingworld/client/ClientProxy.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package darkevilmac.movingworld;
package io.github.elytra.movingworld;

import darkevilmac.movingworld.client.ClientProxy;
import darkevilmac.movingworld.common.CommonProxy;
import darkevilmac.movingworld.common.config.MainConfig;
import darkevilmac.movingworld.common.mrot.MetaRotations;
import darkevilmac.movingworld.common.network.MovingWorldNetworking;
import io.github.elytra.movingworld.client.ClientProxy;
import io.github.elytra.movingworld.common.CommonProxy;
import io.github.elytra.movingworld.common.config.MainConfig;
import io.github.elytra.movingworld.common.mrot.MetaRotations;
import io.github.elytra.movingworld.common.network.MovingWorldNetworking;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
Expand All @@ -21,12 +21,12 @@ public class MovingWorldMod {
public static final String MOD_ID = "movingworld";
public static final String MOD_VERSION = "@MOVINGWORLDVER@";
public static final String MOD_NAME = "Moving World";
public static final String MOD_GUIFACTORY = "darkevilmac.movingworld.client.gui.MovingWorldGUIFactory";
public static final String MOD_GUIFACTORY = "io.github.elytra.movingworld.client.gui.MovingWorldGUIFactory";

@Mod.Instance(MOD_ID)
public static MovingWorldMod instance;

@SidedProxy(clientSide = "darkevilmac.movingworld.client.ClientProxy", serverSide = "darkevilmac.movingworld.common.CommonProxy")
@SidedProxy(clientSide = "io.github.elytra.movingworld.client.ClientProxy", serverSide = "io.github.elytra.movingworld.common.CommonProxy")
public static CommonProxy proxy;

public static Logger logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package darkevilmac.movingworld.api;
package io.github.elytra.movingworld.api;

import net.minecraft.util.math.BlockPos;

import darkevilmac.movingworld.common.chunk.mobilechunk.MobileChunk;
import darkevilmac.movingworld.common.entity.EntityMovingWorld;
import io.github.elytra.movingworld.common.chunk.mobilechunk.MobileChunk;
import io.github.elytra.movingworld.common.entity.EntityMovingWorld;

public interface IMovingWorldTileEntity {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package darkevilmac.movingworld.api.rotation;
package io.github.elytra.movingworld.api.rotation;

import darkevilmac.movingworld.common.chunk.LocatedBlock;
import io.github.elytra.movingworld.common.chunk.LocatedBlock;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.api.rotation;
package io.github.elytra.movingworld.api.rotation;

import net.minecraft.block.state.IBlockState;

Expand Down
13 changes: 13 additions & 0 deletions src/main/java/io/github/elytra/movingworld/client/ClientProxy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package io.github.elytra.movingworld.client;

import io.github.elytra.movingworld.common.CommonProxy;
import io.github.elytra.movingworld.common.config.MainConfig;

public class ClientProxy extends CommonProxy {

public MainConfig syncedConfig;

@Override
public void registerRenderers() {
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.client.gui;
package io.github.elytra.movingworld.client.gui;

import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
Expand All @@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.List;

import darkevilmac.movingworld.MovingWorldMod;
import io.github.elytra.movingworld.MovingWorldMod;

public class MovingWorldConfigGUI extends GuiConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.client.gui;
package io.github.elytra.movingworld.client.gui;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package darkevilmac.movingworld.client.render;
package io.github.elytra.movingworld.client.render;

import darkevilmac.movingworld.MovingWorldMod;
import darkevilmac.movingworld.common.chunk.mobilechunk.MobileChunk;
import io.github.elytra.movingworld.MovingWorldMod;
import io.github.elytra.movingworld.common.chunk.mobilechunk.MobileChunk;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.client.render;
package io.github.elytra.movingworld.client.render;

import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera;
Expand All @@ -10,8 +10,8 @@

import org.lwjgl.opengl.GL11;

import darkevilmac.movingworld.common.chunk.mobilechunk.MobileChunkClient;
import darkevilmac.movingworld.common.entity.EntityMovingWorld;
import io.github.elytra.movingworld.common.chunk.mobilechunk.MobileChunkClient;
import io.github.elytra.movingworld.common.entity.EntityMovingWorld;

public class RenderMovingWorld extends Render {
public RenderMovingWorld(RenderManager renderManager) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common;
package io.github.elytra.movingworld.common;

public class CommonProxy {
public void registerRenderers() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.asm.coremod;
package io.github.elytra.movingworld.common.asm.coremod;

import net.minecraftforge.fml.common.asm.transformers.AccessTransformer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.asm.coremod;
package io.github.elytra.movingworld.common.asm.coremod;

import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;

Expand All @@ -22,7 +22,7 @@ public String[] getASMTransformerClass() {

@Override
public String getModContainerClass() {
return "darkevilmac.movingworld.common.asm.coremod.MovingWorldModContainer";
return "io.github.elytra.movingworld.common.asm.coremod.MovingWorldModContainer";
}

@Override
Expand All @@ -36,7 +36,7 @@ public void injectData(Map<String, Object> data) {

@Override
public String getAccessTransformerClass() {
return "darkevilmac.movingworld.common.asm.coremod.MovingWorldAccessTransformer";
return "io.github.elytra.movingworld.common.asm.coremod.MovingWorldAccessTransformer";
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.asm.coremod;
package io.github.elytra.movingworld.common.asm.coremod;

import com.google.common.collect.Lists;
import com.google.common.eventbus.EventBus;
Expand All @@ -13,7 +13,7 @@ public MovingWorldModContainer() {
super(new ModMetadata());

ModMetadata meta = getMetadata();
meta.modId = "darkevilmac.movingworld.common.asm.coremod";
meta.modId = "io.github.elytra.movingworld.common.asm.coremod";
meta.name = "MovingWorld CORE";
meta.authorList = Lists.newArrayList("Darkevilmac");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package darkevilmac.movingworld.common.asm.mixin.core.block;
package io.github.elytra.movingworld.common.asm.mixin.core.block;

import net.minecraft.block.BlockSkull;
import net.minecraft.tileentity.TileEntitySkull;

import org.spongepowered.asm.mixin.Mixin;

import darkevilmac.movingworld.common.chunk.LocatedBlock;
import darkevilmac.movingworld.common.util.RotationHelper;
import darkevilmac.movingworld.api.rotation.IRotationBlock;
import io.github.elytra.movingworld.common.chunk.LocatedBlock;
import io.github.elytra.movingworld.common.util.RotationHelper;
import io.github.elytra.movingworld.api.rotation.IRotationBlock;

@Mixin(BlockSkull.class)
public class MixinBlockSkull implements IRotationBlock {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package darkevilmac.movingworld.common.asm.mixin.core.block.property;
package io.github.elytra.movingworld.common.asm.mixin.core.block.property;

import darkevilmac.movingworld.api.rotation.IRotationProperty;
import io.github.elytra.movingworld.api.rotation.IRotationProperty;
import net.minecraft.block.BlockLever;
import net.minecraft.block.BlockLog;
import net.minecraft.block.properties.IProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package darkevilmac.movingworld.common.asm.mixin.core.block.property;
package io.github.elytra.movingworld.common.asm.mixin.core.block.property;

import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.IBlockState;

import org.spongepowered.asm.mixin.Mixin;

import darkevilmac.movingworld.common.util.RotationHelper;
import darkevilmac.movingworld.api.rotation.IRotationProperty;
import io.github.elytra.movingworld.common.util.RotationHelper;
import io.github.elytra.movingworld.api.rotation.IRotationProperty;

@Mixin(PropertyInteger.class)
public class MixinPropertyInteger implements IRotationProperty {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.asm.mixin.core.entity;
package io.github.elytra.movingworld.common.asm.mixin.core.entity;

import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
Expand All @@ -7,7 +7,7 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;

import darkevilmac.movingworld.common.entity.IMixinEntity;
import io.github.elytra.movingworld.common.entity.IMixinEntity;

@Mixin(Entity.class)
public abstract class MixinEntity implements IMixinEntity {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.asm.mixin.core.world;
package io.github.elytra.movingworld.common.asm.mixin.core.world;

import net.minecraft.world.World;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.block;
package io.github.elytra.movingworld.common.block;

import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
Expand All @@ -11,7 +11,7 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

import darkevilmac.movingworld.common.tile.TileMovingWorldMarkingBlock;
import io.github.elytra.movingworld.common.tile.TileMovingWorldMarkingBlock;

public abstract class BlockMovingWorldMarker extends BlockContainer {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.chunk;
package io.github.elytra.movingworld.common.chunk;

import net.minecraft.block.Block;
import net.minecraft.block.BlockFence;
Expand All @@ -16,8 +16,8 @@
import java.util.Iterator;
import java.util.List;

import darkevilmac.movingworld.common.chunk.mobilechunk.MobileChunk;
import darkevilmac.movingworld.common.entity.IMixinEntity;
import io.github.elytra.movingworld.common.chunk.mobilechunk.MobileChunk;
import io.github.elytra.movingworld.common.entity.IMixinEntity;

public class ChunkCollisionHelper {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package darkevilmac.movingworld.common.chunk;
package io.github.elytra.movingworld.common.chunk;

import darkevilmac.movingworld.MovingWorldMod;
import darkevilmac.movingworld.common.chunk.mobilechunk.MobileChunk;
import io.github.elytra.movingworld.MovingWorldMod;
import io.github.elytra.movingworld.common.chunk.mobilechunk.MobileChunk;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream;
import io.netty.buffer.ByteBufOutputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.chunk;
package io.github.elytra.movingworld.common.chunk;

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 darkevilmac.movingworld.common.chunk;
package io.github.elytra.movingworld.common.chunk;

import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
Expand All @@ -8,11 +8,11 @@
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;

import darkevilmac.movingworld.MovingWorldMod;
import darkevilmac.movingworld.common.block.BlockMovingWorldMarker;
import darkevilmac.movingworld.common.chunk.assembly.AssembleResult;
import darkevilmac.movingworld.common.chunk.assembly.CanAssemble;
import darkevilmac.movingworld.common.tile.TileMovingWorldMarkingBlock;
import io.github.elytra.movingworld.MovingWorldMod;
import io.github.elytra.movingworld.common.block.BlockMovingWorldMarker;
import io.github.elytra.movingworld.common.chunk.assembly.AssembleResult;
import io.github.elytra.movingworld.common.chunk.assembly.CanAssemble;
import io.github.elytra.movingworld.common.tile.TileMovingWorldMarkingBlock;
import io.netty.buffer.ByteBuf;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package darkevilmac.movingworld.common.chunk;
package io.github.elytra.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,4 +1,4 @@
package darkevilmac.movingworld.common.chunk.assembly;
package io.github.elytra.movingworld.common.chunk.assembly;


import net.minecraft.block.Block;
Expand All @@ -13,13 +13,13 @@

import java.util.ArrayList;

import darkevilmac.movingworld.MovingWorldMod;
import darkevilmac.movingworld.common.chunk.LocatedBlock;
import darkevilmac.movingworld.common.chunk.MovingWorldAssemblyInteractor;
import darkevilmac.movingworld.common.entity.EntityMovingWorld;
import darkevilmac.movingworld.common.tile.TileMovingWorldMarkingBlock;
import darkevilmac.movingworld.common.util.LocatedBlockList;
import darkevilmac.movingworld.common.util.MaterialDensity;
import io.github.elytra.movingworld.MovingWorldMod;
import io.github.elytra.movingworld.common.chunk.LocatedBlock;
import io.github.elytra.movingworld.common.chunk.MovingWorldAssemblyInteractor;
import io.github.elytra.movingworld.common.entity.EntityMovingWorld;
import io.github.elytra.movingworld.common.tile.TileMovingWorldMarkingBlock;
import io.github.elytra.movingworld.common.util.LocatedBlockList;
import io.github.elytra.movingworld.common.util.MaterialDensity;
import io.netty.buffer.ByteBuf;

public class AssembleResult {
Expand Down
Loading

0 comments on commit ef116f9

Please sign in to comment.