Skip to content

Commit 19920e4

Browse files
CodetoilCodetoil
committed
Package migration.
1 parent becfeb2 commit 19920e4

170 files changed

Lines changed: 1268 additions & 1272 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ logs
2828
*.jar
2929

3030
TrackAPI
31+
32+
logs

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ minecraft {
6464
systemProperty "forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP"
6565
systemProperty "forge.logging.console.level", "debug"
6666

67-
systemProperty "fml.coreMods.load", "cam72cam.mod.UMCMixinPlugin"
67+
systemProperty "fml.coreMods.load", "cam72cam.umc.api.UMCMixinPlugin"
6868
}
6969

7070
register("client")
@@ -142,7 +142,7 @@ jar {
142142
manifest {
143143
attributes (
144144
'FMLAT': 'UniversalModCore_at.cfg',
145-
"FMLCorePlugin": "cam72cam.mod.UMCMixinPlugin",
145+
"FMLCorePlugin": "cam72cam.umc.api.UMCMixinPlugin",
146146
'FMLCorePluginContainsFMLMod': true,
147147
'ForceLoadAsMod': true,
148148
'TweakOrder': '0',

src/main/java/cam72cam/mod/Config.java renamed to src/main/java/cam72cam/umc/api/Config.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cam72cam.mod;
1+
package cam72cam.umc.api;
22

3-
import cam72cam.mod.config.ConfigFile;
3+
import cam72cam.umc.api.config.ConfigFile;
44

55
@ConfigFile.Comment("Configuration File")
66
@ConfigFile.Name("general")

src/main/java/cam72cam/mod/MinecraftClient.java renamed to src/main/java/cam72cam/umc/api/MinecraftClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package cam72cam.mod;
1+
package cam72cam.umc.api;
22

3-
import cam72cam.mod.entity.Entity;
4-
import cam72cam.mod.entity.Player;
5-
import cam72cam.mod.math.Vec3d;
6-
import cam72cam.mod.math.Vec3i;
7-
import cam72cam.mod.world.World;
3+
import cam72cam.umc.api.entity.Entity;
4+
import cam72cam.umc.api.entity.Player;
5+
import cam72cam.umc.api.math.Vec3d;
6+
import cam72cam.umc.api.math.Vec3i;
7+
import cam72cam.umc.api.world.World;
88
import net.minecraft.client.Minecraft;
99
import net.minecraft.client.entity.EntityPlayerSP;
1010
import net.minecraft.util.math.RayTraceResult;

src/main/java/cam72cam/mod/ModCore.java renamed to src/main/java/cam72cam/umc/api/ModCore.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
package cam72cam.mod;
2-
3-
import cam72cam.mod.config.ConfigFile;
4-
import cam72cam.mod.entity.ModdedEntity;
5-
import cam72cam.mod.entity.sync.EntitySync;
6-
import cam72cam.mod.event.ClientEvents;
7-
import cam72cam.mod.gui.GuiRegistry;
8-
import cam72cam.mod.input.Mouse;
9-
import cam72cam.mod.net.Packet;
10-
import cam72cam.mod.net.PacketDirection;
11-
import cam72cam.mod.render.BlockRender;
12-
import cam72cam.mod.render.Light;
13-
import cam72cam.mod.resource.BuiltinPack;
14-
import cam72cam.mod.resource.Identifier;
15-
import cam72cam.mod.text.Command;
16-
import cam72cam.mod.util.MinecraftFiles;
17-
import cam72cam.mod.util.ModCoreCommand;
18-
import cam72cam.mod.world.ChunkManager;
1+
package cam72cam.umc.api;
2+
3+
import cam72cam.umc.api.config.ConfigFile;
4+
import cam72cam.umc.api.entity.ModdedEntity;
5+
import cam72cam.umc.api.entity.sync.EntitySync;
6+
import cam72cam.umc.api.event.ClientEvents;
7+
import cam72cam.umc.api.gui.GuiRegistry;
8+
import cam72cam.umc.api.input.Mouse;
9+
import cam72cam.umc.api.net.Packet;
10+
import cam72cam.umc.api.net.PacketDirection;
11+
import cam72cam.umc.api.render.BlockRender;
12+
import cam72cam.umc.api.render.Light;
13+
import cam72cam.umc.api.resource.BuiltinPack;
14+
import cam72cam.umc.api.resource.Identifier;
15+
import cam72cam.umc.api.text.Command;
16+
import cam72cam.umc.api.util.MinecraftFiles;
17+
import cam72cam.umc.api.util.ModCoreCommand;
18+
import cam72cam.umc.api.world.ChunkManager;
1919
import net.minecraft.client.Minecraft;
2020
import net.minecraft.client.resources.IResourcePack;
2121
import net.minecraft.client.resources.SimpleReloadableResourceManager;
@@ -147,7 +147,7 @@ public List<Mod> getLoadedMods() {
147147
return mods;
148148
}
149149

150-
@SidedProxy(serverSide = "cam72cam.mod.ModCore$ServerProxy", clientSide = "cam72cam.mod.ModCore$ClientProxy", modId = ModCore.MODID)
150+
@SidedProxy(serverSide = "cam72cam.umc.api.ModCore$ServerProxy", clientSide = "cam72cam.umc.api.ModCore$ClientProxy", modId = ModCore.MODID)
151151
private static Proxy proxy;
152152
/** Hooked into forge's proxy system and fires off corresponding events */
153153
public static class Proxy {

src/main/java/cam72cam/mod/ModEvent.java renamed to src/main/java/cam72cam/umc/api/ModEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cam72cam.mod;
1+
package cam72cam.umc.api;
22

33
public enum ModEvent {
44
CONSTRUCT, // Mod constructor is called, do your registration (Block, Item, etc...) here

src/main/java/cam72cam/mod/UMCMixinPlugin.java renamed to src/main/java/cam72cam/umc/api/UMCMixinPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cam72cam.mod;
1+
package cam72cam.umc.api;
22

33
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
44
import zone.rong.mixinbooter.IEarlyMixinLoader;

src/main/java/cam72cam/mod/block/BlockEntity.java renamed to src/main/java/cam72cam/umc/api/block/BlockEntity.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
package cam72cam.mod.block;
2-
3-
import cam72cam.mod.block.tile.TileEntity;
4-
import cam72cam.mod.energy.IEnergy;
5-
import cam72cam.mod.entity.Player;
6-
import cam72cam.mod.entity.boundingbox.IBoundingBox;
7-
import cam72cam.mod.fluid.ITank;
8-
import cam72cam.mod.item.IInventory;
9-
import cam72cam.mod.item.ItemStack;
10-
import cam72cam.mod.math.Vec3d;
11-
import cam72cam.mod.math.Vec3i;
12-
import cam72cam.mod.resource.Identifier;
13-
import cam72cam.mod.serialization.SerializationException;
14-
import cam72cam.mod.util.Facing;
15-
import cam72cam.mod.serialization.TagCompound;
16-
import cam72cam.mod.world.World;
1+
package cam72cam.umc.api.block;
2+
3+
import cam72cam.umc.api.block.tile.TileEntity;
4+
import cam72cam.umc.api.energy.IEnergy;
5+
import cam72cam.umc.api.entity.Player;
6+
import cam72cam.umc.api.entity.boundingbox.IBoundingBox;
7+
import cam72cam.umc.api.fluid.ITank;
8+
import cam72cam.umc.api.item.IInventory;
9+
import cam72cam.umc.api.item.ItemStack;
10+
import cam72cam.umc.api.math.Vec3d;
11+
import cam72cam.umc.api.math.Vec3i;
12+
import cam72cam.umc.api.resource.Identifier;
13+
import cam72cam.umc.api.serialization.SerializationException;
14+
import cam72cam.umc.api.util.Facing;
15+
import cam72cam.umc.api.serialization.TagCompound;
16+
import cam72cam.umc.api.world.World;
17+
import cam72cam.umc.api.serialization.TagSerializer;
1718

1819
/**
1920
* 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() {
3940
* Called on the server during chunk load.<br>
4041
* Called on the client during packet synchronization.
4142
*
42-
* @see cam72cam.mod.serialization.TagSerializer
43+
* @see TagSerializer
4344
*/
4445
public void load(TagCompound nbt) throws SerializationException {
4546
}
@@ -48,7 +49,7 @@ public void load(TagCompound nbt) throws SerializationException {
4849
* Use for explicit saving, prefer TagSerializer.<br>
4950
* Called on the server during chunk save.
5051
*
51-
* @see cam72cam.mod.serialization.TagSerializer
52+
* @see TagSerializer
5253
*/
5354
public void save(TagCompound nbt) throws SerializationException {
5455
}

src/main/java/cam72cam/mod/block/BlockEntityTickable.java renamed to src/main/java/cam72cam/umc/api/block/BlockEntityTickable.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package cam72cam.mod.block;
1+
package cam72cam.umc.api.block;
22

3-
import cam72cam.mod.block.tile.TileEntity;
4-
import cam72cam.mod.block.tile.TileEntityTickable;
5-
import cam72cam.mod.resource.Identifier;
3+
import cam72cam.umc.api.block.tile.TileEntity;
4+
import cam72cam.umc.api.block.tile.TileEntityTickable;
5+
import cam72cam.umc.api.resource.Identifier;
66

77
/** Wraps BlockEntity and exposes an update function which is called every tick */
88
public abstract class BlockEntityTickable extends BlockEntity {

src/main/java/cam72cam/mod/block/BlockType.java renamed to src/main/java/cam72cam/umc/api/block/BlockType.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
package cam72cam.mod.block;
2-
3-
import cam72cam.mod.entity.Player;
4-
import cam72cam.mod.entity.boundingbox.BoundingBox;
5-
import cam72cam.mod.entity.boundingbox.IBoundingBox;
6-
import cam72cam.mod.event.CommonEvents;
7-
import cam72cam.mod.item.ItemStack;
8-
import cam72cam.mod.math.Vec3d;
9-
import cam72cam.mod.math.Vec3i;
10-
import cam72cam.mod.resource.Identifier;
11-
import cam72cam.mod.util.Facing;
12-
import cam72cam.mod.util.SingleCache;
13-
import cam72cam.mod.world.World;
14-
import net.minecraft.block.Block;
1+
package cam72cam.umc.api.block;
2+
3+
import cam72cam.umc.api.entity.Player;
4+
import cam72cam.umc.api.entity.boundingbox.BoundingBox;
5+
import cam72cam.umc.api.entity.boundingbox.IBoundingBox;
6+
import cam72cam.umc.api.event.CommonEvents;
7+
import cam72cam.umc.api.item.ItemStack;
8+
import cam72cam.umc.api.math.Vec3d;
9+
import cam72cam.umc.api.math.Vec3i;
10+
import cam72cam.umc.api.resource.Identifier;
11+
import cam72cam.umc.api.util.Facing;
12+
import cam72cam.umc.api.util.SingleCache;
13+
import cam72cam.umc.api.world.World;
1514
import net.minecraft.block.state.BlockFaceShape;
1615
import net.minecraft.block.state.IBlockState;
1716
import net.minecraft.entity.Entity;

0 commit comments

Comments
 (0)