Merge pull request #7 from TopchetoEU/TopchetoEU/Rename

Resolves #5

build.gradle

@@ -96,5 +96,5 @@ publishing {
 	}
 }
 loom {
-	accessWidenerPath = file("src/main/resources/smooth-chunks.accesswidener")
+	accessWidenerPath = file("src/main/resources/animated-chunks.accesswidener")
 }

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.13.3
 # Mod Properties
 mod_version=0.2.0
 maven_group=me.topchetoeu
-archives_base_name=smooth-chunks
+archives_base_name=animated-chunks
 
 # Dependencies
 fabric_version=0.47.8+1.18.2

src/main/java/me/topchetoeu/animatedchunks/AnimatedChunks.java

@@ -1,32 +1,32 @@
-package me.topchetoeu.smoothchunks;
+package me.topchetoeu.animatedchunks;
 
 import java.io.File;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 
-import me.topchetoeu.smoothchunks.Manager.RegisterEvent;
+import me.topchetoeu.animatedchunks.Manager.RegisterEvent;
-import me.topchetoeu.smoothchunks.animation.Animation;
+import me.topchetoeu.animatedchunks.animation.Animation;
-import me.topchetoeu.smoothchunks.animation.FallAnimation;
+import me.topchetoeu.animatedchunks.animation.FallAnimation;
-import me.topchetoeu.smoothchunks.animation.FlyInAnimation;
+import me.topchetoeu.animatedchunks.animation.FlyInAnimation;
-import me.topchetoeu.smoothchunks.animation.ProgressManager;
+import me.topchetoeu.animatedchunks.animation.ProgressManager;
-import me.topchetoeu.smoothchunks.animation.RiseAnimation;
+import me.topchetoeu.animatedchunks.animation.RiseAnimation;
-import me.topchetoeu.smoothchunks.animation.ScaleAnimation;
+import me.topchetoeu.animatedchunks.animation.ScaleAnimation;
-import me.topchetoeu.smoothchunks.easing.Ease;
+import me.topchetoeu.animatedchunks.easing.Ease;
-import me.topchetoeu.smoothchunks.easing.ElasticEase;
+import me.topchetoeu.animatedchunks.easing.ElasticEase;
-import me.topchetoeu.smoothchunks.easing.LinearEase;
+import me.topchetoeu.animatedchunks.easing.LinearEase;
-import me.topchetoeu.smoothchunks.easing.SineEase;
+import me.topchetoeu.animatedchunks.easing.QuadraticEase;
-import me.topchetoeu.smoothchunks.gui.SmoothChunksScreen;
+import me.topchetoeu.animatedchunks.easing.SineEase;
-import me.topchetoeu.smoothchunks.easing.QuadraticEase;
+import me.topchetoeu.animatedchunks.gui.AnimatedChunksScreen;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.fabric.api.event.Event;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.math.BlockPos;
 
