refactor(common): store item rendering instead rendering flag

chore(common): specify specific deploy repository (github)
flowerinsnowdh · Dec 10, 2024 · 55a5e08 · 55a5e08
1 parent 85fa007
commit 55a5e08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -4,7 +4,7 @@ plugins() {
 }
 
 group = 'cn.flowerinsnow.greatscrollabletooltips'
-version = '1.1.0'
+version = '1.2.0'
 
 repositories() {
     mavenCentral()
@@ -48,10 +48,10 @@ publishing() {
         mavenJava(MavenPublication) {
             repositories() {
                 maven() {
-                    url = "${System.getenv('PUBLISH_REPO_URL')}"
+                    url = 'https://maven.pkg.github.com/flowerinsnowdh/GreatScrollableTooltips'
                     credentials() {
-                        username = "${System.getenv('PUBLISH_REPO_USERNAME')}"
-                        password = "${System.getenv('PUBLISH_REPO_PASSWORD')}"
+                        username = "${System.getenv('GITHUB_USERNAME')}"
+                        password = "${System.getenv('GITHUB_TOKEN')}"
                     }
                 }
             }

diff --git a/common/gradle.properties b/common/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
 # Dependencies
 night_config_version=3.8.1
-junit_version=5.11.0
+junit_version=5.11.3
diff --git a/...on/src/main/java/cn/flowerinsnow/greatscrollabletooltips/common/object/ScrollSession.java b/...on/src/main/java/cn/flowerinsnow/greatscrollabletooltips/common/object/ScrollSession.java
@@ -15,10 +15,6 @@ public class ScrollSession<I> {
      * <p>当前水平滚动值</p>
      */
     private int vertical;
-    /**
-     * <p>本 tick 是否渲染中</p>
-     */
-    private boolean rendering;
 
     /**
      * <p>最后一次渲染的物品</p>
@@ -51,11 +47,7 @@ public void addVertical(int value) {
     }
 
     public boolean isRendering() {
-        return this.rendering;
-    }
-
-    public void setRendering(boolean rendering) {
-        this.rendering = rendering;
+        return this.lastItemStackRendered != null;
     }
 
     public I getLastItemStackRendered() {
@@ -79,15 +71,14 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ScrollSession<?> that = (ScrollSession<?>) o;
-        return this.horizontal == that.horizontal && this.vertical == that.vertical && this.rendering == that.rendering && Objects.equals(this.lastItemStackRendered, that.lastItemStackRendered);
+        return this.horizontal == that.horizontal && this.vertical == that.vertical && Objects.equals(this.lastItemStackRendered, that.lastItemStackRendered);
     }
 
     @Override
     public int hashCode() {
         int result = 17;
         result = 31 * result + this.horizontal;
         result = 31 * result + this.vertical;
-        result = 31 * result + (this.rendering ? 1231 : 1237);
         result = 31 * result + (this.lastItemStackRendered != null ? this.lastItemStackRendered.hashCode() : 0);
         return result;
     }
@@ -97,7 +88,6 @@ public String toString() {
         return "ScrollSession{" +
                 "horizontal=" + this.horizontal +
                 ", vertical=" + this.vertical +
-                ", rendering=" + this.rendering +
                 ", lastItemStackRendered=" + this.lastItemStackRendered +
                 '}';
     }