From b100bd60e1d87ac368dbae1bc6eac487bde25cd4 Mon Sep 17 00:00:00 2001 From: Angelina Michalek Date: Tue, 23 Jun 2026 02:45:22 -0400 Subject: [PATCH] Package migration. --- .gitignore | 2 + build.gradle | 4 +- .../cam72cam/{mod => umc/api}/Config.java | 4 +- .../{mod => umc/api}/MinecraftClient.java | 12 +- .../cam72cam/{mod => umc/api}/ModCore.java | 38 +- .../cam72cam/{mod => umc/api}/ModEvent.java | 2 +- .../{mod => umc/api}/UMCMixinPlugin.java | 2 +- .../{mod => umc/api}/block/BlockEntity.java | 37 +- .../api}/block/BlockEntityTickable.java | 8 +- .../{mod => umc/api}/block/BlockType.java | 27 +- .../api}/block/BlockTypeEntity.java | 23 +- .../api}/block/IBlockTypeBlock.java | 2 +- .../api}/block/IRedstoneProvider.java | 4 +- .../{mod => umc/api}/block/Material.java | 2 +- .../api}/block/PropertyObject.java | 2 +- .../api}/block/tile/TileEntity.java | 46 +- .../api}/block/tile/TileEntityTickable.java | 10 +- .../{mod => umc/api}/config/ConfigFile.java | 4 +- .../{mod => umc/api}/config/ConfigGui.java | 6 +- .../{mod => umc/api}/energy/Energy.java | 4 +- .../{mod => umc/api}/energy/IEnergy.java | 2 +- .../{mod => umc/api}/entity/CustomEntity.java | 9 +- .../{mod => umc/api}/entity/DamageType.java | 4 +- .../{mod => umc/api}/entity/Entity.java | 17 +- .../api}/entity/EntityRegistry.java | 18 +- .../{mod => umc/api}/entity/ItemEntity.java | 6 +- .../{mod => umc/api}/entity/Living.java | 2 +- .../{mod => umc/api}/entity/ModdedEntity.java | 54 +- .../{mod => umc/api}/entity/Player.java | 18 +- .../{mod => umc/api}/entity/SeatEntity.java | 20 +- .../api}/entity/boundingbox/BoundingBox.java | 4 +- .../boundingbox/DefaultBoundingBox.java | 4 +- .../api}/entity/boundingbox/IBoundingBox.java | 8 +- .../api}/entity/custom/IClickable.java | 6 +- .../api}/entity/custom/ICollision.java | 5 +- .../api}/entity/custom/IKillable.java | 6 +- .../api}/entity/custom/IRidable.java | 6 +- .../api}/entity/custom/ITickable.java | 2 +- .../api}/entity/custom/IWorldData.java | 4 +- .../api}/entity/sync/EntitySync.java | 18 +- .../{mod => umc/api}/entity/sync/TagSync.java | 6 +- .../{mod => umc/api}/event/ClientEvents.java | 26 +- .../{mod => umc/api}/event/CommonEvents.java | 15 +- .../{mod => umc/api}/event/Event.java | 2 +- .../{mod => umc/api}/fluid/Fluid.java | 2 +- .../{mod => umc/api}/fluid/FluidStack.java | 2 +- .../{mod => umc/api}/fluid/FluidTank.java | 7 +- .../{mod => umc/api}/fluid/ITank.java | 6 +- .../{mod => umc/api}/gui/GuiRegistry.java | 26 +- .../{mod => umc/api}/gui/Progress.java | 4 +- .../gui/container/ClientContainerBuilder.java | 24 +- .../api}/gui/container/IContainer.java | 7 +- .../api}/gui/container/IContainerBuilder.java | 8 +- .../gui/container/ServerContainerBuilder.java | 10 +- .../api}/gui/helpers/GUIHelpers.java | 28 +- .../api}/gui/helpers/GuiScrollBar.java | 2 +- .../api}/gui/helpers/ItemButton.java | 10 +- .../api}/gui/helpers/ItemPickerGUI.java | 5 +- .../{mod => umc/api}/gui/screen/Button.java | 4 +- .../{mod => umc/api}/gui/screen/CheckBox.java | 4 +- .../{mod => umc/api}/gui/screen/IScreen.java | 8 +- .../api}/gui/screen/IScreenBuilder.java | 13 +- .../{mod => umc/api}/gui/screen/IWidget.java | 2 +- .../api}/gui/screen/ScreenBuilder.java | 18 +- .../{mod => umc/api}/gui/screen/Slider.java | 4 +- .../api}/gui/screen/TextField.java | 2 +- .../{mod => umc/api}/input/Keyboard.java | 4 +- .../{mod => umc/api}/input/Mouse.java | 23 +- .../{mod => umc/api}/item/ArmorSlot.java | 2 +- .../{mod => umc/api}/item/ClickResult.java | 2 +- .../{mod => umc/api}/item/CreativeTab.java | 2 +- .../{mod => umc/api}/item/CustomItem.java | 26 +- .../cam72cam/{mod => umc/api}/item/Fuzzy.java | 6 +- .../{mod => umc/api}/item/IInventory.java | 2 +- .../{mod => umc/api}/item/ItemStack.java | 6 +- .../api}/item/ItemStackHandler.java | 6 +- .../{mod => umc/api}/item/Recipes.java | 6 +- .../{mod => umc/api}/item/ToolType.java | 2 +- .../{mod => umc/api}/math/Rotation.java | 4 +- .../cam72cam/{mod => umc/api}/math/Vec3d.java | 2 +- .../cam72cam/{mod => umc/api}/math/Vec3i.java | 4 +- .../global_renderer/MixinRenderGlobal.java | 8 +- .../MixinVanillaWorld.java | 10 +- .../fix/multi_release/MixinJarDiscoverer.java | 2 +- .../{mod => umc/api}/model/obj/Buffers.java | 2 +- .../api}/model/obj/FaceAccessor.java | 4 +- .../api}/model/obj/ImageUtils.java | 4 +- .../{mod => umc/api}/model/obj/MTLParser.java | 2 +- .../{mod => umc/api}/model/obj/Material.java | 2 +- .../api}/model/obj/OBJBuilder.java | 10 +- .../{mod => umc/api}/model/obj/OBJFace.java | 6 +- .../{mod => umc/api}/model/obj/OBJGroup.java | 6 +- .../{mod => umc/api}/model/obj/OBJModel.java | 27 +- .../{mod => umc/api}/model/obj/OBJParser.java | 6 +- .../api}/model/obj/OBJTexturePacker.java | 12 +- .../{mod => umc/api}/model/obj/Vec2f.java | 2 +- .../api}/model/obj/VertexBuffer.java | 2 +- .../cam72cam/{mod => umc/api}/net/Packet.java | 28 +- .../{mod => umc/api}/net/PacketDirection.java | 2 +- .../api}/render/BakedScaledModel.java | 4 +- .../{mod => umc/api}/render/BlockRender.java | 18 +- .../{mod => umc/api}/render/Color.java | 2 +- .../api}/render/EntityRenderer.java | 22 +- .../{mod => umc/api}/render/GLSLShader.java | 8 +- .../{mod => umc/api}/render/GPUInfo.java | 2 +- .../{mod => umc/api}/render/GlobalRender.java | 24 +- .../api}/render/IEntityRender.java | 6 +- .../{mod => umc/api}/render/ItemRender.java | 29 +- .../{mod => umc/api}/render/Light.java | 10 +- .../{mod => umc/api}/render/OptiFine.java | 5 +- .../{mod => umc/api}/render/Particle.java | 14 +- .../api}/render/RenderFunction.java | 4 +- .../{mod => umc/api}/render/ShaderHelper.java | 2 +- .../{mod => umc/api}/render/SpriteSheet.java | 14 +- .../api}/render/StandardModel.java | 20 +- .../api}/render/obj/OBJRender.java | 18 +- .../api}/render/obj/OBJTextureSheet.java | 6 +- .../api}/render/opengl/BlendMode.java | 6 +- .../api}/render/opengl/CustomTexture.java | 10 +- .../api}/render/opengl/DirectDraw.java | 6 +- .../api}/render/opengl/MinecraftTexture.java | 4 +- .../api}/render/opengl/RenderContext.java | 12 +- .../api}/render/opengl/RenderState.java | 8 +- .../api}/render/opengl/Texture.java | 4 +- .../{mod => umc/api}/render/opengl/VBO.java | 8 +- .../api}/resource/BuiltinPack.java | 4 +- .../{mod => umc/api}/resource/Data.java | 6 +- .../{mod => umc/api}/resource/Identifier.java | 2 +- .../api}/serialization/DefaultTagMapper.java | 15 +- .../api}/serialization/ResourceCache.java | 12 +- .../serialization/SerializationException.java | 2 +- .../api}/serialization/StrictTagMapper.java | 2 +- .../api}/serialization/TagCompound.java | 24 +- .../api}/serialization/TagField.java | 2 +- .../api}/serialization/TagMapped.java | 2 +- .../api}/serialization/TagMapper.java | 4 +- .../api}/serialization/TagSerializer.java | 4 +- .../{mod => umc/api}/sound/Audio.java | 10 +- .../{mod => umc/api}/sound/ClientSound.java | 8 +- .../{mod => umc/api}/sound/ISound.java | 4 +- .../{mod => umc/api}/sound/SoundCategory.java | 2 +- .../{mod => umc/api}/sound/StandardSound.java | 2 +- .../{mod => umc/api}/text/Command.java | 6 +- .../{mod => umc/api}/text/PlayerMessage.java | 2 +- .../{mod => umc/api}/text/TextColor.java | 2 +- .../{mod => umc/api}/text/TextUtil.java | 2 +- .../cam72cam/{mod => umc/api}/util/Axis.java | 2 +- .../{mod => umc/api}/util/DegreeFuncs.java | 2 +- .../{mod => umc/api}/util/Facing.java | 11 +- .../{mod => umc/api}/util/FastMath.java | 2 +- .../{ => cam72cam/umc/api}/util/Matrix4.java | 1065 ++++++++--------- .../{mod => umc/api}/util/MinecraftFiles.java | 4 +- .../{mod => umc/api}/util/ModCoreCommand.java | 26 +- .../{mod => umc/api}/util/SingleCache.java | 2 +- .../api}/util/ThrowingFunction.java | 2 +- .../cam72cam/{mod => umc/api}/util/With.java | 2 +- .../{mod => umc/api}/world/BlockInfo.java | 10 +- .../{mod => umc/api}/world/ChunkManager.java | 13 +- .../{mod => umc/api}/world/ChunkPos.java | 2 +- .../api}/world/IBlockEntityCollision.java | 6 +- .../api}/world/IConditionalCollision.java | 2 +- .../{mod => umc/api}/world/World.java | 44 +- .../api}/world/WorldEntityTracker.java | 7 +- .../api}/world/WorldEventListener.java | 6 +- .../mixins.feat.universalmodcore.json | 2 +- .../mixins.fix.universalmodcore.json | 2 +- .../src/main/java/PACKAGEPATH/Mod.java | 2 +- .../api}/model/obj/OBJModelTest.java | 4 +- .../{mod => umc/api}/serialization/Test.java | 8 +- .../api}/util/DegreeFuncsTest.java | 2 +- 170 files changed, 1268 insertions(+), 1272 deletions(-) rename src/main/java/cam72cam/{mod => umc/api}/Config.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/MinecraftClient.java (91%) rename src/main/java/cam72cam/{mod => umc/api}/ModCore.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/ModEvent.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/UMCMixinPlugin.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/block/BlockEntity.java (83%) rename src/main/java/cam72cam/{mod => umc/api}/block/BlockEntityTickable.java (63%) rename src/main/java/cam72cam/{mod => umc/api}/block/BlockType.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/block/BlockTypeEntity.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/block/IBlockTypeBlock.java (66%) rename src/main/java/cam72cam/{mod => umc/api}/block/IRedstoneProvider.java (62%) rename src/main/java/cam72cam/{mod => umc/api}/block/Material.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/block/PropertyObject.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/block/tile/TileEntity.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/block/tile/TileEntityTickable.java (87%) rename src/main/java/cam72cam/{mod => umc/api}/config/ConfigFile.java (99%) rename src/main/java/cam72cam/{mod => umc/api}/config/ConfigGui.java (99%) rename src/main/java/cam72cam/{mod => umc/api}/energy/Energy.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/energy/IEnergy.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/entity/CustomEntity.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/entity/DamageType.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/entity/Entity.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/entity/EntityRegistry.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/entity/ItemEntity.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/entity/Living.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/entity/ModdedEntity.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/entity/Player.java (91%) rename src/main/java/cam72cam/{mod => umc/api}/entity/SeatEntity.java (86%) rename src/main/java/cam72cam/{mod => umc/api}/entity/boundingbox/BoundingBox.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/entity/boundingbox/DefaultBoundingBox.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/entity/boundingbox/IBoundingBox.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/entity/custom/IClickable.java (74%) rename src/main/java/cam72cam/{mod => umc/api}/entity/custom/ICollision.java (68%) rename src/main/java/cam72cam/{mod => umc/api}/entity/custom/IKillable.java (84%) rename src/main/java/cam72cam/{mod => umc/api}/entity/custom/IRidable.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/entity/custom/ITickable.java (86%) rename src/main/java/cam72cam/{mod => umc/api}/entity/custom/IWorldData.java (84%) rename src/main/java/cam72cam/{mod => umc/api}/entity/sync/EntitySync.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/entity/sync/TagSync.java (85%) rename src/main/java/cam72cam/{mod => umc/api}/event/ClientEvents.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/event/CommonEvents.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/event/Event.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/fluid/Fluid.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/fluid/FluidStack.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/fluid/FluidTank.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/fluid/ITank.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/gui/GuiRegistry.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/gui/Progress.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/gui/container/ClientContainerBuilder.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/gui/container/IContainer.java (76%) rename src/main/java/cam72cam/{mod => umc/api}/gui/container/IContainerBuilder.java (91%) rename src/main/java/cam72cam/{mod => umc/api}/gui/container/ServerContainerBuilder.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/gui/helpers/GUIHelpers.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/gui/helpers/GuiScrollBar.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/gui/helpers/ItemButton.java (86%) rename src/main/java/cam72cam/{mod => umc/api}/gui/helpers/ItemPickerGUI.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/Button.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/CheckBox.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/IScreen.java (86%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/IScreenBuilder.java (64%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/IWidget.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/ScreenBuilder.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/Slider.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/gui/screen/TextField.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/input/Keyboard.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/input/Mouse.java (85%) rename src/main/java/cam72cam/{mod => umc/api}/item/ArmorSlot.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/item/ClickResult.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/item/CreativeTab.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/item/CustomItem.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/item/Fuzzy.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/item/IInventory.java (99%) rename src/main/java/cam72cam/{mod => umc/api}/item/ItemStack.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/item/ItemStackHandler.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/item/Recipes.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/item/ToolType.java (90%) rename src/main/java/cam72cam/{mod => umc/api}/math/Rotation.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/math/Vec3d.java (99%) rename src/main/java/cam72cam/{mod => umc/api}/math/Vec3i.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/mixin/feat/global_renderer/MixinRenderGlobal.java (83%) rename src/main/java/cam72cam/{mod => umc/api}/mixin/feat/large_entity_collision/MixinVanillaWorld.java (91%) rename src/main/java/cam72cam/{mod => umc/api}/mixin/fix/multi_release/MixinJarDiscoverer.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/Buffers.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/FaceAccessor.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/ImageUtils.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/MTLParser.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/Material.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/OBJBuilder.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/OBJFace.java (90%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/OBJGroup.java (89%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/OBJModel.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/OBJParser.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/OBJTexturePacker.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/Vec2f.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/model/obj/VertexBuffer.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/net/Packet.java (89%) rename src/main/java/cam72cam/{mod => umc/api}/net/PacketDirection.java (70%) rename src/main/java/cam72cam/{mod => umc/api}/render/BakedScaledModel.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/render/BlockRender.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/Color.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/EntityRenderer.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/render/GLSLShader.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/render/GPUInfo.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/render/GlobalRender.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/render/IEntityRender.java (65%) rename src/main/java/cam72cam/{mod => umc/api}/render/ItemRender.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/Light.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/render/OptiFine.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/render/Particle.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/render/RenderFunction.java (57%) rename src/main/java/cam72cam/{mod => umc/api}/render/ShaderHelper.java (91%) rename src/main/java/cam72cam/{mod => umc/api}/render/SpriteSheet.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/render/StandardModel.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/render/obj/OBJRender.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/obj/OBJTextureSheet.java (82%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/BlendMode.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/CustomTexture.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/DirectDraw.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/MinecraftTexture.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/RenderContext.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/RenderState.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/Texture.java (74%) rename src/main/java/cam72cam/{mod => umc/api}/render/opengl/VBO.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/resource/BuiltinPack.java (99%) rename src/main/java/cam72cam/{mod => umc/api}/resource/Data.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/resource/Identifier.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/DefaultTagMapper.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/ResourceCache.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/SerializationException.java (85%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/StrictTagMapper.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/TagCompound.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/TagField.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/TagMapped.java (88%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/TagMapper.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/serialization/TagSerializer.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/sound/Audio.java (86%) rename src/main/java/cam72cam/{mod => umc/api}/sound/ClientSound.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/sound/ISound.java (86%) rename src/main/java/cam72cam/{mod => umc/api}/sound/SoundCategory.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/sound/StandardSound.java (91%) rename src/main/java/cam72cam/{mod => umc/api}/text/Command.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/text/PlayerMessage.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/text/TextColor.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/text/TextUtil.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/util/Axis.java (94%) rename src/main/java/cam72cam/{mod => umc/api}/util/DegreeFuncs.java (90%) rename src/main/java/cam72cam/{mod => umc/api}/util/Facing.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/util/FastMath.java (86%) rename src/main/java/{ => cam72cam/umc/api}/util/Matrix4.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/util/MinecraftFiles.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/util/ModCoreCommand.java (92%) rename src/main/java/cam72cam/{mod => umc/api}/util/SingleCache.java (93%) rename src/main/java/cam72cam/{mod => umc/api}/util/ThrowingFunction.java (78%) rename src/main/java/cam72cam/{mod => umc/api}/util/With.java (89%) rename src/main/java/cam72cam/{mod => umc/api}/world/BlockInfo.java (77%) rename src/main/java/cam72cam/{mod => umc/api}/world/ChunkManager.java (95%) rename src/main/java/cam72cam/{mod => umc/api}/world/ChunkPos.java (98%) rename src/main/java/cam72cam/{mod => umc/api}/world/IBlockEntityCollision.java (50%) rename src/main/java/cam72cam/{mod => umc/api}/world/IConditionalCollision.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/world/World.java (96%) rename src/main/java/cam72cam/{mod => umc/api}/world/WorldEntityTracker.java (97%) rename src/main/java/cam72cam/{mod => umc/api}/world/WorldEventListener.java (92%) rename src/test/java/cam72cam/{mod => umc/api}/model/obj/OBJModelTest.java (98%) rename src/test/java/cam72cam/{mod => umc/api}/serialization/Test.java (99%) rename src/test/java/cam72cam/{mod => umc/api}/util/DegreeFuncsTest.java (97%) diff --git a/.gitignore b/.gitignore index 700a8bd31..23547207a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ logs *.jar TrackAPI + +logs \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4716fd263..b2f95ae04 100644 --- a/build.gradle +++ b/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', diff --git a/src/main/java/cam72cam/mod/Config.java b/src/main/java/cam72cam/umc/api/Config.java similarity index 93% rename from src/main/java/cam72cam/mod/Config.java rename to src/main/java/cam72cam/umc/api/Config.java index 9de32ab24..02b15ee35 100644 --- a/src/main/java/cam72cam/mod/Config.java +++ b/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") diff --git a/src/main/java/cam72cam/mod/MinecraftClient.java b/src/main/java/cam72cam/umc/api/MinecraftClient.java similarity index 91% rename from src/main/java/cam72cam/mod/MinecraftClient.java rename to src/main/java/cam72cam/umc/api/MinecraftClient.java index 4d7405a6e..4f6943241 100644 --- a/src/main/java/cam72cam/mod/MinecraftClient.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/ModCore.java b/src/main/java/cam72cam/umc/api/ModCore.java similarity index 93% rename from src/main/java/cam72cam/mod/ModCore.java rename to src/main/java/cam72cam/umc/api/ModCore.java index fdaa28644..2728624aa 100644 --- a/src/main/java/cam72cam/mod/ModCore.java +++ b/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 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 { diff --git a/src/main/java/cam72cam/mod/ModEvent.java b/src/main/java/cam72cam/umc/api/ModEvent.java similarity index 93% rename from src/main/java/cam72cam/mod/ModEvent.java rename to src/main/java/cam72cam/umc/api/ModEvent.java index fe857006c..b26c4462a 100644 --- a/src/main/java/cam72cam/mod/ModEvent.java +++ b/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 diff --git a/src/main/java/cam72cam/mod/UMCMixinPlugin.java b/src/main/java/cam72cam/umc/api/UMCMixinPlugin.java similarity index 97% rename from src/main/java/cam72cam/mod/UMCMixinPlugin.java rename to src/main/java/cam72cam/umc/api/UMCMixinPlugin.java index 68b0a0235..3d7d54b4a 100644 --- a/src/main/java/cam72cam/mod/UMCMixinPlugin.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/block/BlockEntity.java b/src/main/java/cam72cam/umc/api/block/BlockEntity.java similarity index 83% rename from src/main/java/cam72cam/mod/block/BlockEntity.java rename to src/main/java/cam72cam/umc/api/block/BlockEntity.java index 852aacfa9..024f123a9 100644 --- a/src/main/java/cam72cam/mod/block/BlockEntity.java +++ b/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.
* 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.
* Called on the server during chunk save. * - * @see cam72cam.mod.serialization.TagSerializer + * @see TagSerializer */ public void save(TagCompound nbt) throws SerializationException { } diff --git a/src/main/java/cam72cam/mod/block/BlockEntityTickable.java b/src/main/java/cam72cam/umc/api/block/BlockEntityTickable.java similarity index 63% rename from src/main/java/cam72cam/mod/block/BlockEntityTickable.java rename to src/main/java/cam72cam/umc/api/block/BlockEntityTickable.java index 1d5f6490b..5799a0c8c 100644 --- a/src/main/java/cam72cam/mod/block/BlockEntityTickable.java +++ b/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 { diff --git a/src/main/java/cam72cam/mod/block/BlockType.java b/src/main/java/cam72cam/umc/api/block/BlockType.java similarity index 95% rename from src/main/java/cam72cam/mod/block/BlockType.java rename to src/main/java/cam72cam/umc/api/block/BlockType.java index cfd4a4cd7..5619b0a18 100644 --- a/src/main/java/cam72cam/mod/block/BlockType.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/block/BlockTypeEntity.java b/src/main/java/cam72cam/umc/api/block/BlockTypeEntity.java similarity index 93% rename from src/main/java/cam72cam/mod/block/BlockTypeEntity.java rename to src/main/java/cam72cam/umc/api/block/BlockTypeEntity.java index 8c144f450..551cc696f 100644 --- a/src/main/java/cam72cam/mod/block/BlockTypeEntity.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/block/IBlockTypeBlock.java b/src/main/java/cam72cam/umc/api/block/IBlockTypeBlock.java similarity index 66% rename from src/main/java/cam72cam/mod/block/IBlockTypeBlock.java rename to src/main/java/cam72cam/umc/api/block/IBlockTypeBlock.java index f53fcaa1c..a3e1697ac 100644 --- a/src/main/java/cam72cam/mod/block/IBlockTypeBlock.java +++ b/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(); diff --git a/src/main/java/cam72cam/mod/block/IRedstoneProvider.java b/src/main/java/cam72cam/umc/api/block/IRedstoneProvider.java similarity index 62% rename from src/main/java/cam72cam/mod/block/IRedstoneProvider.java rename to src/main/java/cam72cam/umc/api/block/IRedstoneProvider.java index b6c254af4..ce13d8240 100644 --- a/src/main/java/cam72cam/mod/block/IRedstoneProvider.java +++ b/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); diff --git a/src/main/java/cam72cam/mod/block/Material.java b/src/main/java/cam72cam/umc/api/block/Material.java similarity index 97% rename from src/main/java/cam72cam/mod/block/Material.java rename to src/main/java/cam72cam/umc/api/block/Material.java index d5881aabc..8edc5b66d 100644 --- a/src/main/java/cam72cam/mod/block/Material.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/block/PropertyObject.java b/src/main/java/cam72cam/umc/api/block/PropertyObject.java similarity index 95% rename from src/main/java/cam72cam/mod/block/PropertyObject.java rename to src/main/java/cam72cam/umc/api/block/PropertyObject.java index 1889d4267..5344c9c54 100644 --- a/src/main/java/cam72cam/mod/block/PropertyObject.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/block/tile/TileEntity.java b/src/main/java/cam72cam/umc/api/block/tile/TileEntity.java similarity index 92% rename from src/main/java/cam72cam/mod/block/tile/TileEntity.java rename to src/main/java/cam72cam/umc/api/block/tile/TileEntity.java index 40e4e9976..244878744 100644 --- a/src/main/java/cam72cam/mod/block/tile/TileEntity.java +++ b/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 diff --git a/src/main/java/cam72cam/mod/block/tile/TileEntityTickable.java b/src/main/java/cam72cam/umc/api/block/tile/TileEntityTickable.java similarity index 87% rename from src/main/java/cam72cam/mod/block/tile/TileEntityTickable.java rename to src/main/java/cam72cam/umc/api/block/tile/TileEntityTickable.java index d38be1b08..3b6e2ba0e 100644 --- a/src/main/java/cam72cam/mod/block/tile/TileEntityTickable.java +++ b/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; /** diff --git a/src/main/java/cam72cam/mod/config/ConfigFile.java b/src/main/java/cam72cam/umc/api/config/ConfigFile.java similarity index 99% rename from src/main/java/cam72cam/mod/config/ConfigFile.java rename to src/main/java/cam72cam/umc/api/config/ConfigFile.java index 82bc4cb95..22275ad4d 100644 --- a/src/main/java/cam72cam/mod/config/ConfigFile.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/config/ConfigGui.java b/src/main/java/cam72cam/umc/api/config/ConfigGui.java similarity index 99% rename from src/main/java/cam72cam/mod/config/ConfigGui.java rename to src/main/java/cam72cam/umc/api/config/ConfigGui.java index 99e836aad..3f08eaf97 100644 --- a/src/main/java/cam72cam/mod/config/ConfigGui.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/energy/Energy.java b/src/main/java/cam72cam/umc/api/energy/Energy.java similarity index 94% rename from src/main/java/cam72cam/mod/energy/Energy.java rename to src/main/java/cam72cam/umc/api/energy/Energy.java index b817e0503..16818ef6f 100644 --- a/src/main/java/cam72cam/mod/energy/Energy.java +++ b/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; diff --git a/src/main/java/cam72cam/mod/energy/IEnergy.java b/src/main/java/cam72cam/umc/api/energy/IEnergy.java similarity index 97% rename from src/main/java/cam72cam/mod/energy/IEnergy.java rename to src/main/java/cam72cam/umc/api/energy/IEnergy.java index c65e476fb..e05dec265 100644 --- a/src/main/java/cam72cam/mod/energy/IEnergy.java +++ b/src/main/java/cam72cam/umc/api/energy/IEnergy.java @@ -1,4 +1,4 @@ -package cam72cam.mod.energy; +package cam72cam.umc.api.energy; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/cam72cam/mod/entity/CustomEntity.java b/src/main/java/cam72cam/umc/api/entity/CustomEntity.java similarity index 92% rename from src/main/java/cam72cam/mod/entity/CustomEntity.java rename to src/main/java/cam72cam/umc/api/entity/CustomEntity.java index fd4c84fbd..18e5f866f 100644 --- a/src/main/java/cam72cam/mod/entity/CustomEntity.java +++ b/src/main/java/cam72cam/umc/api/entity/CustomEntity.java @@ -1,7 +1,6 @@ -package cam72cam.mod.entity; +package cam72cam.umc.api.entity; -import cam72cam.mod.entity.sync.EntitySync; -import cam72cam.mod.world.World; +import cam72cam.umc.api.entity.sync.EntitySync; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.math.MathHelper; @@ -67,7 +66,7 @@ public int getPassengerCount() { } @Override - public void addPassenger(cam72cam.mod.entity.Entity passenger) { + public void addPassenger(Entity passenger) { if (passenger.getRiding() instanceof CustomEntity) { // If they are already riding a custom passenger, don't fire the dismount handler directly ((ModdedEntity)passenger.getRiding().internal).moveRiderTo(passenger, this); @@ -77,7 +76,7 @@ public void addPassenger(cam72cam.mod.entity.Entity passenger) { } @Override - public boolean isPassenger(cam72cam.mod.entity.Entity passenger) { + public boolean isPassenger(Entity passenger) { return internal.isPassenger(passenger); } diff --git a/src/main/java/cam72cam/mod/entity/DamageType.java b/src/main/java/cam72cam/umc/api/entity/DamageType.java similarity index 95% rename from src/main/java/cam72cam/mod/entity/DamageType.java rename to src/main/java/cam72cam/umc/api/entity/DamageType.java index 354f9ee0b..fcd592afc 100644 --- a/src/main/java/cam72cam/mod/entity/DamageType.java +++ b/src/main/java/cam72cam/umc/api/entity/DamageType.java @@ -1,6 +1,6 @@ -package cam72cam.mod.entity; +package cam72cam.umc.api.entity; -import cam72cam.mod.resource.Identifier; +import cam72cam.umc.api.resource.Identifier; import net.minecraft.util.DamageSource; import java.util.HashMap; diff --git a/src/main/java/cam72cam/mod/entity/Entity.java b/src/main/java/cam72cam/umc/api/entity/Entity.java similarity index 95% rename from src/main/java/cam72cam/mod/entity/Entity.java rename to src/main/java/cam72cam/umc/api/entity/Entity.java index 4bb2d20d8..9f8c422bd 100644 --- a/src/main/java/cam72cam/mod/entity/Entity.java +++ b/src/main/java/cam72cam/umc/api/entity/Entity.java @@ -1,13 +1,12 @@ -package cam72cam.mod.entity; +package cam72cam.umc.api.entity; -import cam72cam.mod.entity.boundingbox.IBoundingBox; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.util.SingleCache; -import cam72cam.mod.world.World; +import cam72cam.umc.api.entity.boundingbox.IBoundingBox; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.util.SingleCache; +import cam72cam.umc.api.world.World; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraft.world.Explosion; @@ -218,11 +217,11 @@ public int getPassengerCount() { return internal.getPassengers().size(); } - public void addPassenger(cam72cam.mod.entity.Entity passenger) { + public void addPassenger(Entity passenger) { passenger.internal.startRiding(internal); } - public boolean isPassenger(cam72cam.mod.entity.Entity passenger) { + public boolean isPassenger(Entity passenger) { return internal.isPassenger(passenger.internal); } diff --git a/src/main/java/cam72cam/mod/entity/EntityRegistry.java b/src/main/java/cam72cam/umc/api/entity/EntityRegistry.java similarity index 92% rename from src/main/java/cam72cam/mod/entity/EntityRegistry.java rename to src/main/java/cam72cam/umc/api/entity/EntityRegistry.java index f9ff4045f..5e309d995 100644 --- a/src/main/java/cam72cam/mod/entity/EntityRegistry.java +++ b/src/main/java/cam72cam/umc/api/entity/EntityRegistry.java @@ -1,12 +1,12 @@ -package cam72cam.mod.entity; - -import cam72cam.mod.ModCore; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.event.CommonEvents; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.serialization.TagCompound; -import cam72cam.mod.text.PlayerMessage; -import cam72cam.mod.world.World; +package cam72cam.umc.api.entity; + +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.event.CommonEvents; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.serialization.TagCompound; +import cam72cam.umc.api.text.PlayerMessage; +import cam72cam.umc.api.world.World; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiDisconnected; import net.minecraft.client.gui.GuiMainMenu; diff --git a/src/main/java/cam72cam/mod/entity/ItemEntity.java b/src/main/java/cam72cam/umc/api/entity/ItemEntity.java similarity index 96% rename from src/main/java/cam72cam/mod/entity/ItemEntity.java rename to src/main/java/cam72cam/umc/api/entity/ItemEntity.java index 4685b17e7..700c8116b 100644 --- a/src/main/java/cam72cam/mod/entity/ItemEntity.java +++ b/src/main/java/cam72cam/umc/api/entity/ItemEntity.java @@ -1,7 +1,7 @@ -package cam72cam.mod.entity; +package cam72cam.umc.api.entity; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.world.World; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.world.World; import net.minecraft.entity.item.EntityItem; /** diff --git a/src/main/java/cam72cam/mod/entity/Living.java b/src/main/java/cam72cam/umc/api/entity/Living.java similarity index 95% rename from src/main/java/cam72cam/mod/entity/Living.java rename to src/main/java/cam72cam/umc/api/entity/Living.java index a62c293a0..6abdff0c3 100644 --- a/src/main/java/cam72cam/mod/entity/Living.java +++ b/src/main/java/cam72cam/umc/api/entity/Living.java @@ -1,4 +1,4 @@ -package cam72cam.mod.entity; +package cam72cam.umc.api.entity; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/cam72cam/mod/entity/ModdedEntity.java b/src/main/java/cam72cam/umc/api/entity/ModdedEntity.java similarity index 92% rename from src/main/java/cam72cam/mod/entity/ModdedEntity.java rename to src/main/java/cam72cam/umc/api/entity/ModdedEntity.java index 5613fd23d..4560ab7e0 100644 --- a/src/main/java/cam72cam/mod/entity/ModdedEntity.java +++ b/src/main/java/cam72cam/umc/api/entity/ModdedEntity.java @@ -1,16 +1,16 @@ -package cam72cam.mod.entity; - -import cam72cam.mod.ModCore; -import cam72cam.mod.entity.boundingbox.BoundingBox; -import cam72cam.mod.entity.boundingbox.IBoundingBox; -import cam72cam.mod.entity.custom.*; -import cam72cam.mod.entity.sync.TagSync; -import cam72cam.mod.item.ClickResult; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.net.Packet; -import cam72cam.mod.serialization.*; -import cam72cam.mod.util.SingleCache; +package cam72cam.umc.api.entity; + +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.entity.boundingbox.BoundingBox; +import cam72cam.umc.api.entity.boundingbox.IBoundingBox; +import cam72cam.umc.api.entity.custom.*; +import cam72cam.umc.api.entity.sync.TagSync; +import cam72cam.umc.api.item.ClickResult; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.net.Packet; +import cam72cam.umc.api.serialization.*; +import cam72cam.umc.api.util.SingleCache; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -211,7 +211,7 @@ private void save(TagCompound data) { /** @see #load */ @Override public final void readSpawnData(ByteBuf additionalData) { - if (cam72cam.mod.world.World.get(world) == null) { + if (cam72cam.umc.api.world.World.get(world) == null) { // This can happen during a sudden disconnect... return; } @@ -275,7 +275,7 @@ public final boolean processInitialInteract(EntityPlayer player, EnumHand hand) /** @see IKillable */ @Override public final boolean attackEntityFrom(DamageSource damagesource, float amount) { - cam72cam.mod.entity.Entity wrapEnt = damagesource.getTrueSource() != null ? self.getWorld().getEntity(damagesource.getTrueSource()) : null; + cam72cam.umc.api.entity.Entity wrapEnt = damagesource.getTrueSource() != null ? self.getWorld().getEntity(damagesource.getTrueSource()) : null; DamageType type; if (damagesource.isExplosion()) { type = DamageType.EXPLOSION; @@ -310,7 +310,7 @@ public boolean canFitPassenger(Entity passenger) { } /** Passenger offset from entity center rotated by entity yaw */ - private Vec3d calculatePassengerOffset(cam72cam.mod.entity.Entity passenger) { + private Vec3d calculatePassengerOffset(cam72cam.umc.api.entity.Entity passenger) { return passenger.getPosition().subtract(self.getPosition()).rotateYaw(self.getRotationYaw()); } @@ -331,7 +331,7 @@ public final void addPassenger(Entity entity) { if (!world.isRemote) { SeatEntity seat = new SeatEntity(world); seat.setup(this, entity); - cam72cam.mod.entity.Entity passenger = self.getWorld().getEntity(entity); + cam72cam.umc.api.entity.Entity passenger = self.getWorld().getEntity(entity); passengerPositions.put(entity.getPersistentID(), iRidable.getMountOffset(passenger, calculatePassengerOffset(passenger))); entity.startRiding(seat); //updateSeat(seat); Don't do this here, can cause StackOverflow @@ -344,7 +344,7 @@ public final void addPassenger(Entity entity) { * Returns passengers that are riding via seats * @see CustomEntity#getPassengers */ - List getActualPassengers() { + List getActualPassengers() { return seats.stream() .map(SeatEntity::getEntityPassenger) .filter(Objects::nonNull) @@ -361,7 +361,7 @@ void updateSeat(SeatEntity seat) { seats.add(seat); } - cam72cam.mod.entity.Entity passenger = seat.getEntityPassenger(); + cam72cam.umc.api.entity.Entity passenger = seat.getEntityPassenger(); if (passenger == null) return; Vec3d offset = passengerPositions.get(passenger.getUUID()); @@ -404,11 +404,11 @@ void updateSeat(SeatEntity seat) { } /** @see CustomEntity#isPassenger */ - boolean isPassenger(cam72cam.mod.entity.Entity passenger) { + boolean isPassenger(cam72cam.umc.api.entity.Entity passenger) { return getActualPassengers().stream().anyMatch(p -> p.getUUID().equals(passenger.getUUID())); } - public void moveRiderTo(cam72cam.mod.entity.Entity entity, CustomEntity other) { + public void moveRiderTo(cam72cam.umc.api.entity.Entity entity, CustomEntity other) { if (other.internal.iRidable.canFitPassenger(entity)) { SeatEntity seat = (SeatEntity) entity.internal.getRidingEntity(); this.seats.remove(seat); @@ -428,7 +428,7 @@ public void moveRiderTo(cam72cam.mod.entity.Entity entity, CustomEntity other) { * @see SeatEntity#removePassenger */ void removeSeat(SeatEntity seat) { - cam72cam.mod.entity.Entity passenger = seat.getEntityPassenger(); + cam72cam.umc.api.entity.Entity passenger = seat.getEntityPassenger(); if (passenger != null) { Vec3d offset = passengerPositions.get(passenger.getUUID()); if (offset != null) { @@ -452,9 +452,9 @@ void removeSeat(SeatEntity seat) { } /** @see CustomEntity#removePassenger */ - void removePassenger(cam72cam.mod.entity.Entity passenger) { + void removePassenger(cam72cam.umc.api.entity.Entity passenger) { for (SeatEntity seat : this.seats) { - cam72cam.mod.entity.Entity seatPass = seat.getEntityPassenger(); + cam72cam.umc.api.entity.Entity seatPass = seat.getEntityPassenger(); if (seatPass != null && seatPass.getUUID().equals(passenger.getUUID())) { passenger.internal.dismountRidingEntity(); break; @@ -551,7 +551,7 @@ public TagAccessor> apply(Class> type, String public static class PassengerPositionsPacket extends Packet { @TagField - private cam72cam.mod.entity.Entity target; + private cam72cam.umc.api.entity.Entity target; @TagField(mapper = PassengerMapper.class) private Map passengerPositions = new HashMap<>(); @@ -576,11 +576,11 @@ public static class PassengerSeatPacket extends Packet { @TagField private CustomEntity target; @TagField - private cam72cam.mod.entity.Entity rider; + private cam72cam.umc.api.entity.Entity rider; public PassengerSeatPacket() {} - public PassengerSeatPacket(CustomEntity target, cam72cam.mod.entity.Entity rider) { + public PassengerSeatPacket(CustomEntity target, cam72cam.umc.api.entity.Entity rider) { this.target = target; this.rider = rider; } diff --git a/src/main/java/cam72cam/mod/entity/Player.java b/src/main/java/cam72cam/umc/api/entity/Player.java similarity index 91% rename from src/main/java/cam72cam/mod/entity/Player.java rename to src/main/java/cam72cam/umc/api/entity/Player.java index 2156f0c9f..096baae7a 100644 --- a/src/main/java/cam72cam/mod/entity/Player.java +++ b/src/main/java/cam72cam/umc/api/entity/Player.java @@ -1,12 +1,12 @@ -package cam72cam.mod.entity; - -import cam72cam.mod.item.ClickResult; -import cam72cam.mod.item.IInventory; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.text.PlayerMessage; -import cam72cam.mod.util.Facing; +package cam72cam.umc.api.entity; + +import cam72cam.umc.api.item.ClickResult; +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.text.PlayerMessage; +import cam72cam.umc.api.util.Facing; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumHand; import net.minecraftforge.server.permission.DefaultPermissionLevel; diff --git a/src/main/java/cam72cam/mod/entity/SeatEntity.java b/src/main/java/cam72cam/umc/api/entity/SeatEntity.java similarity index 86% rename from src/main/java/cam72cam/mod/entity/SeatEntity.java rename to src/main/java/cam72cam/umc/api/entity/SeatEntity.java index 1957fa677..d27793a1a 100644 --- a/src/main/java/cam72cam/mod/entity/SeatEntity.java +++ b/src/main/java/cam72cam/umc/api/entity/SeatEntity.java @@ -1,8 +1,8 @@ -package cam72cam.mod.entity; +package cam72cam.umc.api.entity; -import cam72cam.mod.ModCore; -import cam72cam.mod.serialization.TagCompound; -import cam72cam.mod.world.World; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.serialization.TagCompound; +import cam72cam.umc.api.world.World; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; @@ -75,7 +75,7 @@ public void onUpdate() { if (getPassengers().isEmpty()) { if (this.ticks < 20) { if (!hasHadPassenger) { - cam72cam.mod.entity.Entity toRide = World.get(world).getEntity(passenger, cam72cam.mod.entity.Entity.class); + cam72cam.umc.api.entity.Entity toRide = World.get(world).getEntity(passenger, cam72cam.umc.api.entity.Entity.class); if (toRide != null) { ModCore.debug("FORCE RIDER"); toRide.internal.startRiding(this, true); @@ -107,8 +107,8 @@ public void moveTo(ModdedEntity moddedEntity) { this.parent = moddedEntity.getUniqueID(); } - public cam72cam.mod.entity.Entity getParent() { - cam72cam.mod.entity.Entity linked = World.get(world).getEntity(parent, cam72cam.mod.entity.Entity.class); + public cam72cam.umc.api.entity.Entity getParent() { + cam72cam.umc.api.entity.Entity linked = World.get(world).getEntity(parent, cam72cam.umc.api.entity.Entity.class); if (linked != null && linked.internal instanceof ModdedEntity) { return linked; } @@ -122,7 +122,7 @@ public double getMountedYOffset() { @Override public final void updatePassenger(net.minecraft.entity.Entity passenger) { - cam72cam.mod.entity.Entity linked = World.get(world).getEntity(parent, cam72cam.mod.entity.Entity.class); + cam72cam.umc.api.entity.Entity linked = World.get(world).getEntity(parent, cam72cam.umc.api.entity.Entity.class); if (linked != null && linked.internal instanceof ModdedEntity) { ((ModdedEntity) linked.internal).updateSeat(this); } @@ -135,14 +135,14 @@ public boolean shouldRiderSit() { @Override public final void removePassenger(net.minecraft.entity.Entity passenger) { - cam72cam.mod.entity.Entity linked = World.get(world).getEntity(parent, cam72cam.mod.entity.Entity.class); + cam72cam.umc.api.entity.Entity linked = World.get(world).getEntity(parent, cam72cam.umc.api.entity.Entity.class); if (linked != null && linked.internal instanceof ModdedEntity) { ((ModdedEntity) linked.internal).removeSeat(this); } super.removePassenger(passenger); } - public cam72cam.mod.entity.Entity getEntityPassenger() { + public cam72cam.umc.api.entity.Entity getEntityPassenger() { if (this.isDead) { return null; } diff --git a/src/main/java/cam72cam/mod/entity/boundingbox/BoundingBox.java b/src/main/java/cam72cam/umc/api/entity/boundingbox/BoundingBox.java similarity index 97% rename from src/main/java/cam72cam/mod/entity/boundingbox/BoundingBox.java rename to src/main/java/cam72cam/umc/api/entity/boundingbox/BoundingBox.java index 7543a0262..fa9e5d809 100644 --- a/src/main/java/cam72cam/mod/entity/boundingbox/BoundingBox.java +++ b/src/main/java/cam72cam/umc/api/entity/boundingbox/BoundingBox.java @@ -1,6 +1,6 @@ -package cam72cam.mod.entity.boundingbox; +package cam72cam.umc.api.entity.boundingbox; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.math.Vec3d; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; diff --git a/src/main/java/cam72cam/mod/entity/boundingbox/DefaultBoundingBox.java b/src/main/java/cam72cam/umc/api/entity/boundingbox/DefaultBoundingBox.java similarity index 97% rename from src/main/java/cam72cam/mod/entity/boundingbox/DefaultBoundingBox.java rename to src/main/java/cam72cam/umc/api/entity/boundingbox/DefaultBoundingBox.java index 4d4f54b90..5b40a449d 100644 --- a/src/main/java/cam72cam/mod/entity/boundingbox/DefaultBoundingBox.java +++ b/src/main/java/cam72cam/umc/api/entity/boundingbox/DefaultBoundingBox.java @@ -1,6 +1,6 @@ -package cam72cam.mod.entity.boundingbox; +package cam72cam.umc.api.entity.boundingbox; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.math.Vec3d; import net.minecraft.util.math.AxisAlignedBB; /** Default implementation of IBoundingBox, do not use directly! */ diff --git a/src/main/java/cam72cam/mod/entity/boundingbox/IBoundingBox.java b/src/main/java/cam72cam/umc/api/entity/boundingbox/IBoundingBox.java similarity index 93% rename from src/main/java/cam72cam/mod/entity/boundingbox/IBoundingBox.java rename to src/main/java/cam72cam/umc/api/entity/boundingbox/IBoundingBox.java index 6d266594f..fc13d6855 100644 --- a/src/main/java/cam72cam/mod/entity/boundingbox/IBoundingBox.java +++ b/src/main/java/cam72cam/umc/api/entity/boundingbox/IBoundingBox.java @@ -1,8 +1,8 @@ -package cam72cam.mod.entity.boundingbox; +package cam72cam.umc.api.entity.boundingbox; -import cam72cam.mod.block.tile.TileEntity; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; +import cam72cam.umc.api.block.tile.TileEntity; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; import net.minecraft.block.Block; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/cam72cam/mod/entity/custom/IClickable.java b/src/main/java/cam72cam/umc/api/entity/custom/IClickable.java similarity index 74% rename from src/main/java/cam72cam/mod/entity/custom/IClickable.java rename to src/main/java/cam72cam/umc/api/entity/custom/IClickable.java index b951b7ad5..510c04930 100644 --- a/src/main/java/cam72cam/mod/entity/custom/IClickable.java +++ b/src/main/java/cam72cam/umc/api/entity/custom/IClickable.java @@ -1,7 +1,7 @@ -package cam72cam.mod.entity.custom; +package cam72cam.umc.api.entity.custom; -import cam72cam.mod.entity.Player; -import cam72cam.mod.item.ClickResult; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.item.ClickResult; public interface IClickable { IClickable NOP = (player, hand) -> ClickResult.PASS; diff --git a/src/main/java/cam72cam/mod/entity/custom/ICollision.java b/src/main/java/cam72cam/umc/api/entity/custom/ICollision.java similarity index 68% rename from src/main/java/cam72cam/mod/entity/custom/ICollision.java rename to src/main/java/cam72cam/umc/api/entity/custom/ICollision.java index a053a1348..3a939aa4e 100644 --- a/src/main/java/cam72cam/mod/entity/custom/ICollision.java +++ b/src/main/java/cam72cam/umc/api/entity/custom/ICollision.java @@ -1,7 +1,6 @@ -package cam72cam.mod.entity.custom; +package cam72cam.umc.api.entity.custom; -import cam72cam.mod.entity.boundingbox.IBoundingBox; -import net.minecraft.util.math.AxisAlignedBB; +import cam72cam.umc.api.entity.boundingbox.IBoundingBox; public interface ICollision { ICollision NOP = () -> IBoundingBox.ORIGIN; diff --git a/src/main/java/cam72cam/mod/entity/custom/IKillable.java b/src/main/java/cam72cam/umc/api/entity/custom/IKillable.java similarity index 84% rename from src/main/java/cam72cam/mod/entity/custom/IKillable.java rename to src/main/java/cam72cam/umc/api/entity/custom/IKillable.java index d598e37c1..f7564e85b 100644 --- a/src/main/java/cam72cam/mod/entity/custom/IKillable.java +++ b/src/main/java/cam72cam/umc/api/entity/custom/IKillable.java @@ -1,7 +1,7 @@ -package cam72cam.mod.entity.custom; +package cam72cam.umc.api.entity.custom; -import cam72cam.mod.entity.DamageType; -import cam72cam.mod.entity.Entity; +import cam72cam.umc.api.entity.DamageType; +import cam72cam.umc.api.entity.Entity; public interface IKillable { IKillable NOP = new IKillable() { diff --git a/src/main/java/cam72cam/mod/entity/custom/IRidable.java b/src/main/java/cam72cam/umc/api/entity/custom/IRidable.java similarity index 92% rename from src/main/java/cam72cam/mod/entity/custom/IRidable.java rename to src/main/java/cam72cam/umc/api/entity/custom/IRidable.java index 626aa9da9..c0d448ace 100644 --- a/src/main/java/cam72cam/mod/entity/custom/IRidable.java +++ b/src/main/java/cam72cam/umc/api/entity/custom/IRidable.java @@ -1,7 +1,7 @@ -package cam72cam.mod.entity.custom; +package cam72cam.umc.api.entity.custom; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.math.Vec3d; public interface IRidable { IRidable NOP = new IRidable() { diff --git a/src/main/java/cam72cam/mod/entity/custom/ITickable.java b/src/main/java/cam72cam/umc/api/entity/custom/ITickable.java similarity index 86% rename from src/main/java/cam72cam/mod/entity/custom/ITickable.java rename to src/main/java/cam72cam/umc/api/entity/custom/ITickable.java index c5e5fed77..5ab0332eb 100644 --- a/src/main/java/cam72cam/mod/entity/custom/ITickable.java +++ b/src/main/java/cam72cam/umc/api/entity/custom/ITickable.java @@ -1,4 +1,4 @@ -package cam72cam.mod.entity.custom; +package cam72cam.umc.api.entity.custom; public interface ITickable { ITickable NOP = () -> { diff --git a/src/main/java/cam72cam/mod/entity/custom/IWorldData.java b/src/main/java/cam72cam/umc/api/entity/custom/IWorldData.java similarity index 84% rename from src/main/java/cam72cam/mod/entity/custom/IWorldData.java rename to src/main/java/cam72cam/umc/api/entity/custom/IWorldData.java index 8e1bd040f..c4f6979cf 100644 --- a/src/main/java/cam72cam/mod/entity/custom/IWorldData.java +++ b/src/main/java/cam72cam/umc/api/entity/custom/IWorldData.java @@ -1,6 +1,6 @@ -package cam72cam.mod.entity.custom; +package cam72cam.umc.api.entity.custom; -import cam72cam.mod.serialization.TagCompound; +import cam72cam.umc.api.serialization.TagCompound; public interface IWorldData { IWorldData NOP = new IWorldData() { diff --git a/src/main/java/cam72cam/mod/entity/sync/EntitySync.java b/src/main/java/cam72cam/umc/api/entity/sync/EntitySync.java similarity index 94% rename from src/main/java/cam72cam/mod/entity/sync/EntitySync.java rename to src/main/java/cam72cam/umc/api/entity/sync/EntitySync.java index c58b9f71f..733369895 100644 --- a/src/main/java/cam72cam/mod/entity/sync/EntitySync.java +++ b/src/main/java/cam72cam/umc/api/entity/sync/EntitySync.java @@ -1,12 +1,12 @@ -package cam72cam.mod.entity.sync; - -import cam72cam.mod.ModCore; -import cam72cam.mod.entity.CustomEntity; -import cam72cam.mod.net.Packet; -import cam72cam.mod.serialization.SerializationException; -import cam72cam.mod.serialization.TagCompound; -import cam72cam.mod.serialization.TagField; -import cam72cam.mod.serialization.TagSerializer; +package cam72cam.umc.api.entity.sync; + +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.entity.CustomEntity; +import cam72cam.umc.api.net.Packet; +import cam72cam.umc.api.serialization.SerializationException; +import cam72cam.umc.api.serialization.TagCompound; +import cam72cam.umc.api.serialization.TagField; +import cam72cam.umc.api.serialization.TagSerializer; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import net.minecraft.nbt.NBTBase; diff --git a/src/main/java/cam72cam/mod/entity/sync/TagSync.java b/src/main/java/cam72cam/umc/api/entity/sync/TagSync.java similarity index 85% rename from src/main/java/cam72cam/mod/entity/sync/TagSync.java rename to src/main/java/cam72cam/umc/api/entity/sync/TagSync.java index 632baf66f..bea37570c 100644 --- a/src/main/java/cam72cam/mod/entity/sync/TagSync.java +++ b/src/main/java/cam72cam/umc/api/entity/sync/TagSync.java @@ -1,4 +1,6 @@ -package cam72cam.mod.entity.sync; +package cam72cam.umc.api.entity.sync; + +import cam72cam.umc.api.serialization.TagField; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -6,7 +8,7 @@ /** * Annotation that this @TagField should be auto-synchronized every tick between server and client * - * @see cam72cam.mod.serialization.TagField + * @see TagField */ @Retention(RetentionPolicy.RUNTIME) public @interface TagSync { diff --git a/src/main/java/cam72cam/mod/event/ClientEvents.java b/src/main/java/cam72cam/umc/api/event/ClientEvents.java similarity index 94% rename from src/main/java/cam72cam/mod/event/ClientEvents.java rename to src/main/java/cam72cam/umc/api/event/ClientEvents.java index bf8480080..3ae5f802c 100644 --- a/src/main/java/cam72cam/mod/event/ClientEvents.java +++ b/src/main/java/cam72cam/umc/api/event/ClientEvents.java @@ -1,16 +1,16 @@ -package cam72cam.mod.event; - -import cam72cam.mod.ModCore; -import cam72cam.mod.entity.EntityRegistry; -import cam72cam.mod.entity.Player; -import cam72cam.mod.gui.helpers.GUIHelpers; -import cam72cam.mod.input.Mouse; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.render.EntityRenderer; -import cam72cam.mod.render.GlobalRender; -import cam72cam.mod.render.opengl.CustomTexture; -import cam72cam.mod.render.opengl.VBO; -import cam72cam.mod.world.World; +package cam72cam.umc.api.event; + +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.entity.EntityRegistry; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.gui.helpers.GUIHelpers; +import cam72cam.umc.api.input.Mouse; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.render.EntityRenderer; +import cam72cam.umc.api.render.GlobalRender; +import cam72cam.umc.api.render.opengl.CustomTexture; +import cam72cam.umc.api.render.opengl.VBO; +import cam72cam.umc.api.world.World; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraftforge.client.event.*; diff --git a/src/main/java/cam72cam/mod/event/CommonEvents.java b/src/main/java/cam72cam/umc/api/event/CommonEvents.java similarity index 92% rename from src/main/java/cam72cam/mod/event/CommonEvents.java rename to src/main/java/cam72cam/umc/api/event/CommonEvents.java index 05ec1725a..018d8f833 100644 --- a/src/main/java/cam72cam/mod/event/CommonEvents.java +++ b/src/main/java/cam72cam/umc/api/event/CommonEvents.java @@ -1,8 +1,9 @@ -package cam72cam.mod.event; +package cam72cam.umc.api.event; -import cam72cam.mod.ModCore; -import cam72cam.mod.entity.ModdedEntity; -import cam72cam.mod.world.ChunkPos; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.entity.ModdedEntity; +import cam72cam.umc.api.world.ChunkPos; +import cam72cam.umc.api.entity.EntityRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.math.BlockPos; @@ -21,8 +22,8 @@ /** Registry of events that fire off on both client and server. Do not use directly! */ public class CommonEvents { private static void registerEvents() { - cam72cam.mod.world.World.registerEvents(); - cam72cam.mod.entity.EntityRegistry.registerEvents(); + cam72cam.umc.api.world.World.registerEvents(); + EntityRegistry.registerEvents(); } public static final class World { @@ -119,7 +120,7 @@ public static void onEntityJoin(EntityJoinWorldEvent event) { public static void onEntityTransfer(EntityEvent.EnteringChunk event) { if (event.getEntity() instanceof ModdedEntity) { ModdedEntity modded = (ModdedEntity) event.getEntity(); - cam72cam.mod.world.World.get(modded.world).tracker + cam72cam.umc.api.world.World.get(modded.world).tracker .move(modded, //Don't calculate Y in 1.16- as no corresponding event posted ChunkPos.asLong(event.getOldChunkX(), 0, event.getOldChunkZ()), diff --git a/src/main/java/cam72cam/mod/event/Event.java b/src/main/java/cam72cam/umc/api/event/Event.java similarity index 97% rename from src/main/java/cam72cam/mod/event/Event.java rename to src/main/java/cam72cam/umc/api/event/Event.java index a3ff02e06..8dc75c7a0 100644 --- a/src/main/java/cam72cam/mod/event/Event.java +++ b/src/main/java/cam72cam/umc/api/event/Event.java @@ -1,4 +1,4 @@ -package cam72cam.mod.event; +package cam72cam.umc.api.event; import java.util.LinkedHashSet; import java.util.Set; diff --git a/src/main/java/cam72cam/mod/fluid/Fluid.java b/src/main/java/cam72cam/umc/api/fluid/Fluid.java similarity index 97% rename from src/main/java/cam72cam/mod/fluid/Fluid.java rename to src/main/java/cam72cam/umc/api/fluid/Fluid.java index ea5d9fdd2..83ae64f29 100644 --- a/src/main/java/cam72cam/mod/fluid/Fluid.java +++ b/src/main/java/cam72cam/umc/api/fluid/Fluid.java @@ -1,4 +1,4 @@ -package cam72cam.mod.fluid; +package cam72cam.umc.api.fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/cam72cam/mod/fluid/FluidStack.java b/src/main/java/cam72cam/umc/api/fluid/FluidStack.java similarity index 96% rename from src/main/java/cam72cam/mod/fluid/FluidStack.java rename to src/main/java/cam72cam/umc/api/fluid/FluidStack.java index 2dacfbde1..15b602c9b 100644 --- a/src/main/java/cam72cam/mod/fluid/FluidStack.java +++ b/src/main/java/cam72cam/umc/api/fluid/FluidStack.java @@ -1,4 +1,4 @@ -package cam72cam.mod.fluid; +package cam72cam.umc.api.fluid; /** Wrapper around forge FluidStack */ public class FluidStack { diff --git a/src/main/java/cam72cam/mod/fluid/FluidTank.java b/src/main/java/cam72cam/umc/api/fluid/FluidTank.java similarity index 93% rename from src/main/java/cam72cam/mod/fluid/FluidTank.java rename to src/main/java/cam72cam/umc/api/fluid/FluidTank.java index aaef7d736..0a6cb50a9 100644 --- a/src/main/java/cam72cam/mod/fluid/FluidTank.java +++ b/src/main/java/cam72cam/umc/api/fluid/FluidTank.java @@ -1,6 +1,9 @@ -package cam72cam.mod.fluid; +package cam72cam.umc.api.fluid; -import cam72cam.mod.serialization.*; +import cam72cam.umc.api.serialization.TagCompound; +import cam72cam.umc.api.serialization.TagField; +import cam72cam.umc.api.serialization.TagMapped; +import cam72cam.umc.api.serialization.TagMapper; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/cam72cam/mod/fluid/ITank.java b/src/main/java/cam72cam/umc/api/fluid/ITank.java similarity index 98% rename from src/main/java/cam72cam/mod/fluid/ITank.java rename to src/main/java/cam72cam/umc/api/fluid/ITank.java index 8f3143bbb..ec935985d 100644 --- a/src/main/java/cam72cam/mod/fluid/ITank.java +++ b/src/main/java/cam72cam/umc/api/fluid/ITank.java @@ -1,7 +1,7 @@ -package cam72cam.mod.fluid; +package cam72cam.umc.api.fluid; -import cam72cam.mod.ModCore; -import cam72cam.mod.item.ItemStack; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.item.ItemStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; diff --git a/src/main/java/cam72cam/mod/gui/GuiRegistry.java b/src/main/java/cam72cam/umc/api/gui/GuiRegistry.java similarity index 92% rename from src/main/java/cam72cam/mod/gui/GuiRegistry.java rename to src/main/java/cam72cam/umc/api/gui/GuiRegistry.java index 0452df797..5cb61bd93 100644 --- a/src/main/java/cam72cam/mod/gui/GuiRegistry.java +++ b/src/main/java/cam72cam/umc/api/gui/GuiRegistry.java @@ -1,16 +1,16 @@ -package cam72cam.mod.gui; - -import cam72cam.mod.ModCore; -import cam72cam.mod.block.BlockEntity; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.entity.Player; -import cam72cam.mod.gui.container.ClientContainerBuilder; -import cam72cam.mod.gui.container.IContainer; -import cam72cam.mod.gui.container.ServerContainerBuilder; -import cam72cam.mod.gui.screen.IScreen; -import cam72cam.mod.gui.screen.ScreenBuilder; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.resource.Identifier; +package cam72cam.umc.api.gui; + +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.block.BlockEntity; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.gui.container.ClientContainerBuilder; +import cam72cam.umc.api.gui.container.IContainer; +import cam72cam.umc.api.gui.container.ServerContainerBuilder; +import cam72cam.umc.api.gui.screen.IScreen; +import cam72cam.umc.api.gui.screen.ScreenBuilder; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.resource.Identifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; diff --git a/src/main/java/cam72cam/mod/gui/Progress.java b/src/main/java/cam72cam/umc/api/gui/Progress.java similarity index 95% rename from src/main/java/cam72cam/mod/gui/Progress.java rename to src/main/java/cam72cam/umc/api/gui/Progress.java index 1a7211c85..43795b9e3 100644 --- a/src/main/java/cam72cam/mod/gui/Progress.java +++ b/src/main/java/cam72cam/umc/api/gui/Progress.java @@ -1,6 +1,6 @@ -package cam72cam.mod.gui; +package cam72cam.umc.api.gui; -import cam72cam.mod.ModCore; +import cam72cam.umc.api.ModCore; import net.minecraftforge.fml.common.ProgressManager; import net.minecraftforge.fml.common.ProgressManager.ProgressBar; diff --git a/src/main/java/cam72cam/mod/gui/container/ClientContainerBuilder.java b/src/main/java/cam72cam/umc/api/gui/container/ClientContainerBuilder.java similarity index 94% rename from src/main/java/cam72cam/mod/gui/container/ClientContainerBuilder.java rename to src/main/java/cam72cam/umc/api/gui/container/ClientContainerBuilder.java index 237ba1973..1f41dee84 100644 --- a/src/main/java/cam72cam/mod/gui/container/ClientContainerBuilder.java +++ b/src/main/java/cam72cam/umc/api/gui/container/ClientContainerBuilder.java @@ -1,14 +1,14 @@ -package cam72cam.mod.gui.container; - -import cam72cam.mod.fluid.Fluid; -import cam72cam.mod.gui.helpers.GUIHelpers; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.item.ItemStackHandler; -import cam72cam.mod.util.With; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.render.opengl.Texture; -import cam72cam.mod.resource.Identifier; +package cam72cam.umc.api.gui.container; + +import cam72cam.umc.api.fluid.Fluid; +import cam72cam.umc.api.gui.helpers.GUIHelpers; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.item.ItemStackHandler; +import cam72cam.umc.api.util.With; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.render.opengl.Texture; +import cam72cam.umc.api.resource.Identifier; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -17,7 +17,7 @@ import java.util.function.Supplier; -import static cam72cam.mod.gui.helpers.GUIHelpers.CHEST_GUI_TEXTURE; +import static cam72cam.umc.api.gui.helpers.GUIHelpers.CHEST_GUI_TEXTURE; /** GUI Container wrapper for the client side, Do not use directly */ public class ClientContainerBuilder extends GuiContainer implements IContainerBuilder { diff --git a/src/main/java/cam72cam/mod/gui/container/IContainer.java b/src/main/java/cam72cam/umc/api/gui/container/IContainer.java similarity index 76% rename from src/main/java/cam72cam/mod/gui/container/IContainer.java rename to src/main/java/cam72cam/umc/api/gui/container/IContainer.java index 6f1e6a306..1e93d0fca 100644 --- a/src/main/java/cam72cam/mod/gui/container/IContainer.java +++ b/src/main/java/cam72cam/umc/api/gui/container/IContainer.java @@ -1,11 +1,12 @@ -package cam72cam.mod.gui.container; +package cam72cam.umc.api.gui.container; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.gui.GuiRegistry; +import cam72cam.umc.api.render.opengl.RenderState; /** * Defines a container which is synchronized both client and server side * - * @see cam72cam.mod.gui.GuiRegistry for more details + * @see GuiRegistry for more details */ public interface IContainer { @Deprecated diff --git a/src/main/java/cam72cam/mod/gui/container/IContainerBuilder.java b/src/main/java/cam72cam/umc/api/gui/container/IContainerBuilder.java similarity index 91% rename from src/main/java/cam72cam/mod/gui/container/IContainerBuilder.java rename to src/main/java/cam72cam/umc/api/gui/container/IContainerBuilder.java index b761d6288..ff2237456 100644 --- a/src/main/java/cam72cam/mod/gui/container/IContainerBuilder.java +++ b/src/main/java/cam72cam/umc/api/gui/container/IContainerBuilder.java @@ -1,8 +1,8 @@ -package cam72cam.mod.gui.container; +package cam72cam.umc.api.gui.container; -import cam72cam.mod.fluid.Fluid; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.item.ItemStackHandler; +import cam72cam.umc.api.fluid.Fluid; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.item.ItemStackHandler; /** Provides a way to spec out a container piece by piece that functions both server and client side for slot synchronization */ public interface IContainerBuilder { diff --git a/src/main/java/cam72cam/mod/gui/container/ServerContainerBuilder.java b/src/main/java/cam72cam/umc/api/gui/container/ServerContainerBuilder.java similarity index 97% rename from src/main/java/cam72cam/mod/gui/container/ServerContainerBuilder.java rename to src/main/java/cam72cam/umc/api/gui/container/ServerContainerBuilder.java index 3facca64f..d4621eb91 100644 --- a/src/main/java/cam72cam/mod/gui/container/ServerContainerBuilder.java +++ b/src/main/java/cam72cam/umc/api/gui/container/ServerContainerBuilder.java @@ -1,9 +1,9 @@ -package cam72cam.mod.gui.container; +package cam72cam.umc.api.gui.container; -import cam72cam.mod.fluid.Fluid; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.item.ItemStackHandler; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.fluid.Fluid; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.item.ItemStackHandler; +import cam72cam.umc.api.render.opengl.RenderState; import invtweaks.api.container.ChestContainer; import invtweaks.api.container.ContainerSection; import invtweaks.api.container.ContainerSectionCallback; diff --git a/src/main/java/cam72cam/mod/gui/helpers/GUIHelpers.java b/src/main/java/cam72cam/umc/api/gui/helpers/GUIHelpers.java similarity index 95% rename from src/main/java/cam72cam/mod/gui/helpers/GUIHelpers.java rename to src/main/java/cam72cam/umc/api/gui/helpers/GUIHelpers.java index 61b975ede..deba954f6 100644 --- a/src/main/java/cam72cam/mod/gui/helpers/GUIHelpers.java +++ b/src/main/java/cam72cam/umc/api/gui/helpers/GUIHelpers.java @@ -1,16 +1,16 @@ -package cam72cam.mod.gui.helpers; - -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.ModCore; -import cam72cam.mod.fluid.Fluid; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.text.PlayerMessage; -import cam72cam.mod.util.With; -import cam72cam.mod.render.opengl.BlendMode; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.render.opengl.Texture; -import cam72cam.mod.resource.Identifier; +package cam72cam.umc.api.gui.helpers; + +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.fluid.Fluid; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.text.PlayerMessage; +import cam72cam.umc.api.util.With; +import cam72cam.umc.api.render.opengl.BlendMode; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.render.opengl.Texture; +import cam72cam.umc.api.resource.Identifier; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; @@ -23,7 +23,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.event.ClickEvent; import org.lwjgl.opengl.GL11; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import java.util.*; import java.util.function.BiConsumer; diff --git a/src/main/java/cam72cam/mod/gui/helpers/GuiScrollBar.java b/src/main/java/cam72cam/umc/api/gui/helpers/GuiScrollBar.java similarity index 97% rename from src/main/java/cam72cam/mod/gui/helpers/GuiScrollBar.java rename to src/main/java/cam72cam/umc/api/gui/helpers/GuiScrollBar.java index 717cc80de..3d268013f 100644 --- a/src/main/java/cam72cam/mod/gui/helpers/GuiScrollBar.java +++ b/src/main/java/cam72cam/umc/api/gui/helpers/GuiScrollBar.java @@ -1,4 +1,4 @@ -package cam72cam.mod.gui.helpers; +package cam72cam.umc.api.gui.helpers; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/cam72cam/mod/gui/helpers/ItemButton.java b/src/main/java/cam72cam/umc/api/gui/helpers/ItemButton.java similarity index 86% rename from src/main/java/cam72cam/mod/gui/helpers/ItemButton.java rename to src/main/java/cam72cam/umc/api/gui/helpers/ItemButton.java index 21dd0ad85..6f087b96a 100644 --- a/src/main/java/cam72cam/mod/gui/helpers/ItemButton.java +++ b/src/main/java/cam72cam/umc/api/gui/helpers/ItemButton.java @@ -1,9 +1,9 @@ -package cam72cam.mod.gui.helpers; +package cam72cam.umc.api.gui.helpers; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.util.With; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.util.With; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/cam72cam/mod/gui/helpers/ItemPickerGUI.java b/src/main/java/cam72cam/umc/api/gui/helpers/ItemPickerGUI.java similarity index 98% rename from src/main/java/cam72cam/mod/gui/helpers/ItemPickerGUI.java rename to src/main/java/cam72cam/umc/api/gui/helpers/ItemPickerGUI.java index e0e61ad2a..2f9e2fe4d 100644 --- a/src/main/java/cam72cam/mod/gui/helpers/ItemPickerGUI.java +++ b/src/main/java/cam72cam/umc/api/gui/helpers/ItemPickerGUI.java @@ -1,7 +1,6 @@ -package cam72cam.mod.gui.helpers; +package cam72cam.umc.api.gui.helpers; -import cam72cam.mod.gui.screen.TextField; -import cam72cam.mod.item.ItemStack; +import cam72cam.umc.api.item.ItemStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/cam72cam/mod/gui/screen/Button.java b/src/main/java/cam72cam/umc/api/gui/screen/Button.java similarity index 97% rename from src/main/java/cam72cam/mod/gui/screen/Button.java rename to src/main/java/cam72cam/umc/api/gui/screen/Button.java index 1675f3c56..a48b7ef77 100644 --- a/src/main/java/cam72cam/mod/gui/screen/Button.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/Button.java @@ -1,6 +1,6 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; -import cam72cam.mod.entity.Player; +import cam72cam.umc.api.entity.Player; import net.minecraft.client.gui.GuiButton; import java.util.List; diff --git a/src/main/java/cam72cam/mod/gui/screen/CheckBox.java b/src/main/java/cam72cam/umc/api/gui/screen/CheckBox.java similarity index 92% rename from src/main/java/cam72cam/mod/gui/screen/CheckBox.java rename to src/main/java/cam72cam/umc/api/gui/screen/CheckBox.java index c79714ad1..1327e8161 100644 --- a/src/main/java/cam72cam/mod/gui/screen/CheckBox.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/CheckBox.java @@ -1,6 +1,6 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; -import cam72cam.mod.entity.Player; +import cam72cam.umc.api.entity.Player; import net.minecraftforge.fml.client.config.GuiCheckBox; import java.util.function.BiConsumer; diff --git a/src/main/java/cam72cam/mod/gui/screen/IScreen.java b/src/main/java/cam72cam/umc/api/gui/screen/IScreen.java similarity index 86% rename from src/main/java/cam72cam/mod/gui/screen/IScreen.java rename to src/main/java/cam72cam/umc/api/gui/screen/IScreen.java index fe6e9f349..dc68a4d47 100644 --- a/src/main/java/cam72cam/mod/gui/screen/IScreen.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/IScreen.java @@ -1,8 +1,8 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; -import cam72cam.mod.entity.Player; -import cam72cam.mod.input.Keyboard; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.input.Keyboard; +import cam72cam.umc.api.render.opengl.RenderState; import javax.annotation.Nullable; diff --git a/src/main/java/cam72cam/mod/gui/screen/IScreenBuilder.java b/src/main/java/cam72cam/umc/api/gui/screen/IScreenBuilder.java similarity index 64% rename from src/main/java/cam72cam/mod/gui/screen/IScreenBuilder.java rename to src/main/java/cam72cam/umc/api/gui/screen/IScreenBuilder.java index bd01cfcaa..ecdad8fbf 100644 --- a/src/main/java/cam72cam/mod/gui/screen/IScreenBuilder.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/IScreenBuilder.java @@ -1,7 +1,8 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; -import cam72cam.mod.fluid.Fluid; -import cam72cam.mod.resource.Identifier; +import cam72cam.umc.api.fluid.Fluid; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.gui.helpers.GUIHelpers; public interface IScreenBuilder { /** Close this screen */ @@ -18,17 +19,17 @@ public interface IScreenBuilder { /** * Add an image to the GUI - * @see cam72cam.mod.gui.helpers.GUIHelpers#texturedRect(Identifier, int, int, int, int) + * @see GUIHelpers#texturedRect(Identifier, int, int, int, int) */ void drawImage(Identifier tex, int x, int y, int width, int height); /** * Add a tank to the GUI - * @see cam72cam.mod.gui.helpers.GUIHelpers#drawTankBlock(int, int, int, int, Fluid, float, boolean, int) + * @see GUIHelpers#drawTankBlock(int, int, int, int, Fluid, float, boolean, int) */ void drawTank(int x, int y, int width, int height, Fluid fluid, float fluidPercent, boolean background, int color); - /** @see cam72cam.mod.gui.helpers.GUIHelpers#drawCenteredString(String, int, int, int) */ + /** @see GUIHelpers#drawCenteredString(String, int, int, int) */ void drawCenteredString(String str, int x, int y, int color); /** Show this GUI */ diff --git a/src/main/java/cam72cam/mod/gui/screen/IWidget.java b/src/main/java/cam72cam/umc/api/gui/screen/IWidget.java similarity index 93% rename from src/main/java/cam72cam/mod/gui/screen/IWidget.java rename to src/main/java/cam72cam/umc/api/gui/screen/IWidget.java index ee5bec6e3..84d492364 100644 --- a/src/main/java/cam72cam/mod/gui/screen/IWidget.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/IWidget.java @@ -1,4 +1,4 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; public interface IWidget { /** diff --git a/src/main/java/cam72cam/mod/gui/screen/ScreenBuilder.java b/src/main/java/cam72cam/umc/api/gui/screen/ScreenBuilder.java similarity index 92% rename from src/main/java/cam72cam/mod/gui/screen/ScreenBuilder.java rename to src/main/java/cam72cam/umc/api/gui/screen/ScreenBuilder.java index 77fb43234..976dfdaec 100644 --- a/src/main/java/cam72cam/mod/gui/screen/ScreenBuilder.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/ScreenBuilder.java @@ -1,12 +1,12 @@ -package cam72cam.mod.gui.screen; - -import cam72cam.mod.entity.Player; -import cam72cam.mod.fluid.Fluid; -import cam72cam.mod.gui.helpers.GUIHelpers; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.input.Keyboard; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.resource.Identifier; +package cam72cam.umc.api.gui.screen; + +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.fluid.Fluid; +import cam72cam.umc.api.gui.helpers.GUIHelpers; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.input.Keyboard; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.resource.Identifier; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/cam72cam/mod/gui/screen/Slider.java b/src/main/java/cam72cam/umc/api/gui/screen/Slider.java similarity index 96% rename from src/main/java/cam72cam/mod/gui/screen/Slider.java rename to src/main/java/cam72cam/umc/api/gui/screen/Slider.java index 07a1931a3..4fe8eb08f 100644 --- a/src/main/java/cam72cam/mod/gui/screen/Slider.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/Slider.java @@ -1,6 +1,6 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; -import cam72cam.mod.entity.Player; +import cam72cam.umc.api.entity.Player; import net.minecraftforge.fml.client.config.GuiSlider; import java.util.function.Consumer; diff --git a/src/main/java/cam72cam/mod/gui/screen/TextField.java b/src/main/java/cam72cam/umc/api/gui/screen/TextField.java similarity index 98% rename from src/main/java/cam72cam/mod/gui/screen/TextField.java rename to src/main/java/cam72cam/umc/api/gui/screen/TextField.java index a8312c3bb..8ecfe00d0 100644 --- a/src/main/java/cam72cam/mod/gui/screen/TextField.java +++ b/src/main/java/cam72cam/umc/api/gui/screen/TextField.java @@ -1,4 +1,4 @@ -package cam72cam.mod.gui.screen; +package cam72cam.umc.api.gui.screen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/cam72cam/mod/input/Keyboard.java b/src/main/java/cam72cam/umc/api/input/Keyboard.java similarity index 98% rename from src/main/java/cam72cam/mod/input/Keyboard.java rename to src/main/java/cam72cam/umc/api/input/Keyboard.java index 8ecda2ef1..a24260a91 100644 --- a/src/main/java/cam72cam/mod/input/Keyboard.java +++ b/src/main/java/cam72cam/umc/api/input/Keyboard.java @@ -1,6 +1,6 @@ -package cam72cam.mod.input; +package cam72cam.umc.api.input; -import cam72cam.mod.event.ClientEvents; +import cam72cam.umc.api.event.ClientEvents; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.fml.client.registry.ClientRegistry; diff --git a/src/main/java/cam72cam/mod/input/Mouse.java b/src/main/java/cam72cam/umc/api/input/Mouse.java similarity index 85% rename from src/main/java/cam72cam/mod/input/Mouse.java rename to src/main/java/cam72cam/umc/api/input/Mouse.java index 47ce14a34..7d274c2cb 100644 --- a/src/main/java/cam72cam/mod/input/Mouse.java +++ b/src/main/java/cam72cam/umc/api/input/Mouse.java @@ -1,16 +1,15 @@ -package cam72cam.mod.input; +package cam72cam.umc.api.input; -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.entity.ModdedEntity; -import cam72cam.mod.entity.Player; -import cam72cam.mod.entity.custom.IClickable; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.event.Event; -import cam72cam.mod.item.ClickResult; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.net.Packet; -import cam72cam.mod.serialization.TagField; +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.entity.ModdedEntity; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.entity.custom.IClickable; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.item.ClickResult; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.net.Packet; +import cam72cam.umc.api.serialization.TagField; import net.minecraft.client.Minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/cam72cam/mod/item/ArmorSlot.java b/src/main/java/cam72cam/umc/api/item/ArmorSlot.java similarity index 96% rename from src/main/java/cam72cam/mod/item/ArmorSlot.java rename to src/main/java/cam72cam/umc/api/item/ArmorSlot.java index 0ab2c7850..593c0565d 100644 --- a/src/main/java/cam72cam/mod/item/ArmorSlot.java +++ b/src/main/java/cam72cam/umc/api/item/ArmorSlot.java @@ -1,4 +1,4 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/cam72cam/mod/item/ClickResult.java b/src/main/java/cam72cam/umc/api/item/ClickResult.java similarity index 95% rename from src/main/java/cam72cam/mod/item/ClickResult.java rename to src/main/java/cam72cam/umc/api/item/ClickResult.java index aa7bb0eb6..26cf2696b 100644 --- a/src/main/java/cam72cam/mod/item/ClickResult.java +++ b/src/main/java/cam72cam/umc/api/item/ClickResult.java @@ -1,4 +1,4 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; import net.minecraft.util.EnumActionResult; diff --git a/src/main/java/cam72cam/mod/item/CreativeTab.java b/src/main/java/cam72cam/umc/api/item/CreativeTab.java similarity index 96% rename from src/main/java/cam72cam/mod/item/CreativeTab.java rename to src/main/java/cam72cam/umc/api/item/CreativeTab.java index 493cafcbc..500e9b204 100644 --- a/src/main/java/cam72cam/mod/item/CreativeTab.java +++ b/src/main/java/cam72cam/umc/api/item/CreativeTab.java @@ -1,4 +1,4 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/cam72cam/mod/item/CustomItem.java b/src/main/java/cam72cam/umc/api/item/CustomItem.java similarity index 92% rename from src/main/java/cam72cam/mod/item/CustomItem.java rename to src/main/java/cam72cam/umc/api/item/CustomItem.java index 539d82f25..cc2bbd4ed 100644 --- a/src/main/java/cam72cam/mod/item/CustomItem.java +++ b/src/main/java/cam72cam/umc/api/item/CustomItem.java @@ -1,16 +1,16 @@ -package cam72cam.mod.item; - -import cam72cam.mod.ModCore; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.entity.Player; -import cam72cam.mod.event.CommonEvents; -import cam72cam.mod.math.Vec3d; -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.world.World; +package cam72cam.umc.api.item; + +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.event.CommonEvents; +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.serialization.TagSerializer; +import cam72cam.umc.api.util.Facing; +import cam72cam.umc.api.world.World; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/cam72cam/mod/item/Fuzzy.java b/src/main/java/cam72cam/umc/api/item/Fuzzy.java similarity index 98% rename from src/main/java/cam72cam/mod/item/Fuzzy.java rename to src/main/java/cam72cam/umc/api/item/Fuzzy.java index 1fb4680bd..7238f945e 100644 --- a/src/main/java/cam72cam/mod/item/Fuzzy.java +++ b/src/main/java/cam72cam/umc/api/item/Fuzzy.java @@ -1,7 +1,7 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; -import cam72cam.mod.config.ConfigFile; -import cam72cam.mod.event.CommonEvents; +import cam72cam.umc.api.config.ConfigFile; +import cam72cam.umc.api.event.CommonEvents; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/cam72cam/mod/item/IInventory.java b/src/main/java/cam72cam/umc/api/item/IInventory.java similarity index 99% rename from src/main/java/cam72cam/mod/item/IInventory.java rename to src/main/java/cam72cam/umc/api/item/IInventory.java index e7ed6c5c5..553d1a5b8 100644 --- a/src/main/java/cam72cam/mod/item/IInventory.java +++ b/src/main/java/cam72cam/umc/api/item/IInventory.java @@ -1,4 +1,4 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; import net.minecraftforge.items.IItemHandlerModifiable; diff --git a/src/main/java/cam72cam/mod/item/ItemStack.java b/src/main/java/cam72cam/umc/api/item/ItemStack.java similarity index 96% rename from src/main/java/cam72cam/mod/item/ItemStack.java rename to src/main/java/cam72cam/umc/api/item/ItemStack.java index fbb9036e1..c5e2c8c15 100644 --- a/src/main/java/cam72cam/mod/item/ItemStack.java +++ b/src/main/java/cam72cam/umc/api/item/ItemStack.java @@ -1,7 +1,7 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; -import cam72cam.mod.entity.Player; -import cam72cam.mod.serialization.TagCompound; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.serialization.TagCompound; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.fluids.FluidUtil; diff --git a/src/main/java/cam72cam/mod/item/ItemStackHandler.java b/src/main/java/cam72cam/umc/api/item/ItemStackHandler.java similarity index 96% rename from src/main/java/cam72cam/mod/item/ItemStackHandler.java rename to src/main/java/cam72cam/umc/api/item/ItemStackHandler.java index 6755adc58..4fc92a517 100644 --- a/src/main/java/cam72cam/mod/item/ItemStackHandler.java +++ b/src/main/java/cam72cam/umc/api/item/ItemStackHandler.java @@ -1,6 +1,6 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; -import cam72cam.mod.serialization.*; +import cam72cam.umc.api.serialization.*; import javax.annotation.Nonnull; import java.lang.reflect.Constructor; @@ -123,7 +123,7 @@ public void load(TagCompound items) { internal.deserializeNBT(items.internal); } - public static class TagMapper implements cam72cam.mod.serialization.TagMapper { + public static class TagMapper implements cam72cam.umc.api.serialization.TagMapper { @Override public TagAccessor apply(Class type, String fieldName, TagField tag) throws SerializationException { Constructor ctr; diff --git a/src/main/java/cam72cam/mod/item/Recipes.java b/src/main/java/cam72cam/umc/api/item/Recipes.java similarity index 96% rename from src/main/java/cam72cam/mod/item/Recipes.java rename to src/main/java/cam72cam/umc/api/item/Recipes.java index 68998f7fe..273faea41 100644 --- a/src/main/java/cam72cam/mod/item/Recipes.java +++ b/src/main/java/cam72cam/umc/api/item/Recipes.java @@ -1,7 +1,7 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; -import cam72cam.mod.ModCore; -import cam72cam.mod.event.CommonEvents; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.event.CommonEvents; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/cam72cam/mod/item/ToolType.java b/src/main/java/cam72cam/umc/api/item/ToolType.java similarity index 90% rename from src/main/java/cam72cam/mod/item/ToolType.java rename to src/main/java/cam72cam/umc/api/item/ToolType.java index 0d525f12e..178e3dcf5 100644 --- a/src/main/java/cam72cam/mod/item/ToolType.java +++ b/src/main/java/cam72cam/umc/api/item/ToolType.java @@ -1,4 +1,4 @@ -package cam72cam.mod.item; +package cam72cam.umc.api.item; /** What class a tool fits into */ public enum ToolType { diff --git a/src/main/java/cam72cam/mod/math/Rotation.java b/src/main/java/cam72cam/umc/api/math/Rotation.java similarity index 95% rename from src/main/java/cam72cam/mod/math/Rotation.java rename to src/main/java/cam72cam/umc/api/math/Rotation.java index 5be10ed52..672eaa9c3 100644 --- a/src/main/java/cam72cam/mod/math/Rotation.java +++ b/src/main/java/cam72cam/umc/api/math/Rotation.java @@ -1,6 +1,6 @@ -package cam72cam.mod.math; +package cam72cam.umc.api.math; -import cam72cam.mod.util.Facing; +import cam72cam.umc.api.util.Facing; /** Represents a rotation around the Y axis */ public enum Rotation { diff --git a/src/main/java/cam72cam/mod/math/Vec3d.java b/src/main/java/cam72cam/umc/api/math/Vec3d.java similarity index 99% rename from src/main/java/cam72cam/mod/math/Vec3d.java rename to src/main/java/cam72cam/umc/api/math/Vec3d.java index aafac35e8..6fc0f5730 100644 --- a/src/main/java/cam72cam/mod/math/Vec3d.java +++ b/src/main/java/cam72cam/umc/api/math/Vec3d.java @@ -1,4 +1,4 @@ -package cam72cam.mod.math; +package cam72cam.umc.api.math; /** Custom Vec3d that is equivalent to MC's Vec3d */ public class Vec3d { diff --git a/src/main/java/cam72cam/mod/math/Vec3i.java b/src/main/java/cam72cam/umc/api/math/Vec3i.java similarity index 98% rename from src/main/java/cam72cam/mod/math/Vec3i.java rename to src/main/java/cam72cam/umc/api/math/Vec3i.java index f1fa124ae..56b0a38d2 100644 --- a/src/main/java/cam72cam/mod/math/Vec3i.java +++ b/src/main/java/cam72cam/umc/api/math/Vec3i.java @@ -1,6 +1,6 @@ -package cam72cam.mod.math; +package cam72cam.umc.api.math; -import cam72cam.mod.util.Facing; +import cam72cam.umc.api.util.Facing; import net.minecraft.util.math.BlockPos; public class Vec3i { diff --git a/src/main/java/cam72cam/mod/mixin/feat/global_renderer/MixinRenderGlobal.java b/src/main/java/cam72cam/umc/api/mixin/feat/global_renderer/MixinRenderGlobal.java similarity index 83% rename from src/main/java/cam72cam/mod/mixin/feat/global_renderer/MixinRenderGlobal.java rename to src/main/java/cam72cam/umc/api/mixin/feat/global_renderer/MixinRenderGlobal.java index 7720b4024..bdcdfa39f 100644 --- a/src/main/java/cam72cam/mod/mixin/feat/global_renderer/MixinRenderGlobal.java +++ b/src/main/java/cam72cam/umc/api/mixin/feat/global_renderer/MixinRenderGlobal.java @@ -1,8 +1,8 @@ -package cam72cam.mod.mixin.feat.global_renderer; +package cam72cam.umc.api.mixin.feat.global_renderer; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.render.GlobalRender; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.render.GlobalRender; +import cam72cam.umc.api.render.opengl.RenderState; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.entity.Entity; diff --git a/src/main/java/cam72cam/mod/mixin/feat/large_entity_collision/MixinVanillaWorld.java b/src/main/java/cam72cam/umc/api/mixin/feat/large_entity_collision/MixinVanillaWorld.java similarity index 91% rename from src/main/java/cam72cam/mod/mixin/feat/large_entity_collision/MixinVanillaWorld.java rename to src/main/java/cam72cam/umc/api/mixin/feat/large_entity_collision/MixinVanillaWorld.java index e981d2c4e..68ea514f2 100644 --- a/src/main/java/cam72cam/mod/mixin/feat/large_entity_collision/MixinVanillaWorld.java +++ b/src/main/java/cam72cam/umc/api/mixin/feat/large_entity_collision/MixinVanillaWorld.java @@ -1,7 +1,7 @@ -package cam72cam.mod.mixin.feat.large_entity_collision; +package cam72cam.umc.api.mixin.feat.large_entity_collision; -import cam72cam.mod.entity.ModdedEntity; -import cam72cam.mod.world.ChunkPos; +import cam72cam.umc.api.entity.ModdedEntity; +import cam72cam.umc.api.world.ChunkPos; import com.google.common.base.Predicate; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; @@ -29,7 +29,7 @@ public abstract class MixinVanillaWorld { public void injectEntitySearch0(Entity entityIn, AxisAlignedBB aabb, Predicate filter, CallbackInfoReturnable> cir) { List result = cir.getReturnValue(); - cam72cam.mod.world.World world = cam72cam.mod.world.World.get((World) (Object) this); + cam72cam.umc.api.world.World world = cam72cam.umc.api.world.World.get((World) (Object) this); //We don't handle Y coordinate in 1.16- Set collection = world.tracker.queryPotentialPackedChunkPos( ChunkPos.asLongExcludeY(new Vec3d((aabb.minX + aabb.maxX) / 2, (aabb.minY + aabb.maxY) / 2, (aabb.minZ + aabb.maxZ) / 2))); @@ -60,7 +60,7 @@ public void injectEntitySearch1(Class clazz, AxisAlignedBB aab } List result = cir.getReturnValue(); - cam72cam.mod.world.World world = cam72cam.mod.world.World.get((World) (Object) this); + cam72cam.umc.api.world.World world = cam72cam.umc.api.world.World.get((World) (Object) this); //We don't handle Y coordinate in 1.16- Set collection = world.tracker.queryPotentialPackedChunkPos( ChunkPos.asLongExcludeY(new Vec3d((aabb.minX + aabb.maxX) / 2, (aabb.minY + aabb.maxY) / 2, (aabb.minZ + aabb.maxZ) / 2))); diff --git a/src/main/java/cam72cam/mod/mixin/fix/multi_release/MixinJarDiscoverer.java b/src/main/java/cam72cam/umc/api/mixin/fix/multi_release/MixinJarDiscoverer.java similarity index 95% rename from src/main/java/cam72cam/mod/mixin/fix/multi_release/MixinJarDiscoverer.java rename to src/main/java/cam72cam/umc/api/mixin/fix/multi_release/MixinJarDiscoverer.java index a39f6c00a..ddb303c02 100644 --- a/src/main/java/cam72cam/mod/mixin/fix/multi_release/MixinJarDiscoverer.java +++ b/src/main/java/cam72cam/umc/api/mixin/fix/multi_release/MixinJarDiscoverer.java @@ -1,4 +1,4 @@ -package cam72cam.mod.mixin.fix.multi_release; +package cam72cam.umc.api.mixin.fix.multi_release; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; diff --git a/src/main/java/cam72cam/mod/model/obj/Buffers.java b/src/main/java/cam72cam/umc/api/model/obj/Buffers.java similarity index 97% rename from src/main/java/cam72cam/mod/model/obj/Buffers.java rename to src/main/java/cam72cam/umc/api/model/obj/Buffers.java index bdb9d6b7a..4ead8ee9c 100644 --- a/src/main/java/cam72cam/mod/model/obj/Buffers.java +++ b/src/main/java/cam72cam/umc/api/model/obj/Buffers.java @@ -1,4 +1,4 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; public class Buffers { public static class FloatBuffer { diff --git a/src/main/java/cam72cam/mod/model/obj/FaceAccessor.java b/src/main/java/cam72cam/umc/api/model/obj/FaceAccessor.java similarity index 98% rename from src/main/java/cam72cam/mod/model/obj/FaceAccessor.java rename to src/main/java/cam72cam/umc/api/model/obj/FaceAccessor.java index 2a7ae3bd3..ad806b108 100644 --- a/src/main/java/cam72cam/mod/model/obj/FaceAccessor.java +++ b/src/main/java/cam72cam/umc/api/model/obj/FaceAccessor.java @@ -1,6 +1,6 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.math.Vec3d; import javax.annotation.Nonnull; import java.util.*; diff --git a/src/main/java/cam72cam/mod/model/obj/ImageUtils.java b/src/main/java/cam72cam/umc/api/model/obj/ImageUtils.java similarity index 96% rename from src/main/java/cam72cam/mod/model/obj/ImageUtils.java rename to src/main/java/cam72cam/umc/api/model/obj/ImageUtils.java index d3d792624..c3f7f212e 100644 --- a/src/main/java/cam72cam/mod/model/obj/ImageUtils.java +++ b/src/main/java/cam72cam/umc/api/model/obj/ImageUtils.java @@ -1,6 +1,6 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.ModCore; +import cam72cam.umc.api.ModCore; import org.apache.commons.lang3.tuple.Pair; import java.awt.*; diff --git a/src/main/java/cam72cam/mod/model/obj/MTLParser.java b/src/main/java/cam72cam/umc/api/model/obj/MTLParser.java similarity index 98% rename from src/main/java/cam72cam/mod/model/obj/MTLParser.java rename to src/main/java/cam72cam/umc/api/model/obj/MTLParser.java index 4173b0bbf..dcec6402f 100644 --- a/src/main/java/cam72cam/mod/model/obj/MTLParser.java +++ b/src/main/java/cam72cam/umc/api/model/obj/MTLParser.java @@ -1,4 +1,4 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/cam72cam/mod/model/obj/Material.java b/src/main/java/cam72cam/umc/api/model/obj/Material.java similarity index 96% rename from src/main/java/cam72cam/mod/model/obj/Material.java rename to src/main/java/cam72cam/umc/api/model/obj/Material.java index 01e69e136..bffafeb0d 100644 --- a/src/main/java/cam72cam/mod/model/obj/Material.java +++ b/src/main/java/cam72cam/umc/api/model/obj/Material.java @@ -1,4 +1,4 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; public class Material { public final String name; diff --git a/src/main/java/cam72cam/mod/model/obj/OBJBuilder.java b/src/main/java/cam72cam/umc/api/model/obj/OBJBuilder.java similarity index 97% rename from src/main/java/cam72cam/mod/model/obj/OBJBuilder.java rename to src/main/java/cam72cam/umc/api/model/obj/OBJBuilder.java index 8193beb84..9f5f1f2a9 100644 --- a/src/main/java/cam72cam/mod/model/obj/OBJBuilder.java +++ b/src/main/java/cam72cam/umc/api/model/obj/OBJBuilder.java @@ -1,9 +1,9 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.Config; -import cam72cam.mod.ModCore; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.serialization.ResourceCache; +import cam72cam.umc.api.Config; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.serialization.ResourceCache; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; diff --git a/src/main/java/cam72cam/mod/model/obj/OBJFace.java b/src/main/java/cam72cam/umc/api/model/obj/OBJFace.java similarity index 90% rename from src/main/java/cam72cam/mod/model/obj/OBJFace.java rename to src/main/java/cam72cam/umc/api/model/obj/OBJFace.java index eeaf61fdf..bdb464337 100644 --- a/src/main/java/cam72cam/mod/model/obj/OBJFace.java +++ b/src/main/java/cam72cam/umc/api/model/obj/OBJFace.java @@ -1,7 +1,7 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.entity.boundingbox.IBoundingBox; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.entity.boundingbox.IBoundingBox; +import cam72cam.umc.api.math.Vec3d; public class OBJFace { public Vertex vertex0; diff --git a/src/main/java/cam72cam/mod/model/obj/OBJGroup.java b/src/main/java/cam72cam/umc/api/model/obj/OBJGroup.java similarity index 89% rename from src/main/java/cam72cam/mod/model/obj/OBJGroup.java rename to src/main/java/cam72cam/umc/api/model/obj/OBJGroup.java index 006965c00..49dd526de 100644 --- a/src/main/java/cam72cam/mod/model/obj/OBJGroup.java +++ b/src/main/java/cam72cam/umc/api/model/obj/OBJGroup.java @@ -1,7 +1,7 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.serialization.TagCompound; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.serialization.TagCompound; public class OBJGroup { public final String name; diff --git a/src/main/java/cam72cam/mod/model/obj/OBJModel.java b/src/main/java/cam72cam/umc/api/model/obj/OBJModel.java similarity index 96% rename from src/main/java/cam72cam/mod/model/obj/OBJModel.java rename to src/main/java/cam72cam/umc/api/model/obj/OBJModel.java index 2aa16cd62..6f2fe1401 100644 --- a/src/main/java/cam72cam/mod/model/obj/OBJModel.java +++ b/src/main/java/cam72cam/umc/api/model/obj/OBJModel.java @@ -1,15 +1,16 @@ -package cam72cam.mod.model.obj; - -import cam72cam.mod.Config; -import cam72cam.mod.ModCore; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.render.obj.OBJTextureSheet; -import cam72cam.mod.render.obj.OBJRender; -import cam72cam.mod.render.opengl.CustomTexture; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.serialization.*; -import cam72cam.mod.serialization.ResourceCache.GenericByteBuffer; +package cam72cam.umc.api.model.obj; + +import cam72cam.umc.api.Config; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.render.obj.OBJTextureSheet; +import cam72cam.umc.api.render.obj.OBJRender; +import cam72cam.umc.api.render.opengl.CustomTexture; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.serialization.ResourceCache; +import cam72cam.umc.api.serialization.ResourceCache.GenericByteBuffer; +import cam72cam.umc.api.serialization.TagCompound; import org.apache.commons.lang3.tuple.Pair; import javax.imageio.ImageIO; @@ -21,7 +22,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static cam72cam.mod.model.obj.ImageUtils.*; +import static cam72cam.umc.api.model.obj.ImageUtils.*; public class OBJModel { private static final OBJTextureSheet defTex = new OBJTextureSheet(1, 1, () -> new ResourceCache.GenericByteBuffer(new int[] { 0x0000FF }), Integer.MAX_VALUE/2); diff --git a/src/main/java/cam72cam/mod/model/obj/OBJParser.java b/src/main/java/cam72cam/umc/api/model/obj/OBJParser.java similarity index 98% rename from src/main/java/cam72cam/mod/model/obj/OBJParser.java rename to src/main/java/cam72cam/umc/api/model/obj/OBJParser.java index 241a6a678..63ea332bf 100644 --- a/src/main/java/cam72cam/mod/model/obj/OBJParser.java +++ b/src/main/java/cam72cam/umc/api/model/obj/OBJParser.java @@ -1,7 +1,7 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.model.obj.Buffers.*; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.model.obj.Buffers.*; import java.io.*; import java.util.*; diff --git a/src/main/java/cam72cam/mod/model/obj/OBJTexturePacker.java b/src/main/java/cam72cam/umc/api/model/obj/OBJTexturePacker.java similarity index 98% rename from src/main/java/cam72cam/mod/model/obj/OBJTexturePacker.java rename to src/main/java/cam72cam/umc/api/model/obj/OBJTexturePacker.java index 4672d0e0f..90d5926e9 100644 --- a/src/main/java/cam72cam/mod/model/obj/OBJTexturePacker.java +++ b/src/main/java/cam72cam/umc/api/model/obj/OBJTexturePacker.java @@ -1,13 +1,11 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.Config; -import cam72cam.mod.ModCore; -import cam72cam.mod.resource.Identifier; +import cam72cam.umc.api.Config; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.resource.Identifier; import org.apache.commons.lang3.tuple.Pair; import javax.imageio.ImageIO; -import javax.imageio.ImageReader; -import javax.imageio.stream.ImageInputStream; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; @@ -18,7 +16,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import static cam72cam.mod.model.obj.ImageUtils.scaleImage; +import static cam72cam.umc.api.model.obj.ImageUtils.scaleImage; /* primer: https://codeincomplete.com/articles/bin-packing/ */ public class OBJTexturePacker { diff --git a/src/main/java/cam72cam/mod/model/obj/Vec2f.java b/src/main/java/cam72cam/umc/api/model/obj/Vec2f.java similarity index 93% rename from src/main/java/cam72cam/mod/model/obj/Vec2f.java rename to src/main/java/cam72cam/umc/api/model/obj/Vec2f.java index 604ab6ee6..137a9c209 100644 --- a/src/main/java/cam72cam/mod/model/obj/Vec2f.java +++ b/src/main/java/cam72cam/umc/api/model/obj/Vec2f.java @@ -1,4 +1,4 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; public class Vec2f { diff --git a/src/main/java/cam72cam/mod/model/obj/VertexBuffer.java b/src/main/java/cam72cam/umc/api/model/obj/VertexBuffer.java similarity index 96% rename from src/main/java/cam72cam/mod/model/obj/VertexBuffer.java rename to src/main/java/cam72cam/umc/api/model/obj/VertexBuffer.java index d83d32318..8494a7596 100644 --- a/src/main/java/cam72cam/mod/model/obj/VertexBuffer.java +++ b/src/main/java/cam72cam/umc/api/model/obj/VertexBuffer.java @@ -1,4 +1,4 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; public class VertexBuffer { public final boolean hasNormals; diff --git a/src/main/java/cam72cam/mod/net/Packet.java b/src/main/java/cam72cam/umc/api/net/Packet.java similarity index 89% rename from src/main/java/cam72cam/mod/net/Packet.java rename to src/main/java/cam72cam/umc/api/net/Packet.java index 4ef36bf6c..70801bacb 100644 --- a/src/main/java/cam72cam/mod/net/Packet.java +++ b/src/main/java/cam72cam/umc/api/net/Packet.java @@ -1,19 +1,19 @@ -package cam72cam.mod.net; +package cam72cam.umc.api.net; import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.ModCore; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.entity.Player; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.serialization.SerializationException; -import cam72cam.mod.serialization.TagCompound; -import cam72cam.mod.serialization.TagField; -import cam72cam.mod.serialization.TagSerializer; -import cam72cam.mod.world.World; +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.serialization.SerializationException; +import cam72cam.umc.api.serialization.TagCompound; +import cam72cam.umc.api.serialization.TagField; +import cam72cam.umc.api.serialization.TagSerializer; +import cam72cam.umc.api.world.World; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -31,7 +31,7 @@ * @see TagSerializer */ public abstract class Packet { - private static final SimpleNetworkWrapper net = NetworkRegistry.INSTANCE.newSimpleChannel("cam72cam.mod"); + private static final SimpleNetworkWrapper net = NetworkRegistry.INSTANCE.newSimpleChannel("cam72cam.umc.api"); // Packet class name -> Packet Constructor private static final Map> types = new HashMap<>(); @@ -128,7 +128,7 @@ public Message(Packet pkt) { @Override public void fromBytes(ByteBuf buf) { TagCompound data = new TagCompound(ByteBufUtils.readTag(buf)); - String cls = data.getString("cam72cam.mod.pktid"); + String cls = data.getString("cam72cam.umc.api.pktid"); packet = types.get(cls).get(); packet.data = data; } @@ -136,7 +136,7 @@ public void fromBytes(ByteBuf buf) { @Override public void toBytes(ByteBuf buf) { TagCompound data = new TagCompound(); - data.setString("cam72cam.mod.pktid", packet.getClass().toString()); + data.setString("cam72cam.umc.api.pktid", packet.getClass().toString()); try { TagSerializer.serialize(data, packet); } catch (SerializationException e) { diff --git a/src/main/java/cam72cam/mod/net/PacketDirection.java b/src/main/java/cam72cam/umc/api/net/PacketDirection.java similarity index 70% rename from src/main/java/cam72cam/mod/net/PacketDirection.java rename to src/main/java/cam72cam/umc/api/net/PacketDirection.java index 86859dd32..927fdfbf3 100644 --- a/src/main/java/cam72cam/mod/net/PacketDirection.java +++ b/src/main/java/cam72cam/umc/api/net/PacketDirection.java @@ -1,4 +1,4 @@ -package cam72cam.mod.net; +package cam72cam.umc.api.net; public enum PacketDirection { ClientToServer, diff --git a/src/main/java/cam72cam/mod/render/BakedScaledModel.java b/src/main/java/cam72cam/umc/api/render/BakedScaledModel.java similarity index 97% rename from src/main/java/cam72cam/mod/render/BakedScaledModel.java rename to src/main/java/cam72cam/umc/api/render/BakedScaledModel.java index 790a23974..70748d43e 100644 --- a/src/main/java/cam72cam/mod/render/BakedScaledModel.java +++ b/src/main/java/cam72cam/umc/api/render/BakedScaledModel.java @@ -1,4 +1,4 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.EnumFacing; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import javax.vecmath.Vector3f; import java.util.*; diff --git a/src/main/java/cam72cam/mod/render/BlockRender.java b/src/main/java/cam72cam/umc/api/render/BlockRender.java similarity index 95% rename from src/main/java/cam72cam/mod/render/BlockRender.java rename to src/main/java/cam72cam/umc/api/render/BlockRender.java index b6128785d..c385cbac3 100644 --- a/src/main/java/cam72cam/mod/render/BlockRender.java +++ b/src/main/java/cam72cam/umc/api/render/BlockRender.java @@ -1,12 +1,12 @@ -package cam72cam.mod.render; - -import cam72cam.mod.block.BlockEntity; -import cam72cam.mod.block.BlockType; -import cam72cam.mod.block.BlockTypeEntity; -import cam72cam.mod.block.tile.TileEntity; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; +package cam72cam.umc.api.render; + +import cam72cam.umc.api.block.BlockEntity; +import cam72cam.umc.api.block.BlockType; +import cam72cam.umc.api.block.BlockTypeEntity; +import cam72cam.umc.api.block.tile.TileEntity; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/cam72cam/mod/render/Color.java b/src/main/java/cam72cam/umc/api/render/Color.java similarity index 95% rename from src/main/java/cam72cam/mod/render/Color.java rename to src/main/java/cam72cam/umc/api/render/Color.java index 6ccc067e0..e0f564f93 100644 --- a/src/main/java/cam72cam/mod/render/Color.java +++ b/src/main/java/cam72cam/umc/api/render/Color.java @@ -1,4 +1,4 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; import net.minecraft.item.EnumDyeColor; diff --git a/src/main/java/cam72cam/mod/render/EntityRenderer.java b/src/main/java/cam72cam/umc/api/render/EntityRenderer.java similarity index 92% rename from src/main/java/cam72cam/mod/render/EntityRenderer.java rename to src/main/java/cam72cam/umc/api/render/EntityRenderer.java index 03a2f6f2c..d882a27ee 100644 --- a/src/main/java/cam72cam/mod/render/EntityRenderer.java +++ b/src/main/java/cam72cam/umc/api/render/EntityRenderer.java @@ -1,14 +1,14 @@ -package cam72cam.mod.render; - -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.entity.ModdedEntity; -import cam72cam.mod.entity.SeatEntity; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.world.World; +package cam72cam.umc.api.render; + +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.entity.ModdedEntity; +import cam72cam.umc.api.entity.SeatEntity; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.world.World; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/cam72cam/mod/render/GLSLShader.java b/src/main/java/cam72cam/umc/api/render/GLSLShader.java similarity index 97% rename from src/main/java/cam72cam/mod/render/GLSLShader.java rename to src/main/java/cam72cam/umc/api/render/GLSLShader.java index c07a7eb53..fe1e811e6 100644 --- a/src/main/java/cam72cam/mod/render/GLSLShader.java +++ b/src/main/java/cam72cam/umc/api/render/GLSLShader.java @@ -1,7 +1,7 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.util.With; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.util.With; import net.minecraft.client.renderer.OpenGlHelper; import org.apache.commons.io.IOUtils; import org.lwjgl.BufferUtils; @@ -9,7 +9,7 @@ import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/cam72cam/mod/render/GPUInfo.java b/src/main/java/cam72cam/umc/api/render/GPUInfo.java similarity index 97% rename from src/main/java/cam72cam/mod/render/GPUInfo.java rename to src/main/java/cam72cam/umc/api/render/GPUInfo.java index d4340a1ec..af1570598 100644 --- a/src/main/java/cam72cam/mod/render/GPUInfo.java +++ b/src/main/java/cam72cam/umc/api/render/GPUInfo.java @@ -1,4 +1,4 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; import org.lwjgl.opengl.*; diff --git a/src/main/java/cam72cam/mod/render/GlobalRender.java b/src/main/java/cam72cam/umc/api/render/GlobalRender.java similarity index 94% rename from src/main/java/cam72cam/mod/render/GlobalRender.java rename to src/main/java/cam72cam/umc/api/render/GlobalRender.java index 865bbe960..80c499111 100644 --- a/src/main/java/cam72cam/mod/render/GlobalRender.java +++ b/src/main/java/cam72cam/umc/api/render/GlobalRender.java @@ -1,15 +1,15 @@ -package cam72cam.mod.render; - -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.entity.Player; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.item.CustomItem; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.util.With; +package cam72cam.umc.api.render; + +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.item.CustomItem; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.util.With; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.culling.ClippingHelperImpl; diff --git a/src/main/java/cam72cam/mod/render/IEntityRender.java b/src/main/java/cam72cam/umc/api/render/IEntityRender.java similarity index 65% rename from src/main/java/cam72cam/mod/render/IEntityRender.java rename to src/main/java/cam72cam/umc/api/render/IEntityRender.java index 6054cc06b..56ab0f579 100644 --- a/src/main/java/cam72cam/mod/render/IEntityRender.java +++ b/src/main/java/cam72cam/umc/api/render/IEntityRender.java @@ -1,7 +1,7 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.render.opengl.RenderState; public interface IEntityRender { /** Called once per tick per entity */ diff --git a/src/main/java/cam72cam/mod/render/ItemRender.java b/src/main/java/cam72cam/umc/api/render/ItemRender.java similarity index 95% rename from src/main/java/cam72cam/mod/render/ItemRender.java rename to src/main/java/cam72cam/umc/api/render/ItemRender.java index e6f4ab959..4de7f90bf 100644 --- a/src/main/java/cam72cam/mod/render/ItemRender.java +++ b/src/main/java/cam72cam/umc/api/render/ItemRender.java @@ -1,17 +1,17 @@ -package cam72cam.mod.render; - -import cam72cam.mod.Config; -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.ModCore; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.gui.Progress; -import cam72cam.mod.item.CustomItem; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.util.With; -import cam72cam.mod.world.World; +package cam72cam.umc.api.render; + +import cam72cam.umc.api.Config; +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.gui.Progress; +import cam72cam.umc.api.item.CustomItem; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.util.With; +import cam72cam.umc.api.world.World; import com.google.common.collect.ImmutableList; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Objects; /** Item Render Registry (Here be dragons...) */ public class ItemRender { diff --git a/src/main/java/cam72cam/mod/render/Light.java b/src/main/java/cam72cam/umc/api/render/Light.java similarity index 97% rename from src/main/java/cam72cam/mod/render/Light.java rename to src/main/java/cam72cam/umc/api/render/Light.java index f950d9b53..ac3fcb633 100644 --- a/src/main/java/cam72cam/mod/render/Light.java +++ b/src/main/java/cam72cam/umc/api/render/Light.java @@ -1,9 +1,9 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.ModCore; -import cam72cam.mod.event.CommonEvents; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.world.World; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.event.CommonEvents; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.world.World; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/cam72cam/mod/render/OptiFine.java b/src/main/java/cam72cam/umc/api/render/OptiFine.java similarity index 96% rename from src/main/java/cam72cam/mod/render/OptiFine.java rename to src/main/java/cam72cam/umc/api/render/OptiFine.java index 6f021e731..e0d15acc3 100644 --- a/src/main/java/cam72cam/mod/render/OptiFine.java +++ b/src/main/java/cam72cam/umc/api/render/OptiFine.java @@ -1,11 +1,10 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.util.With; +import cam72cam.umc.api.util.With; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import org.lwjgl.opengl.ARBShaderObjects; -import java.lang.reflect.Field; import java.lang.reflect.Method; public class OptiFine { diff --git a/src/main/java/cam72cam/mod/render/Particle.java b/src/main/java/cam72cam/umc/api/render/Particle.java similarity index 96% rename from src/main/java/cam72cam/mod/render/Particle.java rename to src/main/java/cam72cam/umc/api/render/Particle.java index 1c036eb3b..d7beada95 100644 --- a/src/main/java/cam72cam/mod/render/Particle.java +++ b/src/main/java/cam72cam/umc/api/render/Particle.java @@ -1,10 +1,10 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.world.World; +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.world.World; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; @@ -12,7 +12,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cam72cam/mod/render/RenderFunction.java b/src/main/java/cam72cam/umc/api/render/RenderFunction.java similarity index 57% rename from src/main/java/cam72cam/mod/render/RenderFunction.java rename to src/main/java/cam72cam/umc/api/render/RenderFunction.java index f94604e3a..6d658577d 100644 --- a/src/main/java/cam72cam/mod/render/RenderFunction.java +++ b/src/main/java/cam72cam/umc/api/render/RenderFunction.java @@ -1,6 +1,6 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.render.opengl.RenderState; +import cam72cam.umc.api.render.opengl.RenderState; @FunctionalInterface public interface RenderFunction { diff --git a/src/main/java/cam72cam/mod/render/ShaderHelper.java b/src/main/java/cam72cam/umc/api/render/ShaderHelper.java similarity index 91% rename from src/main/java/cam72cam/mod/render/ShaderHelper.java rename to src/main/java/cam72cam/umc/api/render/ShaderHelper.java index 22c470bd4..2323705f8 100644 --- a/src/main/java/cam72cam/mod/render/ShaderHelper.java +++ b/src/main/java/cam72cam/umc/api/render/ShaderHelper.java @@ -1,4 +1,4 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; import org.lwjgl.opengl.ARBShaderObjects; diff --git a/src/main/java/cam72cam/mod/render/SpriteSheet.java b/src/main/java/cam72cam/umc/api/render/SpriteSheet.java similarity index 92% rename from src/main/java/cam72cam/mod/render/SpriteSheet.java rename to src/main/java/cam72cam/umc/api/render/SpriteSheet.java index 3a2390c69..611fb46ed 100644 --- a/src/main/java/cam72cam/mod/render/SpriteSheet.java +++ b/src/main/java/cam72cam/umc/api/render/SpriteSheet.java @@ -1,11 +1,11 @@ -package cam72cam.mod.render; +package cam72cam.umc.api.render; -import cam72cam.mod.render.opengl.DirectDraw; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.render.opengl.Texture; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.util.With; +import cam72cam.umc.api.render.opengl.DirectDraw; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.render.opengl.Texture; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.util.With; import net.minecraft.client.renderer.texture.TextureUtil; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/cam72cam/mod/render/StandardModel.java b/src/main/java/cam72cam/umc/api/render/StandardModel.java similarity index 94% rename from src/main/java/cam72cam/mod/render/StandardModel.java rename to src/main/java/cam72cam/umc/api/render/StandardModel.java index b928aeb86..043d9deec 100644 --- a/src/main/java/cam72cam/mod/render/StandardModel.java +++ b/src/main/java/cam72cam/umc/api/render/StandardModel.java @@ -1,11 +1,11 @@ -package cam72cam.mod.render; - -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.render.opengl.RenderContext; -import cam72cam.mod.render.opengl.RenderState; -import cam72cam.mod.render.opengl.Texture; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.util.With; +package cam72cam.umc.api.render; + +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.render.opengl.RenderContext; +import cam72cam.umc.api.render.opengl.RenderState; +import cam72cam.umc.api.render.opengl.Texture; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.util.With; import net.minecraft.block.Block; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockLog; @@ -25,7 +25,7 @@ import net.minecraftforge.client.model.pipeline.LightUtil; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import java.util.ArrayList; import java.util.List; @@ -42,7 +42,7 @@ public boolean add(Pair o) { private final List custom = new ArrayList<>(); /** Hacky way to turn an item into a blockstate, probably has some weird edge cases */ - private static IBlockState itemToBlockState(cam72cam.mod.item.ItemStack stack) { + private static IBlockState itemToBlockState(ItemStack stack) { Block block = Block.getBlockFromItem(stack.internal.getItem()); @SuppressWarnings("deprecation") IBlockState gravelState = block.getStateFromMeta(stack.internal.getMetadata()); diff --git a/src/main/java/cam72cam/mod/render/obj/OBJRender.java b/src/main/java/cam72cam/umc/api/render/obj/OBJRender.java similarity index 95% rename from src/main/java/cam72cam/mod/render/obj/OBJRender.java rename to src/main/java/cam72cam/umc/api/render/obj/OBJRender.java index bd22e6f76..7404612da 100644 --- a/src/main/java/cam72cam/mod/render/obj/OBJRender.java +++ b/src/main/java/cam72cam/umc/api/render/obj/OBJRender.java @@ -1,13 +1,13 @@ -package cam72cam.mod.render.obj; - -import cam72cam.mod.model.obj.OBJGroup; -import cam72cam.mod.model.obj.OBJModel; -import cam72cam.mod.model.obj.VertexBuffer; -import cam72cam.mod.util.With; -import cam72cam.mod.render.opengl.VBO; -import cam72cam.mod.render.opengl.RenderState; +package cam72cam.umc.api.render.obj; + +import cam72cam.umc.api.model.obj.OBJGroup; +import cam72cam.umc.api.model.obj.OBJModel; +import cam72cam.umc.api.model.obj.VertexBuffer; +import cam72cam.umc.api.util.With; +import cam72cam.umc.api.render.opengl.VBO; +import cam72cam.umc.api.render.opengl.RenderState; import org.lwjgl.opengl.GL11; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import javax.vecmath.Matrix3f; import javax.vecmath.SingularMatrixException; diff --git a/src/main/java/cam72cam/mod/render/obj/OBJTextureSheet.java b/src/main/java/cam72cam/umc/api/render/obj/OBJTextureSheet.java similarity index 82% rename from src/main/java/cam72cam/mod/render/obj/OBJTextureSheet.java rename to src/main/java/cam72cam/umc/api/render/obj/OBJTextureSheet.java index ca7dac5f1..14c4b0bc6 100644 --- a/src/main/java/cam72cam/mod/render/obj/OBJTextureSheet.java +++ b/src/main/java/cam72cam/umc/api/render/obj/OBJTextureSheet.java @@ -1,7 +1,7 @@ -package cam72cam.mod.render.obj; +package cam72cam.umc.api.render.obj; -import cam72cam.mod.render.opengl.CustomTexture; -import cam72cam.mod.serialization.ResourceCache; +import cam72cam.umc.api.render.opengl.CustomTexture; +import cam72cam.umc.api.serialization.ResourceCache; import net.minecraft.client.renderer.GLAllocation; import java.nio.ByteBuffer; diff --git a/src/main/java/cam72cam/mod/render/opengl/BlendMode.java b/src/main/java/cam72cam/umc/api/render/opengl/BlendMode.java similarity index 95% rename from src/main/java/cam72cam/mod/render/opengl/BlendMode.java rename to src/main/java/cam72cam/umc/api/render/opengl/BlendMode.java index 1de68ff4f..74c768448 100644 --- a/src/main/java/cam72cam/mod/render/opengl/BlendMode.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/BlendMode.java @@ -1,6 +1,6 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.util.With; +import cam72cam.umc.api.util.With; import net.minecraft.client.renderer.GLAllocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; @@ -8,7 +8,7 @@ import java.nio.FloatBuffer; import java.util.function.Function; -import static cam72cam.mod.render.opengl.RenderContext.applyBool; +import static cam72cam.umc.api.render.opengl.RenderContext.applyBool; public class BlendMode { public static final int GL_ZERO = GL11.GL_ZERO; diff --git a/src/main/java/cam72cam/mod/render/opengl/CustomTexture.java b/src/main/java/cam72cam/umc/api/render/opengl/CustomTexture.java similarity index 95% rename from src/main/java/cam72cam/mod/render/opengl/CustomTexture.java rename to src/main/java/cam72cam/umc/api/render/opengl/CustomTexture.java index 8017a5b04..3e638a0e9 100644 --- a/src/main/java/cam72cam/mod/render/opengl/CustomTexture.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/CustomTexture.java @@ -1,9 +1,9 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.Config; -import cam72cam.mod.ModCore; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.util.With; +import cam72cam.umc.api.Config; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.util.With; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/cam72cam/mod/render/opengl/DirectDraw.java b/src/main/java/cam72cam/umc/api/render/opengl/DirectDraw.java similarity index 94% rename from src/main/java/cam72cam/mod/render/opengl/DirectDraw.java rename to src/main/java/cam72cam/umc/api/render/opengl/DirectDraw.java index d9e75c1da..67b8b453e 100644 --- a/src/main/java/cam72cam/mod/render/opengl/DirectDraw.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/DirectDraw.java @@ -1,7 +1,7 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.util.With; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.util.With; import org.lwjgl.opengl.GL11; import java.util.ArrayList; diff --git a/src/main/java/cam72cam/mod/render/opengl/MinecraftTexture.java b/src/main/java/cam72cam/umc/api/render/opengl/MinecraftTexture.java similarity index 95% rename from src/main/java/cam72cam/mod/render/opengl/MinecraftTexture.java rename to src/main/java/cam72cam/umc/api/render/opengl/MinecraftTexture.java index 2a14feef0..f2cd925a9 100644 --- a/src/main/java/cam72cam/mod/render/opengl/MinecraftTexture.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/MinecraftTexture.java @@ -1,6 +1,6 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.resource.Identifier; +import cam72cam.umc.api.resource.Identifier; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.*; import net.minecraft.client.resources.IResource; diff --git a/src/main/java/cam72cam/mod/render/opengl/RenderContext.java b/src/main/java/cam72cam/umc/api/render/opengl/RenderContext.java similarity index 97% rename from src/main/java/cam72cam/mod/render/opengl/RenderContext.java rename to src/main/java/cam72cam/umc/api/render/opengl/RenderContext.java index 0420cd55a..31a302859 100644 --- a/src/main/java/cam72cam/mod/render/opengl/RenderContext.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/RenderContext.java @@ -1,8 +1,8 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.gui.helpers.GUIHelpers; -import cam72cam.mod.render.ShaderHelper; -import cam72cam.mod.util.With; +import cam72cam.umc.api.gui.helpers.GUIHelpers; +import cam72cam.umc.api.render.ShaderHelper; +import cam72cam.umc.api.util.With; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GLAllocation; @@ -11,13 +11,13 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; -import util.Matrix4; +import cam72cam.umc.api.util.Matrix4; import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.util.*; -import static cam72cam.mod.render.opengl.Texture.NO_TEXTURE; +import static cam72cam.umc.api.render.opengl.Texture.NO_TEXTURE; public class RenderContext { private static FloatBuffer fourFloatBuffer; diff --git a/src/main/java/cam72cam/mod/render/opengl/RenderState.java b/src/main/java/cam72cam/umc/api/render/opengl/RenderState.java similarity index 97% rename from src/main/java/cam72cam/mod/render/opengl/RenderState.java rename to src/main/java/cam72cam/umc/api/render/opengl/RenderState.java index 86aa26ad5..46a236353 100644 --- a/src/main/java/cam72cam/mod/render/opengl/RenderState.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/RenderState.java @@ -1,8 +1,8 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.render.OptiFine; -import util.Matrix4; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.render.OptiFine; +import cam72cam.umc.api.util.Matrix4; import javax.annotation.Nullable; import java.awt.geom.Rectangle2D; diff --git a/src/main/java/cam72cam/mod/render/opengl/Texture.java b/src/main/java/cam72cam/umc/api/render/opengl/Texture.java similarity index 74% rename from src/main/java/cam72cam/mod/render/opengl/Texture.java rename to src/main/java/cam72cam/umc/api/render/opengl/Texture.java index 6d5279d8b..d5f756adf 100644 --- a/src/main/java/cam72cam/mod/render/opengl/Texture.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/Texture.java @@ -1,6 +1,6 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.resource.Identifier; +import cam72cam.umc.api.resource.Identifier; public interface Texture { Texture NO_TEXTURE = Texture.wrap(-1); diff --git a/src/main/java/cam72cam/mod/render/opengl/VBO.java b/src/main/java/cam72cam/umc/api/render/opengl/VBO.java similarity index 97% rename from src/main/java/cam72cam/mod/render/opengl/VBO.java rename to src/main/java/cam72cam/umc/api/render/opengl/VBO.java index 78bb51e09..a1fcfe2bd 100644 --- a/src/main/java/cam72cam/mod/render/opengl/VBO.java +++ b/src/main/java/cam72cam/umc/api/render/opengl/VBO.java @@ -1,8 +1,8 @@ -package cam72cam.mod.render.opengl; +package cam72cam.umc.api.render.opengl; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.model.obj.VertexBuffer; -import cam72cam.mod.util.With; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.model.obj.VertexBuffer; +import cam72cam.umc.api.util.With; import net.minecraft.client.renderer.GLAllocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL15; diff --git a/src/main/java/cam72cam/mod/resource/BuiltinPack.java b/src/main/java/cam72cam/umc/api/resource/BuiltinPack.java similarity index 99% rename from src/main/java/cam72cam/mod/resource/BuiltinPack.java rename to src/main/java/cam72cam/umc/api/resource/BuiltinPack.java index a03dfa055..b174c0da9 100644 --- a/src/main/java/cam72cam/mod/resource/BuiltinPack.java +++ b/src/main/java/cam72cam/umc/api/resource/BuiltinPack.java @@ -1,6 +1,6 @@ -package cam72cam.mod.resource; +package cam72cam.umc.api.resource; -import cam72cam.mod.ModCore; +import cam72cam.umc.api.ModCore; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.*; import net.minecraft.client.resources.data.IMetadataSection; diff --git a/src/main/java/cam72cam/mod/resource/Data.java b/src/main/java/cam72cam/umc/api/resource/Data.java similarity index 96% rename from src/main/java/cam72cam/mod/resource/Data.java rename to src/main/java/cam72cam/umc/api/resource/Data.java index c0c99f5b6..7f37e75b2 100644 --- a/src/main/java/cam72cam/mod/resource/Data.java +++ b/src/main/java/cam72cam/umc/api/resource/Data.java @@ -1,6 +1,6 @@ -package cam72cam.mod.resource; +package cam72cam.umc.api.resource; -import cam72cam.mod.ModCore; +import cam72cam.umc.api.ModCore; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResource; import net.minecraftforge.fml.common.Loader; @@ -23,7 +23,7 @@ /** Internal, do not use directly */ class Data { - @SidedProxy(clientSide = "cam72cam.mod.resource.Data$ClientProxy", serverSide = "cam72cam.mod.resource.Data$ServerProxy", modId = ModCore.MODID) + @SidedProxy(clientSide = "cam72cam.umc.api.resource.Data$ClientProxy", serverSide = "cam72cam.umc.api.resource.Data$ServerProxy", modId = ModCore.MODID) public static DataProxy proxy; public static abstract class DataProxy { diff --git a/src/main/java/cam72cam/mod/resource/Identifier.java b/src/main/java/cam72cam/umc/api/resource/Identifier.java similarity index 98% rename from src/main/java/cam72cam/mod/resource/Identifier.java rename to src/main/java/cam72cam/umc/api/resource/Identifier.java index 5383abb2c..65896b73b 100644 --- a/src/main/java/cam72cam/mod/resource/Identifier.java +++ b/src/main/java/cam72cam/umc/api/resource/Identifier.java @@ -1,4 +1,4 @@ -package cam72cam.mod.resource; +package cam72cam.umc.api.resource; import net.minecraft.util.ResourceLocation; import org.apache.commons.io.FilenameUtils; diff --git a/src/main/java/cam72cam/mod/serialization/DefaultTagMapper.java b/src/main/java/cam72cam/umc/api/serialization/DefaultTagMapper.java similarity index 95% rename from src/main/java/cam72cam/mod/serialization/DefaultTagMapper.java rename to src/main/java/cam72cam/umc/api/serialization/DefaultTagMapper.java index d5a167462..67316eb43 100644 --- a/src/main/java/cam72cam/mod/serialization/DefaultTagMapper.java +++ b/src/main/java/cam72cam/umc/api/serialization/DefaultTagMapper.java @@ -1,12 +1,11 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; -import cam72cam.mod.block.BlockEntity; -import cam72cam.mod.block.tile.TileEntity; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.world.World; +import cam72cam.umc.api.block.BlockEntity; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.world.World; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/cam72cam/mod/serialization/ResourceCache.java b/src/main/java/cam72cam/umc/api/serialization/ResourceCache.java similarity index 97% rename from src/main/java/cam72cam/mod/serialization/ResourceCache.java rename to src/main/java/cam72cam/umc/api/serialization/ResourceCache.java index 9a126549e..f234ceec2 100644 --- a/src/main/java/cam72cam/mod/serialization/ResourceCache.java +++ b/src/main/java/cam72cam/umc/api/serialization/ResourceCache.java @@ -1,10 +1,9 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; -import cam72cam.mod.ModCore; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.resource.Identifier.InputStreamMod; -import cam72cam.mod.util.ThrowingFunction; -import com.google.common.hash.HashCode; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.resource.Identifier.InputStreamMod; +import cam72cam.umc.api.util.ThrowingFunction; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import com.google.common.hash.HashingInputStream; @@ -12,7 +11,6 @@ import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4FastDecompressor; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.tuple.Pair; import java.io.*; diff --git a/src/main/java/cam72cam/mod/serialization/SerializationException.java b/src/main/java/cam72cam/umc/api/serialization/SerializationException.java similarity index 85% rename from src/main/java/cam72cam/mod/serialization/SerializationException.java rename to src/main/java/cam72cam/umc/api/serialization/SerializationException.java index 188f76009..aeb3e979f 100644 --- a/src/main/java/cam72cam/mod/serialization/SerializationException.java +++ b/src/main/java/cam72cam/umc/api/serialization/SerializationException.java @@ -1,4 +1,4 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; public class SerializationException extends Exception { public SerializationException(String msg, Throwable parent) { diff --git a/src/main/java/cam72cam/mod/serialization/StrictTagMapper.java b/src/main/java/cam72cam/umc/api/serialization/StrictTagMapper.java similarity index 92% rename from src/main/java/cam72cam/mod/serialization/StrictTagMapper.java rename to src/main/java/cam72cam/umc/api/serialization/StrictTagMapper.java index e84197713..add895aba 100644 --- a/src/main/java/cam72cam/mod/serialization/StrictTagMapper.java +++ b/src/main/java/cam72cam/umc/api/serialization/StrictTagMapper.java @@ -1,4 +1,4 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; /** Set's field to null if tag is missing */ public class StrictTagMapper extends DefaultTagMapper { diff --git a/src/main/java/cam72cam/mod/serialization/TagCompound.java b/src/main/java/cam72cam/umc/api/serialization/TagCompound.java similarity index 95% rename from src/main/java/cam72cam/mod/serialization/TagCompound.java rename to src/main/java/cam72cam/umc/api/serialization/TagCompound.java index e4b7c01b5..c8fd926fd 100644 --- a/src/main/java/cam72cam/mod/serialization/TagCompound.java +++ b/src/main/java/cam72cam/umc/api/serialization/TagCompound.java @@ -1,12 +1,12 @@ -package cam72cam.mod.serialization; - -import cam72cam.mod.block.BlockEntity; -import cam72cam.mod.block.tile.TileEntity; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.item.ItemStack; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.world.World; +package cam72cam.umc.api.serialization; + +import cam72cam.umc.api.block.BlockEntity; +import cam72cam.umc.api.block.tile.TileEntity; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.item.ItemStack; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.world.World; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -166,11 +166,11 @@ public TagCompound setVec3d(String key, Vec3d value) { }); } - public cam72cam.mod.entity.Entity getEntity(String key, World world) { - return getEntity(key, world, cam72cam.mod.entity.Entity.class); + public Entity getEntity(String key, World world) { + return getEntity(key, world, Entity.class); } - public T getEntity(String key, World world, Class cls) { + public T getEntity(String key, World world, Class cls) { return getter(key, () -> { TagCompound data = get(key); UUID id = data.getUUID("id"); diff --git a/src/main/java/cam72cam/mod/serialization/TagField.java b/src/main/java/cam72cam/umc/api/serialization/TagField.java similarity index 93% rename from src/main/java/cam72cam/mod/serialization/TagField.java rename to src/main/java/cam72cam/umc/api/serialization/TagField.java index 5604c3e6d..dc650c690 100644 --- a/src/main/java/cam72cam/mod/serialization/TagField.java +++ b/src/main/java/cam72cam/umc/api/serialization/TagField.java @@ -1,4 +1,4 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/cam72cam/mod/serialization/TagMapped.java b/src/main/java/cam72cam/umc/api/serialization/TagMapped.java similarity index 88% rename from src/main/java/cam72cam/mod/serialization/TagMapped.java rename to src/main/java/cam72cam/umc/api/serialization/TagMapped.java index c66e6668f..0f1a00d19 100644 --- a/src/main/java/cam72cam/mod/serialization/TagMapped.java +++ b/src/main/java/cam72cam/umc/api/serialization/TagMapped.java @@ -1,4 +1,4 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/cam72cam/mod/serialization/TagMapper.java b/src/main/java/cam72cam/umc/api/serialization/TagMapper.java similarity index 93% rename from src/main/java/cam72cam/mod/serialization/TagMapper.java rename to src/main/java/cam72cam/umc/api/serialization/TagMapper.java index fc75e2d80..bbae822d1 100644 --- a/src/main/java/cam72cam/mod/serialization/TagMapper.java +++ b/src/main/java/cam72cam/umc/api/serialization/TagMapper.java @@ -1,6 +1,6 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; -import cam72cam.mod.world.World; +import cam72cam.umc.api.world.World; import java.util.function.BiConsumer; import java.util.function.Function; diff --git a/src/main/java/cam72cam/mod/serialization/TagSerializer.java b/src/main/java/cam72cam/umc/api/serialization/TagSerializer.java similarity index 98% rename from src/main/java/cam72cam/mod/serialization/TagSerializer.java rename to src/main/java/cam72cam/umc/api/serialization/TagSerializer.java index 6353fb936..2d90e1cec 100644 --- a/src/main/java/cam72cam/mod/serialization/TagSerializer.java +++ b/src/main/java/cam72cam/umc/api/serialization/TagSerializer.java @@ -1,6 +1,6 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; -import cam72cam.mod.world.World; +import cam72cam.umc.api.world.World; import javax.annotation.Nullable; import java.lang.annotation.Annotation; diff --git a/src/main/java/cam72cam/mod/sound/Audio.java b/src/main/java/cam72cam/umc/api/sound/Audio.java similarity index 86% rename from src/main/java/cam72cam/mod/sound/Audio.java rename to src/main/java/cam72cam/umc/api/sound/Audio.java index d1533fa6a..980b8c8fb 100644 --- a/src/main/java/cam72cam/mod/sound/Audio.java +++ b/src/main/java/cam72cam/umc/api/sound/Audio.java @@ -1,9 +1,9 @@ -package cam72cam.mod.sound; +package cam72cam.umc.api.sound; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.resource.Identifier; -import cam72cam.mod.world.World; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.resource.Identifier; +import cam72cam.umc.api.world.World; import paulscode.sound.SoundSystemConfig; public class Audio { diff --git a/src/main/java/cam72cam/mod/sound/ClientSound.java b/src/main/java/cam72cam/umc/api/sound/ClientSound.java similarity index 96% rename from src/main/java/cam72cam/mod/sound/ClientSound.java rename to src/main/java/cam72cam/umc/api/sound/ClientSound.java index 474a63864..f34e70223 100644 --- a/src/main/java/cam72cam/mod/sound/ClientSound.java +++ b/src/main/java/cam72cam/umc/api/sound/ClientSound.java @@ -1,8 +1,8 @@ -package cam72cam.mod.sound; +package cam72cam.umc.api.sound; -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.entity.Player; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.math.Vec3d; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.*; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/cam72cam/mod/sound/ISound.java b/src/main/java/cam72cam/umc/api/sound/ISound.java similarity index 86% rename from src/main/java/cam72cam/mod/sound/ISound.java rename to src/main/java/cam72cam/umc/api/sound/ISound.java index 0003484e1..b65433b0a 100644 --- a/src/main/java/cam72cam/mod/sound/ISound.java +++ b/src/main/java/cam72cam/umc/api/sound/ISound.java @@ -1,6 +1,6 @@ -package cam72cam.mod.sound; +package cam72cam.umc.api.sound; -import cam72cam.mod.math.Vec3d; +import cam72cam.umc.api.math.Vec3d; /** Interface representing a sound object. We may implement a server side sound at some point in the future */ public interface ISound { diff --git a/src/main/java/cam72cam/mod/sound/SoundCategory.java b/src/main/java/cam72cam/umc/api/sound/SoundCategory.java similarity index 95% rename from src/main/java/cam72cam/mod/sound/SoundCategory.java rename to src/main/java/cam72cam/umc/api/sound/SoundCategory.java index 07cfb21be..1609a66d5 100644 --- a/src/main/java/cam72cam/mod/sound/SoundCategory.java +++ b/src/main/java/cam72cam/umc/api/sound/SoundCategory.java @@ -1,4 +1,4 @@ -package cam72cam.mod.sound; +package cam72cam.umc.api.sound; public enum SoundCategory { MASTER(net.minecraft.util.SoundCategory.MASTER), diff --git a/src/main/java/cam72cam/mod/sound/StandardSound.java b/src/main/java/cam72cam/umc/api/sound/StandardSound.java similarity index 91% rename from src/main/java/cam72cam/mod/sound/StandardSound.java rename to src/main/java/cam72cam/umc/api/sound/StandardSound.java index cebbff37d..f372fd90d 100644 --- a/src/main/java/cam72cam/mod/sound/StandardSound.java +++ b/src/main/java/cam72cam/umc/api/sound/StandardSound.java @@ -1,4 +1,4 @@ -package cam72cam.mod.sound; +package cam72cam.umc.api.sound; import net.minecraft.init.SoundEvents; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/cam72cam/mod/text/Command.java b/src/main/java/cam72cam/umc/api/text/Command.java similarity index 94% rename from src/main/java/cam72cam/mod/text/Command.java rename to src/main/java/cam72cam/umc/api/text/Command.java index 779ac8685..f15d5bb5b 100644 --- a/src/main/java/cam72cam/mod/text/Command.java +++ b/src/main/java/cam72cam/umc/api/text/Command.java @@ -1,11 +1,11 @@ -package cam72cam.mod.text; +package cam72cam.umc.api.text; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Consumer; -import cam72cam.mod.entity.Player; +import cam72cam.umc.api.entity.Player; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.CommandHandler; @@ -78,7 +78,7 @@ public static void registration() { * 
 	 * Returns PermissionLevel.LEVEL4 by default.
 	 * opRequired() returned 4 when true 2 when false.
-	 * See {@link cam72cam.mod.text.Command.PermissionLevel PermissionLevel} for possible return values.
+	 * See {@link Command.PermissionLevel PermissionLevel} for possible return values.
 	 *
*/ public int getRequiredPermissionLevel() { diff --git a/src/main/java/cam72cam/mod/text/PlayerMessage.java b/src/main/java/cam72cam/umc/api/text/PlayerMessage.java similarity index 96% rename from src/main/java/cam72cam/mod/text/PlayerMessage.java rename to src/main/java/cam72cam/umc/api/text/PlayerMessage.java index 9116f6c74..51eb9ce0c 100644 --- a/src/main/java/cam72cam/mod/text/PlayerMessage.java +++ b/src/main/java/cam72cam/umc/api/text/PlayerMessage.java @@ -1,4 +1,4 @@ -package cam72cam.mod.text; +package cam72cam.umc.api.text; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; diff --git a/src/main/java/cam72cam/mod/text/TextColor.java b/src/main/java/cam72cam/umc/api/text/TextColor.java similarity index 97% rename from src/main/java/cam72cam/mod/text/TextColor.java rename to src/main/java/cam72cam/umc/api/text/TextColor.java index 419e3defd..76f3a71d3 100644 --- a/src/main/java/cam72cam/mod/text/TextColor.java +++ b/src/main/java/cam72cam/umc/api/text/TextColor.java @@ -1,4 +1,4 @@ -package cam72cam.mod.text; +package cam72cam.umc.api.text; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/cam72cam/mod/text/TextUtil.java b/src/main/java/cam72cam/umc/api/text/TextUtil.java similarity index 94% rename from src/main/java/cam72cam/mod/text/TextUtil.java rename to src/main/java/cam72cam/umc/api/text/TextUtil.java index ca7733fb9..cd626e5fd 100644 --- a/src/main/java/cam72cam/mod/text/TextUtil.java +++ b/src/main/java/cam72cam/umc/api/text/TextUtil.java @@ -1,4 +1,4 @@ -package cam72cam.mod.text; +package cam72cam.umc.api.text; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/cam72cam/mod/util/Axis.java b/src/main/java/cam72cam/umc/api/util/Axis.java similarity index 94% rename from src/main/java/cam72cam/mod/util/Axis.java rename to src/main/java/cam72cam/umc/api/util/Axis.java index 6b95c1f26..aada7c903 100644 --- a/src/main/java/cam72cam/mod/util/Axis.java +++ b/src/main/java/cam72cam/umc/api/util/Axis.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/cam72cam/mod/util/DegreeFuncs.java b/src/main/java/cam72cam/umc/api/util/DegreeFuncs.java similarity index 90% rename from src/main/java/cam72cam/mod/util/DegreeFuncs.java rename to src/main/java/cam72cam/umc/api/util/DegreeFuncs.java index 15e7e0dcc..13527cb29 100644 --- a/src/main/java/cam72cam/mod/util/DegreeFuncs.java +++ b/src/main/java/cam72cam/umc/api/util/DegreeFuncs.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; public class DegreeFuncs { /** range 0 to 360 */ diff --git a/src/main/java/cam72cam/mod/util/Facing.java b/src/main/java/cam72cam/umc/api/util/Facing.java similarity index 92% rename from src/main/java/cam72cam/mod/util/Facing.java rename to src/main/java/cam72cam/umc/api/util/Facing.java index f520b3eda..3f4568fae 100644 --- a/src/main/java/cam72cam/mod/util/Facing.java +++ b/src/main/java/cam72cam/umc/api/util/Facing.java @@ -1,6 +1,7 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; -import cam72cam.mod.math.Rotation; +import cam72cam.umc.api.math.Rotation; +import cam72cam.umc.api.math.Vec3i; import net.minecraft.util.EnumFacing; /** @@ -90,17 +91,17 @@ public Axis getAxis() { return Axis.from(internal.getAxis()); } - /** @see cam72cam.mod.math.Vec3i#offset */ + /** @see Vec3i#offset */ public int getXMultiplier() { return internal.getXOffset(); } - /** @see cam72cam.mod.math.Vec3i#offset */ + /** @see Vec3i#offset */ public int getYMultiplier() { return internal.getYOffset(); } - /** @see cam72cam.mod.math.Vec3i#offset */ + /** @see Vec3i#offset */ public int getZMultiplier() { return internal.getZOffset(); } diff --git a/src/main/java/cam72cam/mod/util/FastMath.java b/src/main/java/cam72cam/umc/api/util/FastMath.java similarity index 86% rename from src/main/java/cam72cam/mod/util/FastMath.java rename to src/main/java/cam72cam/umc/api/util/FastMath.java index 0c79bebe8..fc649179b 100644 --- a/src/main/java/cam72cam/mod/util/FastMath.java +++ b/src/main/java/cam72cam/umc/api/util/FastMath.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/util/Matrix4.java b/src/main/java/cam72cam/umc/api/util/Matrix4.java similarity index 96% rename from src/main/java/util/Matrix4.java rename to src/main/java/cam72cam/umc/api/util/Matrix4.java index e181933d1..4e42025fd 100644 --- a/src/main/java/util/Matrix4.java +++ b/src/main/java/cam72cam/umc/api/util/Matrix4.java @@ -1,533 +1,532 @@ -package util; - -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.util.Facing; -import net.minecraftforge.common.model.TRSRTransformation; - -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; - -/** - * Copyright (C) 2013 Chicken-Bones - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -//This file originally copied from CodeChickenLib, courtesy of Chicken-Bones. -//This is a customized version created by Steven Blom (AtomicBlom) of the Steam and Steel development team. -//Slight adjustments have been made to fit my code. -//And massive adjustments made to work with 1.8. BLARGH! -public class Matrix4 -{ - //m - public double m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33; - public Matrix4() - { - m00 = m11 = m22 = m33 = 1; - } - public Matrix4(double d00, double d01, double d02, double d03, - double d10, double d11, double d12, double d13, - double d20, double d21, double d22, double d23, - double d30, double d31, double d32, double d33) - { - m00 = d00; - m01 = d01; - m02 = d02; - m03 = d03; - m10 = d10; - m11 = d11; - m12 = d12; - m13 = d13; - m20 = d20; - m21 = d21; - m22 = d22; - m23 = d23; - m30 = d30; - m31 = d31; - m32 = d32; - m33 = d33; - } - public Matrix4(Matrix4 mat) - { - set(mat); - } - public Matrix4(Matrix4f mat) - { - m00 = mat.m00; - m01 = mat.m01; - m02 = mat.m02; - m03 = mat.m03; - m10 = mat.m10; - m11 = mat.m11; - m12 = mat.m12; - m13 = mat.m13; - m20 = mat.m20; - m21 = mat.m21; - m22 = mat.m22; - m23 = mat.m23; - m30 = mat.m30; - m31 = mat.m31; - m32 = mat.m32; - m33 = mat.m33; - } - - public Matrix4(Facing facing) - { - this(); - setIdentity(); - translate(.5, .5, .5); - switch(facing) - { - case UP: - rotate(Math.PI/2, 1, 0, 0); - break; - case DOWN: - rotate(-Math.PI/2, 1, 0, 0); - break; - case SOUTH: - rotate(Math.PI, 0, 1, 0); - break; - case EAST: - rotate(-Math.PI/2, 0, 1, 0); - break; - case WEST: - rotate(Math.PI/2, 0, 1, 0); - break; - case NORTH: - } - translate(-.5, -.5, -.5); - } - public Matrix4 setIdentity() - { - m00 = m11 = m22 = m33 = 1; - m01 = m02 = m03 = m10 = m12 = m13 = m20 = m21 = m23 = m30 = m31 = m32 = 0; - return this; - } - public Matrix4 translate(Vector3f vec) - { - m03 += m00 * vec.x + m01 * vec.y + m02 * vec.z; - m13 += m10 * vec.x + m11 * vec.y + m12 * vec.z; - m23 += m20 * vec.x + m21 * vec.y + m22 * vec.z; - m33 += m30 * vec.x + m31 * vec.y + m32 * vec.z; - return this; - } - public Matrix4 translate(double x, double y, double z) - { - m03 += m00 * x + m01 * y + m02 * z; - m13 += m10 * x + m11 * y + m12 * z; - m23 += m20 * x + m21 * y + m22 * z; - m33 += m30 * x + m31 * y + m32 * z; - return this; - } - public Matrix4 scale(Vector3f vec) - { - m00 *= vec.x; - m10 *= vec.x; - m20 *= vec.x; - m30 *= vec.x; - m01 *= vec.y; - m11 *= vec.y; - m21 *= vec.y; - m31 *= vec.y; - m02 *= vec.z; - m12 *= vec.z; - m22 *= vec.z; - m32 *= vec.z; - return this; - } - public Matrix4 scale(double x, double y, double z) - { - m00 *= x; - m10 *= x; - m20 *= x; - m30 *= x; - m01 *= y; - m11 *= y; - m21 *= y; - m31 *= y; - m02 *= z; - m12 *= z; - m22 *= z; - m32 *= z; - return this; - } - public Matrix4 rotate(double angle, Vector3f axis) - { - double c = Math.cos(angle); - double s = Math.sin(angle); - double mc = 1.0f - c; - double xy = axis.x*axis.y; - double yz = axis.y*axis.z; - double xz = axis.x*axis.z; - double xs = axis.x*s; - double ys = axis.y*s; - double zs = axis.z*s; - double f00 = axis.x*axis.x*mc+c; - double f10 = xy*mc+zs; - double f20 = xz*mc-ys; - double f01 = xy*mc-zs; - double f11 = axis.y*axis.y*mc+c; - double f21 = yz*mc+xs; - double f02 = xz*mc+ys; - double f12 = yz*mc-xs; - double f22 = axis.z*axis.z*mc+c; - double t00 = m00 * f00 + m01 * f10 + m02 * f20; - double t10 = m10 * f00 + m11 * f10 + m12 * f20; - double t20 = m20 * f00 + m21 * f10 + m22 * f20; - double t30 = m30 * f00 + m31 * f10 + m32 * f20; - double t01 = m00 * f01 + m01 * f11 + m02 * f21; - double t11 = m10 * f01 + m11 * f11 + m12 * f21; - double t21 = m20 * f01 + m21 * f11 + m22 * f21; - double t31 = m30 * f01 + m31 * f11 + m32 * f21; - m02 = m00 * f02 + m01 * f12 + m02 * f22; - m12 = m10 * f02 + m11 * f12 + m12 * f22; - m22 = m20 * f02 + m21 * f12 + m22 * f22; - m32 = m30 * f02 + m31 * f12 + m32 * f22; - m00 = t00; - m10 = t10; - m20 = t20; - m30 = t30; - m01 = t01; - m11 = t11; - m21 = t21; - m31 = t31; - return this; - } - public Matrix4 rotate(double angle, double x, double y, double z) - { - double c = Math.cos(angle); - double s = Math.sin(angle); - double mc = 1.0f - c; - double xy = x*y; - double yz = y*z; - double xz = x*z; - double xs = x*s; - double ys = y*s; - double zs = z*s; - double f00 = x*x*mc+c; - double f10 = xy*mc+zs; - double f20 = xz*mc-ys; - double f01 = xy*mc-zs; - double f11 = y*y*mc+c; - double f21 = yz*mc+xs; - double f02 = xz*mc+ys; - double f12 = yz*mc-xs; - double f22 = z*z*mc+c; - double t00 = m00 * f00 + m01 * f10 + m02 * f20; - double t10 = m10 * f00 + m11 * f10 + m12 * f20; - double t20 = m20 * f00 + m21 * f10 + m22 * f20; - double t30 = m30 * f00 + m31 * f10 + m32 * f20; - double t01 = m00 * f01 + m01 * f11 + m02 * f21; - double t11 = m10 * f01 + m11 * f11 + m12 * f21; - double t21 = m20 * f01 + m21 * f11 + m22 * f21; - double t31 = m30 * f01 + m31 * f11 + m32 * f21; - m02 = m00 * f02 + m01 * f12 + m02 * f22; - m12 = m10 * f02 + m11 * f12 + m12 * f22; - m22 = m20 * f02 + m21 * f12 + m22 * f22; - m32 = m30 * f02 + m31 * f12 + m32 * f22; - m00 = t00; - m10 = t10; - m20 = t20; - m30 = t30; - m01 = t01; - m11 = t11; - m21 = t21; - m31 = t31; - return this; - } - public Matrix4 leftMultiply(Matrix4 mat) - { - double n00 = m00 * mat.m00 + m10 * mat.m01 + m20 * mat.m02 + m30 * mat.m03; - double n01 = m01 * mat.m00 + m11 * mat.m01 + m21 * mat.m02 + m31 * mat.m03; - double n02 = m02 * mat.m00 + m12 * mat.m01 + m22 * mat.m02 + m32 * mat.m03; - double n03 = m03 * mat.m00 + m13 * mat.m01 + m23 * mat.m02 + m33 * mat.m03; - double n10 = m00 * mat.m10 + m10 * mat.m11 + m20 * mat.m12 + m30 * mat.m13; - double n11 = m01 * mat.m10 + m11 * mat.m11 + m21 * mat.m12 + m31 * mat.m13; - double n12 = m02 * mat.m10 + m12 * mat.m11 + m22 * mat.m12 + m32 * mat.m13; - double n13 = m03 * mat.m10 + m13 * mat.m11 + m23 * mat.m12 + m33 * mat.m13; - double n20 = m00 * mat.m20 + m10 * mat.m21 + m20 * mat.m22 + m30 * mat.m23; - double n21 = m01 * mat.m20 + m11 * mat.m21 + m21 * mat.m22 + m31 * mat.m23; - double n22 = m02 * mat.m20 + m12 * mat.m21 + m22 * mat.m22 + m32 * mat.m23; - double n23 = m03 * mat.m20 + m13 * mat.m21 + m23 * mat.m22 + m33 * mat.m23; - double n30 = m00 * mat.m30 + m10 * mat.m31 + m20 * mat.m32 + m30 * mat.m33; - double n31 = m01 * mat.m30 + m11 * mat.m31 + m21 * mat.m32 + m31 * mat.m33; - double n32 = m02 * mat.m30 + m12 * mat.m31 + m22 * mat.m32 + m32 * mat.m33; - double n33 = m03 * mat.m30 + m13 * mat.m31 + m23 * mat.m32 + m33 * mat.m33; - m00 = n00; - m01 = n01; - m02 = n02; - m03 = n03; - m10 = n10; - m11 = n11; - m12 = n12; - m13 = n13; - m20 = n20; - m21 = n21; - m22 = n22; - m23 = n23; - m30 = n30; - m31 = n31; - m32 = n32; - m33 = n33; - return this; - } - public Matrix4 multiply(Matrix4 mat) - { - double n00 = m00 * mat.m00 + m01 * mat.m10 + m02 * mat.m20 + m03 * mat.m30; - double n01 = m00 * mat.m01 + m01 * mat.m11 + m02 * mat.m21 + m03 * mat.m31; - double n02 = m00 * mat.m02 + m01 * mat.m12 + m02 * mat.m22 + m03 * mat.m32; - double n03 = m00 * mat.m03 + m01 * mat.m13 + m02 * mat.m23 + m03 * mat.m33; - double n10 = m10 * mat.m00 + m11 * mat.m10 + m12 * mat.m20 + m13 * mat.m30; - double n11 = m10 * mat.m01 + m11 * mat.m11 + m12 * mat.m21 + m13 * mat.m31; - double n12 = m10 * mat.m02 + m11 * mat.m12 + m12 * mat.m22 + m13 * mat.m32; - double n13 = m10 * mat.m03 + m11 * mat.m13 + m12 * mat.m23 + m13 * mat.m33; - double n20 = m20 * mat.m00 + m21 * mat.m10 + m22 * mat.m20 + m23 * mat.m30; - double n21 = m20 * mat.m01 + m21 * mat.m11 + m22 * mat.m21 + m23 * mat.m31; - double n22 = m20 * mat.m02 + m21 * mat.m12 + m22 * mat.m22 + m23 * mat.m32; - double n23 = m20 * mat.m03 + m21 * mat.m13 + m22 * mat.m23 + m23 * mat.m33; - double n30 = m30 * mat.m00 + m31 * mat.m10 + m32 * mat.m20 + m33 * mat.m30; - double n31 = m30 * mat.m01 + m31 * mat.m11 + m32 * mat.m21 + m33 * mat.m31; - double n32 = m30 * mat.m02 + m31 * mat.m12 + m32 * mat.m22 + m33 * mat.m32; - double n33 = m30 * mat.m03 + m31 * mat.m13 + m32 * mat.m23 + m33 * mat.m33; - m00 = n00; - m01 = n01; - m02 = n02; - m03 = n03; - m10 = n10; - m11 = n11; - m12 = n12; - m13 = n13; - m20 = n20; - m21 = n21; - m22 = n22; - m23 = n23; - m30 = n30; - m31 = n31; - m32 = n32; - m33 = n33; - return this; - } - public Matrix4 transpose() - { - double n00 = m00; - double n10 = m01; - double n20 = m02; - double n30 = m03; - double n01 = m10; - double n11 = m11; - double n21 = m12; - double n31 = m13; - double n02 = m20; - double n12 = m21; - double n22 = m22; - double n32 = m23; - double n03 = m30; - double n13 = m31; - double n23 = m32; - double n33 = m33; - m00 = n00; - m01 = n01; - m02 = n02; - m03 = n03; - m10 = n10; - m11 = n11; - m12 = n12; - m13 = n13; - m20 = n20; - m21 = n21; - m22 = n22; - m23 = n23; - m30 = n30; - m31 = n31; - m32 = n32; - m33 = n33; - return this; - } - public Matrix4 copy() - { - return new Matrix4(this); - } - public Matrix4 set(Matrix4 mat) - { - m00 = mat.m00; - m01 = mat.m01; - m02 = mat.m02; - m03 = mat.m03; - m10 = mat.m10; - m11 = mat.m11; - m12 = mat.m12; - m13 = mat.m13; - m20 = mat.m20; - m21 = mat.m21; - m22 = mat.m22; - m23 = mat.m23; - m30 = mat.m30; - m31 = mat.m31; - m32 = mat.m32; - m33 = mat.m33; - return this; - } - public void apply(Matrix4 mat) - { - mat.multiply(this); - } - private void mult3x3(Vector3f vec) - { - double x = m00 * vec.x + m01 * vec.y + m02 * vec.z; - double y = m10 * vec.x + m11 * vec.y + m12 * vec.z; - double z = m20 * vec.x + m21 * vec.y + m22 * vec.z; - vec.x = (float)x; - vec.y = (float)y; - vec.z = (float)z; - } - public void apply(Vector3f vec) - { - mult3x3(vec); - vec.x += m03; - vec.y += m13; - vec.z += m23; - } - private Vec3d mult3x3(Vec3d vec) - { - double x = m00 * vec.x + m01 * vec.y + m02 * vec.z; - double y = m10 * vec.x + m11 * vec.y + m12 * vec.z; - double z = m20 * vec.x + m21 * vec.y + m22 * vec.z; - return new Vec3d(x,y,z); - } - public Vec3d apply(Vec3d vec) - { - return mult3x3(vec).add(m03, m13, m23); - } - - private org.lwjgl.util.vector.Vector3f mult3x3(org.lwjgl.util.vector.Vector3f vec) - { - float x = (float) (m00 * vec.x + m01 * vec.y + m02 * vec.z); - float y = (float) (m10 * vec.x + m11 * vec.y + m12 * vec.z); - float z = (float) (m20 * vec.x + m21 * vec.y + m22 * vec.z); - return new org.lwjgl.util.vector.Vector3f(x, y, z); - } - - public org.lwjgl.util.vector.Vector3f apply(org.lwjgl.util.vector.Vector3f vec) - { - org.lwjgl.util.vector.Vector3f vec2 = mult3x3(vec); - vec2.x += m03; - vec2.y += m13; - vec2.z += m23; - return vec2; - } - - public Matrix4f toMatrix4f() - { - return new Matrix4f((float)m00,(float)m01,(float)m02,(float)m03, (float)m10,(float)m11,(float)m12,(float)m13, (float)m20,(float)m21,(float)m22,(float)m23, (float)m30,(float)m31,(float)m32,(float)m33); - } - public void fromMatrix4f(Matrix4f mat) - { - m00 = mat.m00; m01 = mat.m01; m02 = mat.m02; m03 = mat.m03; - m10 = mat.m10; m11 = mat.m11; m12 = mat.m12; m13 = mat.m13; - m20 = mat.m20; m21 = mat.m21; m22 = mat.m22; m23 = mat.m23; - m30 = mat.m30; m31 = mat.m31; m32 = mat.m32; m33 = mat.m33; - } - - public final void invert() - { - Matrix4f temp = toMatrix4f(); - temp.invert(); - this.fromMatrix4f(temp); - } - - public Matrix4 slerp(Matrix4 to, float percent) { - Matrix4 from = this; - // For now I am going to be lazy - TRSRTransformation s = new TRSRTransformation(from.toMatrix4f()); - TRSRTransformation e = new TRSRTransformation(to.toMatrix4f()); - return new Matrix4(s.slerp(e, percent).getMatrix()); - } - - @Override - public String toString() - { - MathContext cont = new MathContext(4, RoundingMode.HALF_UP); - return "["+new BigDecimal(m00, cont)+","+new BigDecimal(m01, cont)+","+new BigDecimal(m02, cont)+","+new BigDecimal(m03, cont)+"]\n"+ - "["+new BigDecimal(m10, cont)+","+new BigDecimal(m11, cont)+","+new BigDecimal(m12, cont)+","+new BigDecimal(m13, cont)+"]\n"+ - "["+new BigDecimal(m20, cont)+","+new BigDecimal(m21, cont)+","+new BigDecimal(m22, cont)+","+new BigDecimal(m23, cont)+"]\n"+ - "["+new BigDecimal(m30, cont)+","+new BigDecimal(m31, cont)+","+new BigDecimal(m32, cont)+","+new BigDecimal(m33, cont)+"]"; - } - - @Override - public boolean equals(Object o) - { - if(this==o) return true; - if(o==null||getClass()!=o.getClass()) return false; - - Matrix4 matrix4 = (Matrix4)o; - - if(Double.compare(matrix4.m00, m00)!=0)return false; - if(Double.compare(matrix4.m01, m01)!=0) return false; - if(Double.compare(matrix4.m02, m02)!=0) return false; - if(Double.compare(matrix4.m03, m03)!=0) return false; - if(Double.compare(matrix4.m10, m10)!=0) return false; - if(Double.compare(matrix4.m11, m11)!=0) return false; - if(Double.compare(matrix4.m12, m12)!=0) return false; - if(Double.compare(matrix4.m13, m13)!=0) return false; - if(Double.compare(matrix4.m20, m20)!=0) return false; - if(Double.compare(matrix4.m21, m21)!=0) return false; - if(Double.compare(matrix4.m22, m22)!=0) return false; - if(Double.compare(matrix4.m23, m23)!=0) return false; - if(Double.compare(matrix4.m30, m30)!=0) return false; - if(Double.compare(matrix4.m31, m31)!=0) return false; - if(Double.compare(matrix4.m32, m32)!=0) return false; - return Double.compare(matrix4.m33, m33)==0; - - } - - @Override - public int hashCode() - { - int result; - long temp; - temp = Double.doubleToLongBits(m00); - result = (int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m01); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m02); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m03); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m10); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m11); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m12); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m13); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m20); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m21); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m22); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m23); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m30); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m31); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m32); - result = 31*result+(int)(temp^(temp>>>32)); - temp = Double.doubleToLongBits(m33); - result = 31*result+(int)(temp^(temp>>>32)); - return result; - } -} +package cam72cam.umc.api.util; + +import cam72cam.umc.api.math.Vec3d; +import net.minecraftforge.common.model.TRSRTransformation; + +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; + +/** + * Copyright (C) 2013 Chicken-Bones + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +//This file originally copied from CodeChickenLib, courtesy of Chicken-Bones. +//This is a customized version created by Steven Blom (AtomicBlom) of the Steam and Steel development team. +//Slight adjustments have been made to fit my code. +//And massive adjustments made to work with 1.8. BLARGH! +public class Matrix4 +{ + //m + public double m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33; + public Matrix4() + { + m00 = m11 = m22 = m33 = 1; + } + public Matrix4(double d00, double d01, double d02, double d03, + double d10, double d11, double d12, double d13, + double d20, double d21, double d22, double d23, + double d30, double d31, double d32, double d33) + { + m00 = d00; + m01 = d01; + m02 = d02; + m03 = d03; + m10 = d10; + m11 = d11; + m12 = d12; + m13 = d13; + m20 = d20; + m21 = d21; + m22 = d22; + m23 = d23; + m30 = d30; + m31 = d31; + m32 = d32; + m33 = d33; + } + public Matrix4(Matrix4 mat) + { + set(mat); + } + public Matrix4(Matrix4f mat) + { + m00 = mat.m00; + m01 = mat.m01; + m02 = mat.m02; + m03 = mat.m03; + m10 = mat.m10; + m11 = mat.m11; + m12 = mat.m12; + m13 = mat.m13; + m20 = mat.m20; + m21 = mat.m21; + m22 = mat.m22; + m23 = mat.m23; + m30 = mat.m30; + m31 = mat.m31; + m32 = mat.m32; + m33 = mat.m33; + } + + public Matrix4(Facing facing) + { + this(); + setIdentity(); + translate(.5, .5, .5); + switch(facing) + { + case UP: + rotate(Math.PI/2, 1, 0, 0); + break; + case DOWN: + rotate(-Math.PI/2, 1, 0, 0); + break; + case SOUTH: + rotate(Math.PI, 0, 1, 0); + break; + case EAST: + rotate(-Math.PI/2, 0, 1, 0); + break; + case WEST: + rotate(Math.PI/2, 0, 1, 0); + break; + case NORTH: + } + translate(-.5, -.5, -.5); + } + public Matrix4 setIdentity() + { + m00 = m11 = m22 = m33 = 1; + m01 = m02 = m03 = m10 = m12 = m13 = m20 = m21 = m23 = m30 = m31 = m32 = 0; + return this; + } + public Matrix4 translate(Vector3f vec) + { + m03 += m00 * vec.x + m01 * vec.y + m02 * vec.z; + m13 += m10 * vec.x + m11 * vec.y + m12 * vec.z; + m23 += m20 * vec.x + m21 * vec.y + m22 * vec.z; + m33 += m30 * vec.x + m31 * vec.y + m32 * vec.z; + return this; + } + public Matrix4 translate(double x, double y, double z) + { + m03 += m00 * x + m01 * y + m02 * z; + m13 += m10 * x + m11 * y + m12 * z; + m23 += m20 * x + m21 * y + m22 * z; + m33 += m30 * x + m31 * y + m32 * z; + return this; + } + public Matrix4 scale(Vector3f vec) + { + m00 *= vec.x; + m10 *= vec.x; + m20 *= vec.x; + m30 *= vec.x; + m01 *= vec.y; + m11 *= vec.y; + m21 *= vec.y; + m31 *= vec.y; + m02 *= vec.z; + m12 *= vec.z; + m22 *= vec.z; + m32 *= vec.z; + return this; + } + public Matrix4 scale(double x, double y, double z) + { + m00 *= x; + m10 *= x; + m20 *= x; + m30 *= x; + m01 *= y; + m11 *= y; + m21 *= y; + m31 *= y; + m02 *= z; + m12 *= z; + m22 *= z; + m32 *= z; + return this; + } + public Matrix4 rotate(double angle, Vector3f axis) + { + double c = Math.cos(angle); + double s = Math.sin(angle); + double mc = 1.0f - c; + double xy = axis.x*axis.y; + double yz = axis.y*axis.z; + double xz = axis.x*axis.z; + double xs = axis.x*s; + double ys = axis.y*s; + double zs = axis.z*s; + double f00 = axis.x*axis.x*mc+c; + double f10 = xy*mc+zs; + double f20 = xz*mc-ys; + double f01 = xy*mc-zs; + double f11 = axis.y*axis.y*mc+c; + double f21 = yz*mc+xs; + double f02 = xz*mc+ys; + double f12 = yz*mc-xs; + double f22 = axis.z*axis.z*mc+c; + double t00 = m00 * f00 + m01 * f10 + m02 * f20; + double t10 = m10 * f00 + m11 * f10 + m12 * f20; + double t20 = m20 * f00 + m21 * f10 + m22 * f20; + double t30 = m30 * f00 + m31 * f10 + m32 * f20; + double t01 = m00 * f01 + m01 * f11 + m02 * f21; + double t11 = m10 * f01 + m11 * f11 + m12 * f21; + double t21 = m20 * f01 + m21 * f11 + m22 * f21; + double t31 = m30 * f01 + m31 * f11 + m32 * f21; + m02 = m00 * f02 + m01 * f12 + m02 * f22; + m12 = m10 * f02 + m11 * f12 + m12 * f22; + m22 = m20 * f02 + m21 * f12 + m22 * f22; + m32 = m30 * f02 + m31 * f12 + m32 * f22; + m00 = t00; + m10 = t10; + m20 = t20; + m30 = t30; + m01 = t01; + m11 = t11; + m21 = t21; + m31 = t31; + return this; + } + public Matrix4 rotate(double angle, double x, double y, double z) + { + double c = Math.cos(angle); + double s = Math.sin(angle); + double mc = 1.0f - c; + double xy = x*y; + double yz = y*z; + double xz = x*z; + double xs = x*s; + double ys = y*s; + double zs = z*s; + double f00 = x*x*mc+c; + double f10 = xy*mc+zs; + double f20 = xz*mc-ys; + double f01 = xy*mc-zs; + double f11 = y*y*mc+c; + double f21 = yz*mc+xs; + double f02 = xz*mc+ys; + double f12 = yz*mc-xs; + double f22 = z*z*mc+c; + double t00 = m00 * f00 + m01 * f10 + m02 * f20; + double t10 = m10 * f00 + m11 * f10 + m12 * f20; + double t20 = m20 * f00 + m21 * f10 + m22 * f20; + double t30 = m30 * f00 + m31 * f10 + m32 * f20; + double t01 = m00 * f01 + m01 * f11 + m02 * f21; + double t11 = m10 * f01 + m11 * f11 + m12 * f21; + double t21 = m20 * f01 + m21 * f11 + m22 * f21; + double t31 = m30 * f01 + m31 * f11 + m32 * f21; + m02 = m00 * f02 + m01 * f12 + m02 * f22; + m12 = m10 * f02 + m11 * f12 + m12 * f22; + m22 = m20 * f02 + m21 * f12 + m22 * f22; + m32 = m30 * f02 + m31 * f12 + m32 * f22; + m00 = t00; + m10 = t10; + m20 = t20; + m30 = t30; + m01 = t01; + m11 = t11; + m21 = t21; + m31 = t31; + return this; + } + public Matrix4 leftMultiply(Matrix4 mat) + { + double n00 = m00 * mat.m00 + m10 * mat.m01 + m20 * mat.m02 + m30 * mat.m03; + double n01 = m01 * mat.m00 + m11 * mat.m01 + m21 * mat.m02 + m31 * mat.m03; + double n02 = m02 * mat.m00 + m12 * mat.m01 + m22 * mat.m02 + m32 * mat.m03; + double n03 = m03 * mat.m00 + m13 * mat.m01 + m23 * mat.m02 + m33 * mat.m03; + double n10 = m00 * mat.m10 + m10 * mat.m11 + m20 * mat.m12 + m30 * mat.m13; + double n11 = m01 * mat.m10 + m11 * mat.m11 + m21 * mat.m12 + m31 * mat.m13; + double n12 = m02 * mat.m10 + m12 * mat.m11 + m22 * mat.m12 + m32 * mat.m13; + double n13 = m03 * mat.m10 + m13 * mat.m11 + m23 * mat.m12 + m33 * mat.m13; + double n20 = m00 * mat.m20 + m10 * mat.m21 + m20 * mat.m22 + m30 * mat.m23; + double n21 = m01 * mat.m20 + m11 * mat.m21 + m21 * mat.m22 + m31 * mat.m23; + double n22 = m02 * mat.m20 + m12 * mat.m21 + m22 * mat.m22 + m32 * mat.m23; + double n23 = m03 * mat.m20 + m13 * mat.m21 + m23 * mat.m22 + m33 * mat.m23; + double n30 = m00 * mat.m30 + m10 * mat.m31 + m20 * mat.m32 + m30 * mat.m33; + double n31 = m01 * mat.m30 + m11 * mat.m31 + m21 * mat.m32 + m31 * mat.m33; + double n32 = m02 * mat.m30 + m12 * mat.m31 + m22 * mat.m32 + m32 * mat.m33; + double n33 = m03 * mat.m30 + m13 * mat.m31 + m23 * mat.m32 + m33 * mat.m33; + m00 = n00; + m01 = n01; + m02 = n02; + m03 = n03; + m10 = n10; + m11 = n11; + m12 = n12; + m13 = n13; + m20 = n20; + m21 = n21; + m22 = n22; + m23 = n23; + m30 = n30; + m31 = n31; + m32 = n32; + m33 = n33; + return this; + } + public Matrix4 multiply(Matrix4 mat) + { + double n00 = m00 * mat.m00 + m01 * mat.m10 + m02 * mat.m20 + m03 * mat.m30; + double n01 = m00 * mat.m01 + m01 * mat.m11 + m02 * mat.m21 + m03 * mat.m31; + double n02 = m00 * mat.m02 + m01 * mat.m12 + m02 * mat.m22 + m03 * mat.m32; + double n03 = m00 * mat.m03 + m01 * mat.m13 + m02 * mat.m23 + m03 * mat.m33; + double n10 = m10 * mat.m00 + m11 * mat.m10 + m12 * mat.m20 + m13 * mat.m30; + double n11 = m10 * mat.m01 + m11 * mat.m11 + m12 * mat.m21 + m13 * mat.m31; + double n12 = m10 * mat.m02 + m11 * mat.m12 + m12 * mat.m22 + m13 * mat.m32; + double n13 = m10 * mat.m03 + m11 * mat.m13 + m12 * mat.m23 + m13 * mat.m33; + double n20 = m20 * mat.m00 + m21 * mat.m10 + m22 * mat.m20 + m23 * mat.m30; + double n21 = m20 * mat.m01 + m21 * mat.m11 + m22 * mat.m21 + m23 * mat.m31; + double n22 = m20 * mat.m02 + m21 * mat.m12 + m22 * mat.m22 + m23 * mat.m32; + double n23 = m20 * mat.m03 + m21 * mat.m13 + m22 * mat.m23 + m23 * mat.m33; + double n30 = m30 * mat.m00 + m31 * mat.m10 + m32 * mat.m20 + m33 * mat.m30; + double n31 = m30 * mat.m01 + m31 * mat.m11 + m32 * mat.m21 + m33 * mat.m31; + double n32 = m30 * mat.m02 + m31 * mat.m12 + m32 * mat.m22 + m33 * mat.m32; + double n33 = m30 * mat.m03 + m31 * mat.m13 + m32 * mat.m23 + m33 * mat.m33; + m00 = n00; + m01 = n01; + m02 = n02; + m03 = n03; + m10 = n10; + m11 = n11; + m12 = n12; + m13 = n13; + m20 = n20; + m21 = n21; + m22 = n22; + m23 = n23; + m30 = n30; + m31 = n31; + m32 = n32; + m33 = n33; + return this; + } + public Matrix4 transpose() + { + double n00 = m00; + double n10 = m01; + double n20 = m02; + double n30 = m03; + double n01 = m10; + double n11 = m11; + double n21 = m12; + double n31 = m13; + double n02 = m20; + double n12 = m21; + double n22 = m22; + double n32 = m23; + double n03 = m30; + double n13 = m31; + double n23 = m32; + double n33 = m33; + m00 = n00; + m01 = n01; + m02 = n02; + m03 = n03; + m10 = n10; + m11 = n11; + m12 = n12; + m13 = n13; + m20 = n20; + m21 = n21; + m22 = n22; + m23 = n23; + m30 = n30; + m31 = n31; + m32 = n32; + m33 = n33; + return this; + } + public Matrix4 copy() + { + return new Matrix4(this); + } + public Matrix4 set(Matrix4 mat) + { + m00 = mat.m00; + m01 = mat.m01; + m02 = mat.m02; + m03 = mat.m03; + m10 = mat.m10; + m11 = mat.m11; + m12 = mat.m12; + m13 = mat.m13; + m20 = mat.m20; + m21 = mat.m21; + m22 = mat.m22; + m23 = mat.m23; + m30 = mat.m30; + m31 = mat.m31; + m32 = mat.m32; + m33 = mat.m33; + return this; + } + public void apply(Matrix4 mat) + { + mat.multiply(this); + } + private void mult3x3(Vector3f vec) + { + double x = m00 * vec.x + m01 * vec.y + m02 * vec.z; + double y = m10 * vec.x + m11 * vec.y + m12 * vec.z; + double z = m20 * vec.x + m21 * vec.y + m22 * vec.z; + vec.x = (float)x; + vec.y = (float)y; + vec.z = (float)z; + } + public void apply(Vector3f vec) + { + mult3x3(vec); + vec.x += m03; + vec.y += m13; + vec.z += m23; + } + private Vec3d mult3x3(Vec3d vec) + { + double x = m00 * vec.x + m01 * vec.y + m02 * vec.z; + double y = m10 * vec.x + m11 * vec.y + m12 * vec.z; + double z = m20 * vec.x + m21 * vec.y + m22 * vec.z; + return new Vec3d(x,y,z); + } + public Vec3d apply(Vec3d vec) + { + return mult3x3(vec).add(m03, m13, m23); + } + + private org.lwjgl.util.vector.Vector3f mult3x3(org.lwjgl.util.vector.Vector3f vec) + { + float x = (float) (m00 * vec.x + m01 * vec.y + m02 * vec.z); + float y = (float) (m10 * vec.x + m11 * vec.y + m12 * vec.z); + float z = (float) (m20 * vec.x + m21 * vec.y + m22 * vec.z); + return new org.lwjgl.util.vector.Vector3f(x, y, z); + } + + public org.lwjgl.util.vector.Vector3f apply(org.lwjgl.util.vector.Vector3f vec) + { + org.lwjgl.util.vector.Vector3f vec2 = mult3x3(vec); + vec2.x += m03; + vec2.y += m13; + vec2.z += m23; + return vec2; + } + + public Matrix4f toMatrix4f() + { + return new Matrix4f((float)m00,(float)m01,(float)m02,(float)m03, (float)m10,(float)m11,(float)m12,(float)m13, (float)m20,(float)m21,(float)m22,(float)m23, (float)m30,(float)m31,(float)m32,(float)m33); + } + public void fromMatrix4f(Matrix4f mat) + { + m00 = mat.m00; m01 = mat.m01; m02 = mat.m02; m03 = mat.m03; + m10 = mat.m10; m11 = mat.m11; m12 = mat.m12; m13 = mat.m13; + m20 = mat.m20; m21 = mat.m21; m22 = mat.m22; m23 = mat.m23; + m30 = mat.m30; m31 = mat.m31; m32 = mat.m32; m33 = mat.m33; + } + + public final void invert() + { + Matrix4f temp = toMatrix4f(); + temp.invert(); + this.fromMatrix4f(temp); + } + + public Matrix4 slerp(Matrix4 to, float percent) { + Matrix4 from = this; + // For now I am going to be lazy + TRSRTransformation s = new TRSRTransformation(from.toMatrix4f()); + TRSRTransformation e = new TRSRTransformation(to.toMatrix4f()); + return new Matrix4(s.slerp(e, percent).getMatrix()); + } + + @Override + public String toString() + { + MathContext cont = new MathContext(4, RoundingMode.HALF_UP); + return "["+new BigDecimal(m00, cont)+","+new BigDecimal(m01, cont)+","+new BigDecimal(m02, cont)+","+new BigDecimal(m03, cont)+"]\n"+ + "["+new BigDecimal(m10, cont)+","+new BigDecimal(m11, cont)+","+new BigDecimal(m12, cont)+","+new BigDecimal(m13, cont)+"]\n"+ + "["+new BigDecimal(m20, cont)+","+new BigDecimal(m21, cont)+","+new BigDecimal(m22, cont)+","+new BigDecimal(m23, cont)+"]\n"+ + "["+new BigDecimal(m30, cont)+","+new BigDecimal(m31, cont)+","+new BigDecimal(m32, cont)+","+new BigDecimal(m33, cont)+"]"; + } + + @Override + public boolean equals(Object o) + { + if(this==o) return true; + if(o==null||getClass()!=o.getClass()) return false; + + Matrix4 matrix4 = (Matrix4)o; + + if(Double.compare(matrix4.m00, m00)!=0)return false; + if(Double.compare(matrix4.m01, m01)!=0) return false; + if(Double.compare(matrix4.m02, m02)!=0) return false; + if(Double.compare(matrix4.m03, m03)!=0) return false; + if(Double.compare(matrix4.m10, m10)!=0) return false; + if(Double.compare(matrix4.m11, m11)!=0) return false; + if(Double.compare(matrix4.m12, m12)!=0) return false; + if(Double.compare(matrix4.m13, m13)!=0) return false; + if(Double.compare(matrix4.m20, m20)!=0) return false; + if(Double.compare(matrix4.m21, m21)!=0) return false; + if(Double.compare(matrix4.m22, m22)!=0) return false; + if(Double.compare(matrix4.m23, m23)!=0) return false; + if(Double.compare(matrix4.m30, m30)!=0) return false; + if(Double.compare(matrix4.m31, m31)!=0) return false; + if(Double.compare(matrix4.m32, m32)!=0) return false; + return Double.compare(matrix4.m33, m33)==0; + + } + + @Override + public int hashCode() + { + int result; + long temp; + temp = Double.doubleToLongBits(m00); + result = (int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m01); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m02); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m03); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m10); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m11); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m12); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m13); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m20); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m21); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m22); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m23); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m30); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m31); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m32); + result = 31*result+(int)(temp^(temp>>>32)); + temp = Double.doubleToLongBits(m33); + result = 31*result+(int)(temp^(temp>>>32)); + return result; + } +} diff --git a/src/main/java/cam72cam/mod/util/MinecraftFiles.java b/src/main/java/cam72cam/umc/api/util/MinecraftFiles.java similarity index 93% rename from src/main/java/cam72cam/mod/util/MinecraftFiles.java rename to src/main/java/cam72cam/umc/api/util/MinecraftFiles.java index cde55097c..d47b4f8b4 100644 --- a/src/main/java/cam72cam/mod/util/MinecraftFiles.java +++ b/src/main/java/cam72cam/umc/api/util/MinecraftFiles.java @@ -1,6 +1,6 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; -import cam72cam.mod.world.World; +import cam72cam.umc.api.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; diff --git a/src/main/java/cam72cam/mod/util/ModCoreCommand.java b/src/main/java/cam72cam/umc/api/util/ModCoreCommand.java similarity index 92% rename from src/main/java/cam72cam/mod/util/ModCoreCommand.java rename to src/main/java/cam72cam/umc/api/util/ModCoreCommand.java index e81996bc6..8951bd22b 100644 --- a/src/main/java/cam72cam/mod/util/ModCoreCommand.java +++ b/src/main/java/cam72cam/umc/api/util/ModCoreCommand.java @@ -1,18 +1,18 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; import java.util.*; import java.util.function.Consumer; import java.util.stream.Collectors; -import cam72cam.mod.ModCore; -import cam72cam.mod.block.BlockEntity; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.entity.ModdedEntity; -import cam72cam.mod.entity.Player; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.text.Command; -import cam72cam.mod.text.PlayerMessage; -import cam72cam.mod.world.World; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.block.BlockEntity; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.entity.ModdedEntity; +import cam72cam.umc.api.entity.Player; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.text.Command; +import cam72cam.umc.api.text.PlayerMessage; +import cam72cam.umc.api.world.World; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ClassInheritanceMultiMap; import net.minecraft.util.math.ChunkPos; @@ -182,7 +182,7 @@ private boolean sendChunkInfo(World world, Consumer sender, Optio for (Chunk chunk : chunks) { int teCount = chunk.getTileEntityMap().size(); - long umcCount = chunk.getTileEntityMap().values().stream().filter(x -> x instanceof cam72cam.mod.block.tile.TileEntity).count(); + long umcCount = chunk.getTileEntityMap().values().stream().filter(x -> x instanceof cam72cam.umc.api.block.tile.TileEntity).count(); int entityCount = Arrays.stream(chunk.getEntityLists()).mapToInt(ClassInheritanceMultiMap::size).sum(); boolean isChunkLocation = hasChunkLocation && chunk.x == cx && chunk.z == cz; @@ -197,8 +197,8 @@ private boolean sendChunkInfo(World world, Consumer sender, Optio Map counts = new HashMap<>(); for (TileEntity tile : chunk.getTileEntityMap().values()) { String key = tile.getClass().toString(); - if (tile instanceof cam72cam.mod.block.tile.TileEntity) { - BlockEntity instance = ((cam72cam.mod.block.tile.TileEntity) tile).instance(); + if (tile instanceof cam72cam.umc.api.block.tile.TileEntity) { + BlockEntity instance = ((cam72cam.umc.api.block.tile.TileEntity) tile).instance(); key = instance != null ? instance.getClass().toString() : "UMC Pending"; } counts.put(key, counts.getOrDefault(key, 0) + 1); diff --git a/src/main/java/cam72cam/mod/util/SingleCache.java b/src/main/java/cam72cam/umc/api/util/SingleCache.java similarity index 93% rename from src/main/java/cam72cam/mod/util/SingleCache.java rename to src/main/java/cam72cam/umc/api/util/SingleCache.java index 8af72104d..78cc2bdd5 100644 --- a/src/main/java/cam72cam/mod/util/SingleCache.java +++ b/src/main/java/cam72cam/umc/api/util/SingleCache.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; import java.util.Objects; import java.util.function.Function; diff --git a/src/main/java/cam72cam/mod/util/ThrowingFunction.java b/src/main/java/cam72cam/umc/api/util/ThrowingFunction.java similarity index 78% rename from src/main/java/cam72cam/mod/util/ThrowingFunction.java rename to src/main/java/cam72cam/umc/api/util/ThrowingFunction.java index 38ff0b62e..0eb061880 100644 --- a/src/main/java/cam72cam/mod/util/ThrowingFunction.java +++ b/src/main/java/cam72cam/umc/api/util/ThrowingFunction.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; @FunctionalInterface public interface ThrowingFunction { diff --git a/src/main/java/cam72cam/mod/util/With.java b/src/main/java/cam72cam/umc/api/util/With.java similarity index 89% rename from src/main/java/cam72cam/mod/util/With.java rename to src/main/java/cam72cam/umc/api/util/With.java index 58a42ecac..4c79ed135 100644 --- a/src/main/java/cam72cam/mod/util/With.java +++ b/src/main/java/cam72cam/umc/api/util/With.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; @FunctionalInterface public interface With extends AutoCloseable { diff --git a/src/main/java/cam72cam/mod/world/BlockInfo.java b/src/main/java/cam72cam/umc/api/world/BlockInfo.java similarity index 77% rename from src/main/java/cam72cam/mod/world/BlockInfo.java rename to src/main/java/cam72cam/umc/api/world/BlockInfo.java index 917dc193c..c69d27046 100644 --- a/src/main/java/cam72cam/mod/world/BlockInfo.java +++ b/src/main/java/cam72cam/umc/api/world/BlockInfo.java @@ -1,8 +1,8 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; -import cam72cam.mod.serialization.TagCompound; -import cam72cam.mod.serialization.TagField; -import cam72cam.mod.serialization.TagMapped; +import cam72cam.umc.api.serialization.TagCompound; +import cam72cam.umc.api.serialization.TagField; +import cam72cam.umc.api.serialization.TagMapped; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; @@ -16,7 +16,7 @@ public class BlockInfo { this.internal = state; } - public static class TagMapper implements cam72cam.mod.serialization.TagMapper { + public static class TagMapper implements cam72cam.umc.api.serialization.TagMapper { @Override public TagAccessor apply(Class type, String fieldName, TagField tag) { return new TagAccessor<>( diff --git a/src/main/java/cam72cam/mod/world/ChunkManager.java b/src/main/java/cam72cam/umc/api/world/ChunkManager.java similarity index 95% rename from src/main/java/cam72cam/mod/world/ChunkManager.java rename to src/main/java/cam72cam/umc/api/world/ChunkManager.java index 750c159fc..d9656914f 100644 --- a/src/main/java/cam72cam/mod/world/ChunkManager.java +++ b/src/main/java/cam72cam/umc/api/world/ChunkManager.java @@ -1,10 +1,9 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; -import cam72cam.mod.ModCore; -import cam72cam.mod.event.CommonEvents; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.serialization.TagCompound; -import net.minecraft.util.math.BlockPos; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.event.CommonEvents; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.serialization.TagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; @@ -50,7 +49,7 @@ private static Ticket ticketForWorld(World world) { return TICKETS.get(dim); } - static void flagEntityPos(cam72cam.mod.world.World world, Vec3i inPos) { + static void flagEntityPos(cam72cam.umc.api.world.World world, Vec3i inPos) { if (world.isClient) { return; } diff --git a/src/main/java/cam72cam/mod/world/ChunkPos.java b/src/main/java/cam72cam/umc/api/world/ChunkPos.java similarity index 98% rename from src/main/java/cam72cam/mod/world/ChunkPos.java rename to src/main/java/cam72cam/umc/api/world/ChunkPos.java index 7196d9daf..5dc67de6d 100644 --- a/src/main/java/cam72cam/mod/world/ChunkPos.java +++ b/src/main/java/cam72cam/umc/api/world/ChunkPos.java @@ -1,4 +1,4 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/cam72cam/mod/world/IBlockEntityCollision.java b/src/main/java/cam72cam/umc/api/world/IBlockEntityCollision.java similarity index 50% rename from src/main/java/cam72cam/mod/world/IBlockEntityCollision.java rename to src/main/java/cam72cam/umc/api/world/IBlockEntityCollision.java index 8536ab83c..371466943 100644 --- a/src/main/java/cam72cam/mod/world/IBlockEntityCollision.java +++ b/src/main/java/cam72cam/umc/api/world/IBlockEntityCollision.java @@ -1,7 +1,7 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; -import cam72cam.mod.entity.Entity; -import cam72cam.mod.math.Vec3i; +import cam72cam.umc.api.entity.Entity; +import cam72cam.umc.api.math.Vec3i; public interface IBlockEntityCollision { boolean canCollide(World world, Vec3i pos, Entity entity); diff --git a/src/main/java/cam72cam/mod/world/IConditionalCollision.java b/src/main/java/cam72cam/umc/api/world/IConditionalCollision.java similarity index 96% rename from src/main/java/cam72cam/mod/world/IConditionalCollision.java rename to src/main/java/cam72cam/umc/api/world/IConditionalCollision.java index 4890023de..1203f452b 100644 --- a/src/main/java/cam72cam/mod/world/IConditionalCollision.java +++ b/src/main/java/cam72cam/umc/api/world/IConditionalCollision.java @@ -1,4 +1,4 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/cam72cam/mod/world/World.java b/src/main/java/cam72cam/umc/api/world/World.java similarity index 96% rename from src/main/java/cam72cam/mod/world/World.java rename to src/main/java/cam72cam/umc/api/world/World.java index b08595f08..1755e79b0 100644 --- a/src/main/java/cam72cam/mod/world/World.java +++ b/src/main/java/cam72cam/umc/api/world/World.java @@ -1,24 +1,24 @@ -package cam72cam.mod.world; - -import cam72cam.mod.MinecraftClient; -import cam72cam.mod.ModCore; -import cam72cam.mod.block.BlockEntity; -import cam72cam.mod.block.BlockType; -import cam72cam.mod.block.IBlockTypeBlock; -import cam72cam.mod.block.tile.TileEntity; -import cam72cam.mod.entity.*; -import cam72cam.mod.entity.boundingbox.BoundingBox; -import cam72cam.mod.entity.boundingbox.DefaultBoundingBox; -import cam72cam.mod.entity.boundingbox.IBoundingBox; -import cam72cam.mod.event.ClientEvents; -import cam72cam.mod.event.CommonEvents; -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.util.Facing; -import cam72cam.mod.serialization.TagCompound; +package cam72cam.umc.api.world; + +import cam72cam.umc.api.MinecraftClient; +import cam72cam.umc.api.ModCore; +import cam72cam.umc.api.block.BlockEntity; +import cam72cam.umc.api.block.BlockType; +import cam72cam.umc.api.block.IBlockTypeBlock; +import cam72cam.umc.api.block.tile.TileEntity; +import cam72cam.umc.api.entity.*; +import cam72cam.umc.api.entity.boundingbox.BoundingBox; +import cam72cam.umc.api.entity.boundingbox.DefaultBoundingBox; +import cam72cam.umc.api.entity.boundingbox.IBoundingBox; +import cam72cam.umc.api.event.ClientEvents; +import cam72cam.umc.api.event.CommonEvents; +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.util.Facing; +import cam72cam.umc.api.serialization.TagCompound; import net.minecraft.block.*; import net.minecraft.block.state.IBlockState; import net.minecraft.client.multiplayer.WorldClient; @@ -197,7 +197,7 @@ void onEntityAdded(net.minecraft.entity.Entity entityIn) { } else if (entityIn instanceof EntityLiving) { entity = new Living((EntityLiving) entityIn); } else if (entityIn instanceof EntityItem) { - entity = new cam72cam.mod.entity.ItemEntity((EntityItem) entityIn); + entity = new ItemEntity((EntityItem) entityIn); } else { entity = new Entity(entityIn); } diff --git a/src/main/java/cam72cam/mod/world/WorldEntityTracker.java b/src/main/java/cam72cam/umc/api/world/WorldEntityTracker.java similarity index 97% rename from src/main/java/cam72cam/mod/world/WorldEntityTracker.java rename to src/main/java/cam72cam/umc/api/world/WorldEntityTracker.java index f950c564c..de1eb483a 100644 --- a/src/main/java/cam72cam/mod/world/WorldEntityTracker.java +++ b/src/main/java/cam72cam/umc/api/world/WorldEntityTracker.java @@ -1,6 +1,7 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; -import cam72cam.mod.entity.ModdedEntity; +import cam72cam.umc.api.entity.ModdedEntity; +import cam72cam.umc.api.mixin.feat.large_entity_collision.MixinVanillaWorld; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArraySet; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; @@ -14,7 +15,7 @@ /** * Track UMC Entities and handle inter chunk collision - * @see cam72cam.mod.mixin.feat.large_entity_collision.MixinVanillaWorld + * @see MixinVanillaWorld */ public class WorldEntityTracker { //Good enough for now...We'd assume there's no more ridiculous ones diff --git a/src/main/java/cam72cam/mod/world/WorldEventListener.java b/src/main/java/cam72cam/umc/api/world/WorldEventListener.java similarity index 92% rename from src/main/java/cam72cam/mod/world/WorldEventListener.java rename to src/main/java/cam72cam/umc/api/world/WorldEventListener.java index d7179e436..d2cd75d3a 100644 --- a/src/main/java/cam72cam/mod/world/WorldEventListener.java +++ b/src/main/java/cam72cam/umc/api/world/WorldEventListener.java @@ -1,4 +1,4 @@ -package cam72cam.mod.world; +package cam72cam.umc.api.world; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -13,9 +13,9 @@ /** Used for world event handling, internal */ class WorldEventListener implements IWorldEventListener { - private final cam72cam.mod.world.World world; + private final cam72cam.umc.api.world.World world; - public WorldEventListener(cam72cam.mod.world.World worldWrap) { + public WorldEventListener(cam72cam.umc.api.world.World worldWrap) { this.world = worldWrap; } diff --git a/src/main/resources/mixins.feat.universalmodcore.json b/src/main/resources/mixins.feat.universalmodcore.json index c6f2ebbba..b39589372 100644 --- a/src/main/resources/mixins.feat.universalmodcore.json +++ b/src/main/resources/mixins.feat.universalmodcore.json @@ -1,6 +1,6 @@ { "required": true, - "package": "cam72cam.mod.mixin.feat", + "package": "cam72cam.umc.api.mixin.feat", "refmap": "mixins.universalmodcore.refmap.json", "target": "@env(DEFAULT)", "minVersion": "0.8.2", diff --git a/src/main/resources/mixins.fix.universalmodcore.json b/src/main/resources/mixins.fix.universalmodcore.json index aca368e9e..3eba22a06 100644 --- a/src/main/resources/mixins.fix.universalmodcore.json +++ b/src/main/resources/mixins.fix.universalmodcore.json @@ -1,6 +1,6 @@ { "required": true, - "package": "cam72cam.mod.mixin.fix", + "package": "cam72cam.umc.api.mixin.fix", "refmap": "mixins.universalmodcore.refmap.json", "target": "@env(DEFAULT)", "minVersion": "0.8.2", diff --git a/src/main/resources/template/src/main/java/PACKAGEPATH/Mod.java b/src/main/resources/template/src/main/java/PACKAGEPATH/Mod.java index 5baa16705..b3ba3c1d1 100644 --- a/src/main/resources/template/src/main/java/PACKAGEPATH/Mod.java +++ b/src/main/resources/template/src/main/java/PACKAGEPATH/Mod.java @@ -1,6 +1,6 @@ package #PACKAGE#; -import cam72cam.mod.ModCore; +import cam72cam.umc.api.ModCore; @net.minecraftforge.fml.common.Mod(modid = Mod.MODID, name = "#NAME#", version = "#VERSION#", dependencies = "#FORGE_STRING_DEPENDENCIES#", acceptedMinecraftVersions = "[1.12,1.13)") public class Mod { diff --git a/src/test/java/cam72cam/mod/model/obj/OBJModelTest.java b/src/test/java/cam72cam/umc/api/model/obj/OBJModelTest.java similarity index 98% rename from src/test/java/cam72cam/mod/model/obj/OBJModelTest.java rename to src/test/java/cam72cam/umc/api/model/obj/OBJModelTest.java index ac698b3a8..5aa37e04d 100644 --- a/src/test/java/cam72cam/mod/model/obj/OBJModelTest.java +++ b/src/test/java/cam72cam/umc/api/model/obj/OBJModelTest.java @@ -1,6 +1,6 @@ -package cam72cam.mod.model.obj; +package cam72cam.umc.api.model.obj; -import cam72cam.mod.resource.Identifier; +import cam72cam.umc.api.resource.Identifier; import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/src/test/java/cam72cam/mod/serialization/Test.java b/src/test/java/cam72cam/umc/api/serialization/Test.java similarity index 99% rename from src/test/java/cam72cam/mod/serialization/Test.java rename to src/test/java/cam72cam/umc/api/serialization/Test.java index 6bb61f440..ffc46958c 100644 --- a/src/test/java/cam72cam/mod/serialization/Test.java +++ b/src/test/java/cam72cam/umc/api/serialization/Test.java @@ -1,8 +1,8 @@ -package cam72cam.mod.serialization; +package cam72cam.umc.api.serialization; -import cam72cam.mod.math.Vec3d; -import cam72cam.mod.math.Vec3i; -import cam72cam.mod.util.Facing; +import cam72cam.umc.api.math.Vec3d; +import cam72cam.umc.api.math.Vec3i; +import cam72cam.umc.api.util.Facing; import org.junit.Assert; import java.util.ArrayList; diff --git a/src/test/java/cam72cam/mod/util/DegreeFuncsTest.java b/src/test/java/cam72cam/umc/api/util/DegreeFuncsTest.java similarity index 97% rename from src/test/java/cam72cam/mod/util/DegreeFuncsTest.java rename to src/test/java/cam72cam/umc/api/util/DegreeFuncsTest.java index 2c496cfae..981df85fa 100644 --- a/src/test/java/cam72cam/mod/util/DegreeFuncsTest.java +++ b/src/test/java/cam72cam/umc/api/util/DegreeFuncsTest.java @@ -1,4 +1,4 @@ -package cam72cam.mod.util; +package cam72cam.umc.api.util; import junit.framework.TestCase;