From 8f3009300f6e7e3abb11590c68367f345954d688 Mon Sep 17 00:00:00 2001 From: OLEGSHA Date: Tue, 12 Jan 2021 22:21:06 +0300 Subject: [PATCH] Moved some files around - Renamed FloatMathUtils to FloatMathUtil - Renamed TextureUtils to TextureUtil - Moved .common.io to .common.world.io --- .../client/graphics/texture/TextureDataEditor.java | 2 +- .../progressia/client/graphics/texture/TextureLoader.java | 8 ++++---- .../texture/{TextureUtils.java => TextureUtil.java} | 4 ++-- .../windcorp/progressia/client/graphics/world/Camera.java | 2 +- .../progressia/client/graphics/world/LayerWorld.java | 4 ++-- .../progressia/client/world/entity/HumanoidModel.java | 2 +- .../progressia/client/world/entity/NPedModel.java | 2 +- .../progressia/client/world/entity/QuadripedModel.java | 4 ++-- .../util/{FloatMathUtils.java => FloatMathUtil.java} | 4 ++-- .../windcorp/progressia/common/world/PacketSendChunk.java | 2 +- .../progressia/common/{ => world}/io/ChunkCodec.java | 2 +- .../progressia/common/{ => world}/io/ChunkIO.java | 2 +- .../windcorp/progressia/server/world/tasks/TickChunk.java | 4 ++-- .../java/ru/windcorp/progressia/test/TestChunkCodec.java | 2 +- .../java/ru/windcorp/progressia/test/TestContent.java | 2 +- .../windcorp/progressia/test/TestEntityRenderHuman.java | 6 +++--- .../ru/windcorp/progressia/test/TestPlayerControls.java | 6 +++--- .../java/ru/windcorp/progressia/test/TestWorldDiskIO.java | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) rename src/main/java/ru/windcorp/progressia/client/graphics/texture/{TextureUtils.java => TextureUtil.java} (98%) rename src/main/java/ru/windcorp/progressia/common/util/{FloatMathUtils.java => FloatMathUtil.java} (84%) rename src/main/java/ru/windcorp/progressia/common/{ => world}/io/ChunkCodec.java (95%) rename src/main/java/ru/windcorp/progressia/common/{ => world}/io/ChunkIO.java (98%) diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java index 6c5240a..1753d4b 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureDataEditor.java @@ -1,6 +1,6 @@ package ru.windcorp.progressia.client.graphics.texture; -import static ru.windcorp.progressia.client.graphics.texture.TextureUtils.BYTES_PER_PIXEL; +import static ru.windcorp.progressia.client.graphics.texture.TextureUtil.BYTES_PER_PIXEL; import java.nio.ByteBuffer; diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java index b7f705a..fcebda7 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureLoader.java @@ -24,16 +24,16 @@ public class TextureLoader { int bufferWidth = BinUtil.roundToGreaterPowerOf2(width); int bufferHeight = BinUtil.roundToGreaterPowerOf2(height); - WritableRaster raster = TextureUtils.createRaster( + WritableRaster raster = TextureUtil.createRaster( bufferWidth, bufferHeight ); - BufferedImage canvas = TextureUtils.createCanvas(raster); + BufferedImage canvas = TextureUtil.createCanvas(raster); Graphics2D g = canvas.createGraphics(); try { - g.setColor(TextureUtils.CANVAS_BACKGROUND); + g.setColor(TextureUtil.CANVAS_BACKGROUND); g.fillRect(0, 0, bufferWidth, bufferHeight); g.drawImage( readResult, @@ -50,7 +50,7 @@ public class TextureLoader { ); result.draw( - TextureUtils.extractBytes(raster), bufferWidth, + TextureUtil.extractBytes(raster), bufferWidth, 0, 0, 0, 0, width, height ); diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtils.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java similarity index 98% rename from src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtils.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java index 955c6ae..88665cf 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtils.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureUtil.java @@ -15,7 +15,7 @@ import java.util.Hashtable; import org.lwjgl.BufferUtils; -public class TextureUtils { +public class TextureUtil { public static final int BYTES_PER_PIXEL = 4; // ARGB @@ -105,6 +105,6 @@ public class TextureUtils { return output; } - private TextureUtils() {} + private TextureUtil() {} } diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java index e3899eb..a7c1b93 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java @@ -18,7 +18,7 @@ package ru.windcorp.progressia.client.graphics.world; import static java.lang.Math.*; -import static ru.windcorp.progressia.common.util.FloatMathUtils.*; +import static ru.windcorp.progressia.common.util.FloatMathUtil.*; import java.util.Collection; import java.util.function.Consumer; diff --git a/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java index 49e3585..9fc4b5f 100644 --- a/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java @@ -39,7 +39,7 @@ import ru.windcorp.progressia.client.graphics.texture.Texture; import ru.windcorp.progressia.common.Units; import ru.windcorp.progressia.common.collision.Collideable; import ru.windcorp.progressia.common.collision.colliders.Collider; -import ru.windcorp.progressia.common.util.FloatMathUtils; +import ru.windcorp.progressia.common.util.FloatMathUtil; import ru.windcorp.progressia.common.world.entity.EntityData; import ru.windcorp.progressia.test.CollisionModelRenderer; import ru.windcorp.progressia.test.TestPlayerControls; @@ -160,7 +160,7 @@ public class LayerWorld extends Layer { final float scale = 1 - f/2; final Vec4 color = new Vec4(0, 0, 0, 1); - for (float phi = 0; phi < 2*FloatMathUtils.PI_F; phi += FloatMathUtils.PI_F/2) { + for (float phi = 0; phi < 2*FloatMathUtil.PI_F; phi += FloatMathUtil.PI_F/2) { Mat4 rot = new Mat4().identity().rotateZ(phi).scale(scale); b.addPart(new PppBuilder(p, (Texture) null).setOrigin( diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java b/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java index 45817db..d902cf3 100644 --- a/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java +++ b/src/main/java/ru/windcorp/progressia/client/world/entity/HumanoidModel.java @@ -1,7 +1,7 @@ package ru.windcorp.progressia.client.world.entity; import static java.lang.Math.*; -import static ru.windcorp.progressia.common.util.FloatMathUtils.*; +import static ru.windcorp.progressia.common.util.FloatMathUtil.*; import glm.mat._4.Mat4; import glm.vec._3.Vec3; diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java b/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java index 4c5397a..e766fae 100644 --- a/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java +++ b/src/main/java/ru/windcorp/progressia/client/world/entity/NPedModel.java @@ -4,7 +4,7 @@ import static java.lang.Math.atan2; import static java.lang.Math.min; import static java.lang.Math.pow; import static java.lang.Math.toRadians; -import static ru.windcorp.progressia.common.util.FloatMathUtils.normalizeAngle; +import static ru.windcorp.progressia.common.util.FloatMathUtil.normalizeAngle; import glm.Glm; import glm.mat._4.Mat4; diff --git a/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java b/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java index 00311d4..124234e 100644 --- a/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java +++ b/src/main/java/ru/windcorp/progressia/client/world/entity/QuadripedModel.java @@ -1,8 +1,8 @@ package ru.windcorp.progressia.client.world.entity; import static java.lang.Math.*; -import static ru.windcorp.progressia.common.util.FloatMathUtils.*; -import static ru.windcorp.progressia.common.util.FloatMathUtils.sin; +import static ru.windcorp.progressia.common.util.FloatMathUtil.*; +import static ru.windcorp.progressia.common.util.FloatMathUtil.sin; import glm.mat._4.Mat4; import glm.vec._3.Vec3; diff --git a/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtils.java b/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java similarity index 84% rename from src/main/java/ru/windcorp/progressia/common/util/FloatMathUtils.java rename to src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java index e18e2d2..270545a 100644 --- a/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtils.java +++ b/src/main/java/ru/windcorp/progressia/common/util/FloatMathUtil.java @@ -1,6 +1,6 @@ package ru.windcorp.progressia.common.util; -public class FloatMathUtils { +public class FloatMathUtil { public static final float PI_F = (float) Math.PI; @@ -24,6 +24,6 @@ public class FloatMathUtils { return (float) Math.tan(x); } - private FloatMathUtils() {} + private FloatMathUtil() {} } diff --git a/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java b/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java index 69451ab..6dc2b90 100644 --- a/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java +++ b/src/main/java/ru/windcorp/progressia/common/world/PacketSendChunk.java @@ -5,10 +5,10 @@ import java.io.DataOutput; import java.io.IOException; import glm.vec._3.i.Vec3i; -import ru.windcorp.progressia.common.io.ChunkIO; import ru.windcorp.progressia.common.state.IOContext; import ru.windcorp.progressia.common.util.DataBuffer; import ru.windcorp.progressia.common.util.crash.CrashReports; +import ru.windcorp.progressia.common.world.io.ChunkIO; public class PacketSendChunk extends PacketAffectChunk { diff --git a/src/main/java/ru/windcorp/progressia/common/io/ChunkCodec.java b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java similarity index 95% rename from src/main/java/ru/windcorp/progressia/common/io/ChunkCodec.java rename to src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java index 251eb43..b3f13db 100644 --- a/src/main/java/ru/windcorp/progressia/common/io/ChunkCodec.java +++ b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkCodec.java @@ -1,4 +1,4 @@ -package ru.windcorp.progressia.common.io; +package ru.windcorp.progressia.common.world.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/ru/windcorp/progressia/common/io/ChunkIO.java b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java similarity index 98% rename from src/main/java/ru/windcorp/progressia/common/io/ChunkIO.java rename to src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java index 580c9b0..6ea35dd 100644 --- a/src/main/java/ru/windcorp/progressia/common/io/ChunkIO.java +++ b/src/main/java/ru/windcorp/progressia/common/world/io/ChunkIO.java @@ -1,4 +1,4 @@ -package ru.windcorp.progressia.common.io; +package ru.windcorp.progressia.common.world.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java b/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java index 631e5a5..daa30ae 100644 --- a/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java +++ b/src/main/java/ru/windcorp/progressia/server/world/tasks/TickChunk.java @@ -8,7 +8,7 @@ import java.util.function.Consumer; import com.google.common.collect.ImmutableList; import glm.vec._3.i.Vec3i; -import ru.windcorp.progressia.common.util.FloatMathUtils; +import ru.windcorp.progressia.common.util.FloatMathUtil; import ru.windcorp.progressia.common.world.ChunkData; import ru.windcorp.progressia.common.world.block.BlockFace; import ru.windcorp.progressia.common.world.tile.TileDataStack; @@ -91,7 +91,7 @@ public class TickChunk extends Evaluation { * on average, then run 3 random ticks unconditionally * and run one extra random tick with 0.25 chance */ - float unconditionalTicks = FloatMathUtils.floor(ticks); + float unconditionalTicks = FloatMathUtil.floor(ticks); float extraTickChance = ticks - unconditionalTicks; for (int i = 0; i < unconditionalTicks; ++i) { diff --git a/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java b/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java index de93a5b..991acb2 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java +++ b/src/main/java/ru/windcorp/progressia/test/TestChunkCodec.java @@ -14,7 +14,6 @@ import glm.vec._3.i.Vec3i; import gnu.trove.map.TObjectIntMap; import gnu.trove.map.hash.TObjectIntHashMap; import ru.windcorp.jputil.functions.ThrowingConsumer; -import ru.windcorp.progressia.common.io.ChunkCodec; import ru.windcorp.progressia.common.state.IOContext; import ru.windcorp.progressia.common.world.ChunkData; import ru.windcorp.progressia.common.world.DecodingException; @@ -22,6 +21,7 @@ import ru.windcorp.progressia.common.world.WorldData; import ru.windcorp.progressia.common.world.block.BlockData; import ru.windcorp.progressia.common.world.block.BlockDataRegistry; import ru.windcorp.progressia.common.world.block.BlockFace; +import ru.windcorp.progressia.common.world.io.ChunkCodec; import ru.windcorp.progressia.common.world.tile.TileData; import ru.windcorp.progressia.common.world.tile.TileDataRegistry; diff --git a/src/main/java/ru/windcorp/progressia/test/TestContent.java b/src/main/java/ru/windcorp/progressia/test/TestContent.java index 2c114f4..171fb32 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestContent.java +++ b/src/main/java/ru/windcorp/progressia/test/TestContent.java @@ -26,10 +26,10 @@ import ru.windcorp.progressia.client.world.tile.*; import ru.windcorp.progressia.common.collision.AABB; import ru.windcorp.progressia.common.collision.CollisionModel; import ru.windcorp.progressia.common.comms.controls.*; -import ru.windcorp.progressia.common.io.ChunkIO; import ru.windcorp.progressia.common.state.StatefulObjectRegistry.Factory; import ru.windcorp.progressia.common.world.block.*; import ru.windcorp.progressia.common.world.entity.*; +import ru.windcorp.progressia.common.world.io.ChunkIO; import ru.windcorp.progressia.common.world.tile.*; import ru.windcorp.progressia.server.Server; import ru.windcorp.progressia.server.comms.controls.*; diff --git a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java index 208c89a..801c790 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java +++ b/src/main/java/ru/windcorp/progressia/test/TestEntityRenderHuman.java @@ -15,7 +15,7 @@ import ru.windcorp.progressia.client.world.entity.HumanoidModel; import ru.windcorp.progressia.client.world.entity.EntityRender; import ru.windcorp.progressia.client.world.entity.EntityRenderRegistry; import ru.windcorp.progressia.client.world.entity.EntityRenderable; -import ru.windcorp.progressia.common.util.FloatMathUtils; +import ru.windcorp.progressia.common.util.FloatMathUtil; import ru.windcorp.progressia.common.world.entity.EntityData; import static java.lang.Math.*; @@ -158,10 +158,10 @@ public class TestEntityRenderHuman extends EntityRender { leftArm, new Vec3(0, +1.5f, 3 + 3 - 0.5f), 0.0f ), new HumanoidModel.Arm( - rightArm, new Vec3(0, -1.5f, 3 + 3 - 0.5f), FloatMathUtils.PI_F + rightArm, new Vec3(0, -1.5f, 3 + 3 - 0.5f), FloatMathUtil.PI_F ), new HumanoidModel.Leg( - leftLeg, new Vec3(0, +0.5f, 3), FloatMathUtils.PI_F + leftLeg, new Vec3(0, +0.5f, 3), FloatMathUtil.PI_F ), new HumanoidModel.Leg( rightLeg, new Vec3(0, -0.5f, 3), 0.0f diff --git a/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java b/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java index 8ec8521..133cf85 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java +++ b/src/main/java/ru/windcorp/progressia/test/TestPlayerControls.java @@ -18,7 +18,7 @@ import ru.windcorp.progressia.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.world.LocalPlayer; import ru.windcorp.progressia.client.localization.Localizer; import ru.windcorp.progressia.common.Units; -import ru.windcorp.progressia.common.util.FloatMathUtils; +import ru.windcorp.progressia.common.util.FloatMathUtil; import ru.windcorp.progressia.common.world.block.BlockData; import ru.windcorp.progressia.common.world.entity.EntityData; import ru.windcorp.progressia.common.world.tile.TileData; @@ -321,11 +321,11 @@ public class TestPlayerControls { private void normalizeAngles(Vec2 dir) { // Normalize yaw - dir.x = FloatMathUtils.normalizeAngle(dir.x); + dir.x = FloatMathUtil.normalizeAngle(dir.x); // Clamp pitch dir.y = Glm.clamp( - dir.y, -FloatMathUtils.PI_F / 2, +FloatMathUtils.PI_F / 2 + dir.y, -FloatMathUtil.PI_F / 2, +FloatMathUtil.PI_F / 2 ); } diff --git a/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java b/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java index dd7c0e7..12a9f2e 100644 --- a/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java +++ b/src/main/java/ru/windcorp/progressia/test/TestWorldDiskIO.java @@ -15,11 +15,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import glm.vec._3.i.Vec3i; -import ru.windcorp.progressia.common.io.ChunkIO; import ru.windcorp.progressia.common.state.IOContext; import ru.windcorp.progressia.common.world.ChunkData; import ru.windcorp.progressia.common.world.DecodingException; import ru.windcorp.progressia.common.world.WorldData; +import ru.windcorp.progressia.common.world.io.ChunkIO; import ru.windcorp.progressia.server.Server; public class TestWorldDiskIO {