-public final class SmoothChunks implements ClientModInitializer, ModMenuApi {
+public final class AnimatedChunks implements ClientModInitializer, ModMenuApi {
-    private static SmoothChunks instance;
+    private static AnimatedChunks instance;
-    public static SmoothChunks getInstance() {
+    public static AnimatedChunks getInstance() {
         return instance;
     }
 
@@ -134,7 +134,7 @@ public final class SmoothChunks implements ClientModInitializer, ModMenuApi {
         registerEases(ease);
         registerAnimations(animation);
 
-        config = new ConfigManager(new File("config/smooth-chunks.dat"), animation, ease);
+        config = new ConfigManager(new File("config/animated-chunks.dat"), animation, ease);
 
         EASES_REGISTERING.invoker().register(ease);
         ANIMATIONS_REGISTERING.invoker().register(animation);
@@ -148,7 +148,7 @@ public final class SmoothChunks implements ClientModInitializer, ModMenuApi {
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
         return (Screen parent) -> {
             var _this = getInstance();
-            return new SmoothChunksScreen(parent, _this.animation, _this.ease, _this.config);
+            return new AnimatedChunksScreen(parent, _this.animation, _this.ease, _this.config);
         };
     }
 }

src/main/java/me/topchetoeu/animatedchunks/ConfigManager.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks;
+package me.topchetoeu.animatedchunks;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -8,8 +8,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 
-import me.topchetoeu.smoothchunks.animation.Animation;
+import me.topchetoeu.animatedchunks.animation.Animation;
-import me.topchetoeu.smoothchunks.easing.Ease;
+import me.topchetoeu.animatedchunks.easing.Ease;
 
 public class ConfigManager {
     public final File configFile;

src/main/java/me/topchetoeu/animatedchunks/Descriptor.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks;
+package me.topchetoeu.animatedchunks;
 
 import org.apache.commons.lang3.Validate;
 

src/main/java/me/topchetoeu/animatedchunks/Manager.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks;
+package me.topchetoeu.animatedchunks;
 
 import java.util.Collection;
 import java.util.Collections;

src/main/java/me/topchetoeu/animatedchunks/animation/Animation.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.animation;
+package me.topchetoeu.animatedchunks.animation;
 
 import net.minecraft.client.util.math.MatrixStack;
 

src/main/java/me/topchetoeu/animatedchunks/animation/FallAnimation.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.animation;
+package me.topchetoeu.animatedchunks.animation;
 
 import net.minecraft.client.util.math.MatrixStack;
 

src/main/java/me/topchetoeu/animatedchunks/animation/FlyInAnimation.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.animation;
+package me.topchetoeu.animatedchunks.animation;
 
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.Vec2f;

src/main/java/me/topchetoeu/animatedchunks/animation/ProgressManager.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.animation;
+package me.topchetoeu.animatedchunks.animation;
 
 import java.util.ArrayList;
 import java.util.HashSet;

src/main/java/me/topchetoeu/animatedchunks/animation/RiseAnimation.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.animation;
+package me.topchetoeu.animatedchunks.animation;
 
 import net.minecraft.client.util.math.MatrixStack;
 

src/main/java/me/topchetoeu/animatedchunks/animation/ScaleAnimation.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.animation;
+package me.topchetoeu.animatedchunks.animation;
 
 import net.minecraft.client.util.math.MatrixStack;
 

src/main/java/me/topchetoeu/animatedchunks/easing/Ease.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.easing;
+package me.topchetoeu.animatedchunks.easing;
 
 public interface Ease {
     /**

src/main/java/me/topchetoeu/animatedchunks/easing/ElasticEase.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.easing;
+package me.topchetoeu.animatedchunks.easing;
 
 public class ElasticEase implements Ease {
     private float steepness = 1;

src/main/java/me/topchetoeu/animatedchunks/easing/LinearEase.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.easing;
+package me.topchetoeu.animatedchunks.easing;
 
 public class LinearEase implements Ease {
     public float ease(float x) {

src/main/java/me/topchetoeu/animatedchunks/easing/QuadraticEase.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.easing;
+package me.topchetoeu.animatedchunks.easing;
 
 public class QuadraticEase implements Ease {
     @Override

src/main/java/me/topchetoeu/animatedchunks/easing/SineEase.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.easing;
+package me.topchetoeu.animatedchunks.easing;
 
 public class SineEase implements Ease {
     @Override

src/main/java/me/topchetoeu/animatedchunks/gui/AnimatedChunksScreen.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.sound.PositionedSoundInstance;
@@ -8,14 +8,14 @@ import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.ColorHelper.Argb;
-import me.topchetoeu.smoothchunks.ConfigManager;
+import me.topchetoeu.animatedchunks.ConfigManager;
-import me.topchetoeu.smoothchunks.Manager;
+import me.topchetoeu.animatedchunks.Manager;
-import me.topchetoeu.smoothchunks.animation.Animation;
+import me.topchetoeu.animatedchunks.animation.Animation;
-import me.topchetoeu.smoothchunks.easing.Ease;
+import me.topchetoeu.animatedchunks.easing.Ease;
-import me.topchetoeu.smoothchunks.gui.Section.OrderType;
+import me.topchetoeu.animatedchunks.gui.Section.OrderType;
 import net.minecraft.client.MinecraftClient;
 
-public class SmoothChunksScreen extends Screen {
+public class AnimatedChunksScreen extends Screen {
     public final Screen parent;
     private final HorizontalSection mainSection = new HorizontalSection();
     private final Manager<Animation> animation;
@@ -105,8 +105,8 @@ public class SmoothChunksScreen extends Screen {
         res.children.addSelectableChild(selectionSection(ease, "Ease"));
         return res;
     }
-    public SmoothChunksScreen(Screen parent, Manager<Animation> animation, Manager<Ease> ease, ConfigManager config) {
+    public AnimatedChunksScreen(Screen parent, Manager<Animation> animation, Manager<Ease> ease, ConfigManager config) {
-        super(Text.of("Smooth Chunks Config"));
+        super(Text.of("Animated Chunks Config"));
         config.reload();
         this.animation = animation;
         this.ease = ease;

src/main/java/me/topchetoeu/animatedchunks/gui/Boundbox.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 public class Boundbox implements BoundboxProvider {
     public float x, y, width, height;

src/main/java/me/topchetoeu/animatedchunks/gui/BoundboxProvider.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 public interface BoundboxProvider {
     float getX();

src/main/java/me/topchetoeu/animatedchunks/gui/Button.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import org.apache.commons.lang3.Validate;
 import org.lwjgl.glfw.GLFW;

src/main/java/me/topchetoeu/animatedchunks/gui/ChunkPreview.java

@@ -1,11 +1,11 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.opengl.GL11;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import me.topchetoeu.smoothchunks.SmoothChunks;
+import me.topchetoeu.animatedchunks.AnimatedChunks;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.DrawableHelper;
@@ -170,8 +170,8 @@ public class ChunkPreview extends DrawableHelper implements Drawable, Element, S
         if (progress < 0) progress = 0;
         if (progress > 1) progress = 1;
         if (progress < 0.999) {
-            float _progress = SmoothChunks.getInstance().getEaseManager().getValue().ease(progress);
+            float _progress = AnimatedChunks.getInstance().getEaseManager().getValue().ease(progress);
-            SmoothChunks.getInstance().getAnimationManager().getValue().animate(
+            AnimatedChunks.getInstance().getAnimationManager().getValue().animate(
                 _progress, matrices,
                 x * 16, 0, y * 16, 0, 0, 0
             );
@@ -187,7 +187,7 @@ public class ChunkPreview extends DrawableHelper implements Drawable, Element, S
         matrices.pop();
     }
     private void renderChunks(MatrixStack matrices, float delta, int n) {
-        duration = SmoothChunks.getInstance().getProgressManager().getDuration();
+        duration = AnimatedChunks.getInstance().getProgressManager().getDuration();
         // globalProgress += (lastTime - (lastTime = System.nanoTime())) / -1000000000f;
         globalProgress += delta * 0.05f;
         matrices.push();

src/main/java/me/topchetoeu/animatedchunks/gui/HorizontalSection.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

src/main/java/me/topchetoeu/animatedchunks/gui/Label.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import org.apache.commons.lang3.Validate;
 

src/main/java/me/topchetoeu/animatedchunks/gui/Section.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/me/topchetoeu/animatedchunks/gui/SelectionScreen.java

@@ -1,10 +1,10 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import me.topchetoeu.smoothchunks.Descriptor;
+import me.topchetoeu.animatedchunks.Descriptor;
-import me.topchetoeu.smoothchunks.Manager;
+import me.topchetoeu.animatedchunks.Manager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;

src/main/java/me/topchetoeu/animatedchunks/gui/VerticalSection.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.gui;
+package me.topchetoeu.animatedchunks.gui;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

src/main/java/me/topchetoeu/animatedchunks/mixin/BuiltChunkMixin.java

@@ -1,11 +1,11 @@
-package me.topchetoeu.smoothchunks.mixin;
+package me.topchetoeu.animatedchunks.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import me.topchetoeu.smoothchunks.SmoothChunks;
+import me.topchetoeu.animatedchunks.AnimatedChunks;
 import net.minecraft.client.render.chunk.ChunkBuilder;
 import net.minecraft.util.math.BlockPos;
 
@@ -17,6 +17,6 @@ abstract class BuiltChunkMixin {
         // ci.cancel();
         // return;
         BlockPos origin = ((ChunkBuilder.BuiltChunk)(Object)this).getOrigin();
-        SmoothChunks.getInstance().getProgressManager().unload(origin.getX(), 0, origin.getZ());
+        AnimatedChunks.getInstance().getProgressManager().unload(origin.getX(), 0, origin.getZ());
     }
 }

src/main/java/me/topchetoeu/animatedchunks/mixin/WorldRendererMixin.java

@@ -1,4 +1,4 @@
-package me.topchetoeu.smoothchunks.mixin;
+package me.topchetoeu.animatedchunks.mixin;
 
 import net.minecraft.client.gl.GlUniform;
 import net.minecraft.client.render.BuiltChunkStorage;
@@ -21,8 +21,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import it.unimi.dsi.fastutil.objects.ObjectListIterator;
-import me.topchetoeu.smoothchunks.SmoothChunks;
+import me.topchetoeu.animatedchunks.AnimatedChunks;
-import me.topchetoeu.smoothchunks.animation.ProgressManager;
+import me.topchetoeu.animatedchunks.animation.ProgressManager;
 
 @Mixin(WorldRenderer.class)
 abstract class WorldRendererMixin {
@@ -31,7 +31,7 @@ abstract class WorldRendererMixin {
     @Accessor abstract BuiltChunkStorage getChunks();
 
     private ProgressManager getProgressManager() {
-        return SmoothChunks.getInstance().getProgressManager();
+        return AnimatedChunks.getInstance().getProgressManager();
     }
 
     @Inject(method = "render", at = @At(value = "HEAD"))
@@ -69,14 +69,14 @@ abstract class WorldRendererMixin {
             float progress = getProgressManager().getChunkProgress(x, 0, z);
 
             if (progress < 0.999) {
-                progress = SmoothChunks.getInstance().getEaseManager().getValue().ease(progress);
+                progress = AnimatedChunks.getInstance().getEaseManager().getValue().ease(progress);
 
                 float centerX = (float)playerX - x;
                 float centerY = (float)playerY - y;
                 float centerZ = (float)playerZ - z;
 
                 matrices.translate(-centerX, -centerY, -centerZ);
-                SmoothChunks.getInstance().getAnimationManager().getValue().animate(progress, matrices, x, y, z, (float)playerX, (float)playerY, (float)playerZ);
+                AnimatedChunks.getInstance().getAnimationManager().getValue().animate(progress, matrices, x, y, z, (float)playerX, (float)playerY, (float)playerZ);
                 matrices.translate(centerX, centerY, centerZ);
             }
         }

src/main/resources/animated-chunks.mixins.json

@@ -1,7 +1,7 @@
 {
     "required": true,
     "minVersion": "0.8",
-    "package": "me.topchetoeu.smoothchunks.mixin",
+    "package": "me.topchetoeu.animatedchunks.mixin",
     "compatibilityLevel": "JAVA_17",
     "mixins": [],
     "client": [

src/main/resources/fabric.mod.json

@@ -1,24 +1,24 @@
 {
     "schemaVersion": 1,
-    "id": "smooth-chunks",
+    "id": "animated-chunks",
     "version": "0.2.0",
-    "name": "Smooth Chunks",
+    "name": "Animated Chunks",
-    "description": "Smooth chunk load animations.",
+    "description": "animated chunk load animations.",
     "authors": [ "TopchetoEU" ],
     "license": "MIT",
-    "icon": "assets/smooth-chunks/icon.png",
+    "icon": "assets/animated-chunks/icon.png",
     "environment": "client",
-    "accessWidener": "smooth-chunks.accesswidener",
+    "accessWidener": "animated-chunks.accesswidener",
     "entrypoints": {
         "client": [
-            "me.topchetoeu.smoothchunks.SmoothChunks"
+            "me.topchetoeu.animatedchunks.AnimatedChunks"
         ],
         "modmenu": [
-            "me.topchetoeu.smoothchunks.SmoothChunks"
+            "me.topchetoeu.animatedchunks.AnimatedChunks"
         ]
     },
     "mixins": [
-        "smooth-chunks.mixins.json"
+        "animated-chunks.mixins.json"
     ],
     "depends": {
         "fabricloader": ">=0.9.3+build.207",