1.12.2 forge package migration

.gitignore

@@ -28,3 +28,5 @@ logs
 *.jar
 
 TrackAPI
+
+logs

build.gradle

@@ -64,7 +64,7 @@ minecraft {
             systemProperty "forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP"
             systemProperty "forge.logging.console.level", "debug"
 
-            systemProperty "fml.coreMods.load", "cam72cam.mod.UMCMixinPlugin"
+            systemProperty "fml.coreMods.load", "cam72cam.umc.api.UMCMixinPlugin"
         }
 
         register("client")
@@ -142,7 +142,7 @@ jar {
     manifest {
         attributes (
                 'FMLAT': 'accesstransformer.cfg',
-                "FMLCorePlugin": "cam72cam.mod.UMCMixinPlugin",
+                "FMLCorePlugin": "cam72cam.umc.api.UMCMixinPlugin",
                 'FMLCorePluginContainsFMLMod': true,
                 'ForceLoadAsMod': true,
                 'TweakOrder': '0',

src/main/java/cam72cam/mod/Config.java → src/main/java/cam72cam/umc/api/Config.java

@@ -1,6 +1,6 @@
-package cam72cam.mod;
+package cam72cam.umc.api;
 
-import cam72cam.mod.config.ConfigFile;
+import cam72cam.umc.api.config.ConfigFile;
 
 @ConfigFile.Comment("Configuration File")
 @ConfigFile.Name("general")

src/main/java/cam72cam/mod/MinecraftClient.java → src/main/java/cam72cam/umc/api/MinecraftClient.java

@@ -1,10 +1,10 @@
-package cam72cam.mod;
+package cam72cam.umc.api;
 
-import cam72cam.mod.entity.Entity;
-import cam72cam.mod.entity.Player;
-import cam72cam.mod.math.Vec3d;
-import cam72cam.mod.math.Vec3i;
-import cam72cam.mod.world.World;
+import cam72cam.umc.api.entity.Entity;
+import cam72cam.umc.api.entity.Player;
+import cam72cam.umc.api.math.Vec3d;
+import cam72cam.umc.api.math.Vec3i;
+import cam72cam.umc.api.world.World;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.util.math.RayTraceResult;

src/main/java/cam72cam/mod/ModCore.java → src/main/java/cam72cam/umc/api/ModCore.java

@@ -1,21 +1,21 @@
-package cam72cam.mod;
-
-import cam72cam.mod.config.ConfigFile;
-import cam72cam.mod.entity.ModdedEntity;
-import cam72cam.mod.entity.sync.EntitySync;
-import cam72cam.mod.event.ClientEvents;
-import cam72cam.mod.gui.GuiRegistry;
-import cam72cam.mod.input.Mouse;
-import cam72cam.mod.net.Packet;
-import cam72cam.mod.net.PacketDirection;
-import cam72cam.mod.render.BlockRender;
-import cam72cam.mod.render.Light;
-import cam72cam.mod.resource.BuiltinPack;
-import cam72cam.mod.resource.Identifier;
-import cam72cam.mod.text.Command;
-import cam72cam.mod.util.MinecraftFiles;
-import cam72cam.mod.util.ModCoreCommand;
-import cam72cam.mod.world.ChunkManager;
+package cam72cam.umc.api;
+
+import cam72cam.umc.api.config.ConfigFile;
+import cam72cam.umc.api.entity.ModdedEntity;
+import cam72cam.umc.api.entity.sync.EntitySync;
+import cam72cam.umc.api.event.ClientEvents;
+import cam72cam.umc.api.gui.GuiRegistry;
+import cam72cam.umc.api.input.Mouse;
+import cam72cam.umc.api.net.Packet;
+import cam72cam.umc.api.net.PacketDirection;
+import cam72cam.umc.api.render.BlockRender;
+import cam72cam.umc.api.render.Light;
+import cam72cam.umc.api.resource.BuiltinPack;
+import cam72cam.umc.api.resource.Identifier;
+import cam72cam.umc.api.text.Command;
+import cam72cam.umc.api.util.MinecraftFiles;
+import cam72cam.umc.api.util.ModCoreCommand;
+import cam72cam.umc.api.world.ChunkManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
@@ -147,7 +147,7 @@ public List<Mod> getLoadedMods() {
         return mods;
     }
 
-    @SidedProxy(serverSide = "cam72cam.mod.ModCore$ServerProxy", clientSide = "cam72cam.mod.ModCore$ClientProxy", modId = ModCore.MODID)
+    @SidedProxy(serverSide = "cam72cam.umc.api.ModCore$ServerProxy", clientSide = "cam72cam.umc.api.ModCore$ClientProxy", modId = ModCore.MODID)
     private static Proxy proxy;
     /** Hooked into forge's proxy system and fires off corresponding events */
     public static class Proxy {

src/main/java/cam72cam/mod/ModEvent.java → src/main/java/cam72cam/umc/api/ModEvent.java

@@ -1,4 +1,4 @@
-package cam72cam.mod;
+package cam72cam.umc.api;
 
 public enum ModEvent {
     CONSTRUCT, // Mod constructor is called, do your registration (Block, Item, etc...) here

src/main/java/cam72cam/mod/UMCMixinPlugin.java → src/main/java/cam72cam/umc/api/UMCMixinPlugin.java

@@ -1,4 +1,4 @@
-package cam72cam.mod;
+package cam72cam.umc.api;
 
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 import zone.rong.mixinbooter.IEarlyMixinLoader;

src/main/java/cam72cam/mod/block/BlockEntity.java → src/main/java/cam72cam/umc/api/block/BlockEntity.java

@@ -1,19 +1,20 @@
-package cam72cam.mod.block;
-
-import cam72cam.mod.block.tile.TileEntity;
-import cam72cam.mod.energy.IEnergy;
-import cam72cam.mod.entity.Player;
-import cam72cam.mod.entity.boundingbox.IBoundingBox;
-import cam72cam.mod.fluid.ITank;
-import cam72cam.mod.item.IInventory;
-import cam72cam.mod.item.ItemStack;
-import cam72cam.mod.math.Vec3d;
-import cam72cam.mod.math.Vec3i;
-import cam72cam.mod.resource.Identifier;
-import cam72cam.mod.serialization.SerializationException;
-import cam72cam.mod.util.Facing;
-import cam72cam.mod.serialization.TagCompound;
-import cam72cam.mod.world.World;
+package cam72cam.umc.api.block;
+
+import cam72cam.umc.api.block.tile.TileEntity;
+import cam72cam.umc.api.energy.IEnergy;
+import cam72cam.umc.api.entity.Player;
+import cam72cam.umc.api.entity.boundingbox.IBoundingBox;
+import cam72cam.umc.api.fluid.ITank;
+import cam72cam.umc.api.item.IInventory;
+import cam72cam.umc.api.item.ItemStack;
+import cam72cam.umc.api.math.Vec3d;
+import cam72cam.umc.api.math.Vec3i;
+import cam72cam.umc.api.resource.Identifier;
+import cam72cam.umc.api.serialization.SerializationException;
+import cam72cam.umc.api.util.Facing;
+import cam72cam.umc.api.serialization.TagCompound;
+import cam72cam.umc.api.world.World;
+import cam72cam.umc.api.serialization.TagSerializer;
 
 /**
  * Block entity is the building block for more functional blocks in game.  It allows you to save complex data and
@@ -39,7 +40,7 @@ public Vec3i getPos() {
      * Called on the server during chunk load.<br>
      * Called on the client during packet synchronization.
      *
-     * @see cam72cam.mod.serialization.TagSerializer
+     * @see TagSerializer
      */
     public void load(TagCompound nbt) throws SerializationException {
     }
@@ -48,7 +49,7 @@ public void load(TagCompound nbt) throws SerializationException {
      * Use for explicit saving, prefer TagSerializer.<br>
      * Called on the server during chunk save.
      *
-     * @see cam72cam.mod.serialization.TagSerializer
+     * @see TagSerializer
      */
     public void save(TagCompound nbt) throws SerializationException {
     }

src/main/java/cam72cam/mod/block/BlockEntityTickable.java → src/main/java/cam72cam/umc/api/block/BlockEntityTickable.java

@@ -1,8 +1,8 @@
-package cam72cam.mod.block;
+package cam72cam.umc.api.block;
 
-import cam72cam.mod.block.tile.TileEntity;
-import cam72cam.mod.block.tile.TileEntityTickable;
-import cam72cam.mod.resource.Identifier;
+import cam72cam.umc.api.block.tile.TileEntity;
+import cam72cam.umc.api.block.tile.TileEntityTickable;
+import cam72cam.umc.api.resource.Identifier;
 
 /** Wraps BlockEntity and exposes an update function which is called every tick */
 public abstract class BlockEntityTickable extends BlockEntity {

src/main/java/cam72cam/mod/block/BlockType.java → src/main/java/cam72cam/umc/api/block/BlockType.java

@@ -1,17 +1,16 @@
-package cam72cam.mod.block;
-
-import cam72cam.mod.entity.Player;
-import cam72cam.mod.entity.boundingbox.BoundingBox;
-import cam72cam.mod.entity.boundingbox.IBoundingBox;
-import cam72cam.mod.event.CommonEvents;
-import cam72cam.mod.item.ItemStack;
-import cam72cam.mod.math.Vec3d;
-import cam72cam.mod.math.Vec3i;
-import cam72cam.mod.resource.Identifier;
-import cam72cam.mod.util.Facing;
-import cam72cam.mod.util.SingleCache;
-import cam72cam.mod.world.World;
-import net.minecraft.block.Block;
+package cam72cam.umc.api.block;
+
+import cam72cam.umc.api.entity.Player;
+import cam72cam.umc.api.entity.boundingbox.BoundingBox;
+import cam72cam.umc.api.entity.boundingbox.IBoundingBox;
+import cam72cam.umc.api.event.CommonEvents;
+import cam72cam.umc.api.item.ItemStack;
+import cam72cam.umc.api.math.Vec3d;
+import cam72cam.umc.api.math.Vec3i;
+import cam72cam.umc.api.resource.Identifier;
+import cam72cam.umc.api.util.Facing;
+import cam72cam.umc.api.util.SingleCache;
+import cam72cam.umc.api.world.World;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;

src/main/java/cam72cam/mod/block/BlockTypeEntity.java → src/main/java/cam72cam/umc/api/block/BlockTypeEntity.java

@@ -1,19 +1,16 @@
-package cam72cam.mod.block;
-
-import cam72cam.mod.block.tile.TileEntity;
-import cam72cam.mod.entity.Player;
-import cam72cam.mod.entity.boundingbox.BoundingBox;
-import cam72cam.mod.entity.boundingbox.IBoundingBox;
-import cam72cam.mod.item.ItemStack;
-import cam72cam.mod.math.Vec3d;
-import cam72cam.mod.math.Vec3i;
-import cam72cam.mod.util.Facing;
-import cam72cam.mod.world.World;
-import net.minecraft.block.Block;
+package cam72cam.umc.api.block;
+
+import cam72cam.umc.api.block.tile.TileEntity;
+import cam72cam.umc.api.entity.Player;
+import cam72cam.umc.api.entity.boundingbox.IBoundingBox;
+import cam72cam.umc.api.item.ItemStack;
+import cam72cam.umc.api.math.Vec3d;
+import cam72cam.umc.api.math.Vec3i;
+import cam72cam.umc.api.util.Facing;
+import cam72cam.umc.api.world.World;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.property.ExtendedBlockState;

src/main/java/cam72cam/mod/block/IBlockTypeBlock.java → src/main/java/cam72cam/umc/api/block/IBlockTypeBlock.java

@@ -1,4 +1,4 @@
-package cam72cam.mod.block;
+package cam72cam.umc.api.block;
 
 public interface IBlockTypeBlock {
     BlockType getType();

src/main/java/cam72cam/mod/block/IRedstoneProvider.java → src/main/java/cam72cam/umc/api/block/IRedstoneProvider.java

@@ -1,6 +1,6 @@
-package cam72cam.mod.block;
+package cam72cam.umc.api.block;
 
-import cam72cam.mod.util.Facing;
+import cam72cam.umc.api.util.Facing;
 
 public interface IRedstoneProvider {
     int getStrongPower(Facing from);

src/main/java/cam72cam/mod/block/Material.java → src/main/java/cam72cam/umc/api/block/Material.java

@@ -1,4 +1,4 @@
-package cam72cam.mod.block;
+package cam72cam.umc.api.block;
 
 import net.minecraft.block.SoundType;
 

src/main/java/cam72cam/mod/block/PropertyObject.java → src/main/java/cam72cam/umc/api/block/PropertyObject.java

@@ -1,4 +1,4 @@
-package cam72cam.mod.block;
+package cam72cam.umc.api.block;
 
 import net.minecraftforge.common.property.IUnlistedProperty;
 

src/main/java/cam72cam/mod/block/tile/TileEntity.java → src/main/java/cam72cam/umc/api/block/tile/TileEntity.java

@@ -1,21 +1,21 @@
-package cam72cam.mod.block.tile;
-
-import cam72cam.mod.ModCore;
-import cam72cam.mod.block.BlockEntity;
-import cam72cam.mod.energy.IEnergy;
-import cam72cam.mod.entity.boundingbox.BoundingBox;
-import cam72cam.mod.entity.boundingbox.IBoundingBox;
-import cam72cam.mod.fluid.Fluid;
-import cam72cam.mod.fluid.ITank;
-import cam72cam.mod.item.IInventory;
-import cam72cam.mod.math.Vec3i;
-import cam72cam.mod.resource.Identifier;
-import cam72cam.mod.serialization.SerializationException;
-import cam72cam.mod.serialization.TagSerializer;
-import cam72cam.mod.util.Facing;
-import cam72cam.mod.serialization.TagCompound;
-import cam72cam.mod.util.SingleCache;
-import cam72cam.mod.world.World;
+package cam72cam.umc.api.block.tile;
+
+import cam72cam.umc.api.ModCore;
+import cam72cam.umc.api.block.BlockEntity;
+import cam72cam.umc.api.energy.IEnergy;
+import cam72cam.umc.api.entity.boundingbox.BoundingBox;
+import cam72cam.umc.api.entity.boundingbox.IBoundingBox;
+import cam72cam.umc.api.fluid.Fluid;
+import cam72cam.umc.api.fluid.ITank;
+import cam72cam.umc.api.item.IInventory;
+import cam72cam.umc.api.math.Vec3i;
+import cam72cam.umc.api.resource.Identifier;
+import cam72cam.umc.api.serialization.SerializationException;
+import cam72cam.umc.api.serialization.TagSerializer;
+import cam72cam.umc.api.util.Facing;
+import cam72cam.umc.api.serialization.TagCompound;
+import cam72cam.umc.api.util.SingleCache;
+import cam72cam.umc.api.world.World;
 import com.google.common.collect.HashBiMap;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -342,14 +342,14 @@ public boolean canDrainFluidType(FluidStack fluidStack) {
 
                 @Override
                 public int fill(FluidStack resource, boolean doFill) {
-                    int res = target.fill(new cam72cam.mod.fluid.FluidStack(resource), !doFill);
+                    int res = target.fill(new cam72cam.umc.api.fluid.FluidStack(resource), !doFill);
                     return res;
                 }
 
                 @Nullable
                 @Override
                 public FluidStack drain(FluidStack resource, boolean doDrain) {
-                    return target.drain(new cam72cam.mod.fluid.FluidStack(resource), !doDrain).internal;
+                    return target.drain(new cam72cam.umc.api.fluid.FluidStack(resource), !doDrain).internal;
                 }
 
                 @Nullable
@@ -358,7 +358,7 @@ public FluidStack drain(int maxDrain, boolean doDrain) {
                     if (target.getContents().internal == null) {
                         return null;
                     }
-                    return target.drain(new cam72cam.mod.fluid.FluidStack(new FluidStack(target.getContents().internal, maxDrain)), !doDrain).internal;
+                    return target.drain(new cam72cam.umc.api.fluid.FluidStack(new FluidStack(target.getContents().internal, maxDrain)), !doDrain).internal;
                 }
             });
         }
@@ -375,7 +375,7 @@ public int getSlots() {
 
                 @Override
                 public void setStackInSlot(int slot, @Nonnull ItemStack stack) {
-                    target.set(slot, new cam72cam.mod.item.ItemStack(stack));
+                    target.set(slot, new cam72cam.umc.api.item.ItemStack(stack));
                 }
 
                 @Nonnull
@@ -387,7 +387,7 @@ public ItemStack getStackInSlot(int slot) {
                 @Nonnull
                 @Override
                 public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
-                    return target.insert(slot, new cam72cam.mod.item.ItemStack(stack), simulate).internal;
+                    return target.insert(slot, new cam72cam.umc.api.item.ItemStack(stack), simulate).internal;
                 }
 
                 @Nonnull

src/main/java/cam72cam/mod/block/tile/TileEntityTickable.java → src/main/java/cam72cam/umc/api/block/tile/TileEntityTickable.java

@@ -1,9 +1,9 @@
-package cam72cam.mod.block.tile;
+package cam72cam.umc.api.block.tile;
 
-import cam72cam.mod.ModCore;
-import cam72cam.mod.block.BlockEntity;
-import cam72cam.mod.block.BlockEntityTickable;
-import cam72cam.mod.resource.Identifier;
+import cam72cam.umc.api.ModCore;
+import cam72cam.umc.api.block.BlockEntity;
+import cam72cam.umc.api.block.BlockEntityTickable;
+import cam72cam.umc.api.resource.Identifier;
 import net.minecraft.util.ITickable;
 
 /**

src/main/java/cam72cam/mod/config/ConfigFile.java → src/main/java/cam72cam/umc/api/config/ConfigFile.java

@@ -1,6 +1,6 @@
-package cam72cam.mod.config;
+package cam72cam.umc.api.config;
 
-import cam72cam.mod.ModCore;
+import cam72cam.umc.api.ModCore;
 import net.minecraftforge.fml.common.Loader;
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/cam72cam/mod/config/ConfigGui.java → src/main/java/cam72cam/umc/api/config/ConfigGui.java

@@ -1,7 +1,7 @@
-package cam72cam.mod.config;
+package cam72cam.umc.api.config;
 
-import cam72cam.mod.ModCore;
-import cam72cam.mod.gui.screen.*;
+import cam72cam.umc.api.ModCore;
+import cam72cam.umc.api.gui.screen.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 

src/main/java/cam72cam/mod/energy/Energy.java → src/main/java/cam72cam/umc/api/energy/Energy.java

@@ -1,6 +1,6 @@
-package cam72cam.mod.energy;
+package cam72cam.umc.api.energy;
 
-import cam72cam.mod.serialization.TagField;
+import cam72cam.umc.api.serialization.TagField;
 
 import java.util.ArrayList;
 import java.util.List;