Bumped version to v2.6

Also fixed an API bug
StavWasPlayZ · May 24, 2023 · cc06137 · cc06137
1 parent 87a00d6
commit cc06137
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
 }
 
-version = '2.5.1'
+version = '2.6'
 group = 'com.cstav.genshinstrument' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'genshinstrument-1.19.4'
 

diff --git a/public/updates.json b/public/updates.json
@@ -16,14 +16,16 @@
         "2.4.1": "- Fixed instrument screen being present after item removal\n- API tweaks & fixes",
 
         "2.5": "- Update to version 1.19.4\n- GUI keyboard navigation",
-        "2.5.1": "- Fixed pitch slider being offset and not navigation-friendly"
+        "2.5.1": "- Fixed pitch slider being offset and not navigation-friendly",
+
+        "2.6": "- Added the visual play ring from Genshin"
     },
 
     "promos": {
         "1.19.3-latest": "2.4.1",
         "1.19.3-recommended": "2.4.1",
 
-        "1.19.4-latest": "2.5.1",
-        "1.19.4-recommended": "2.5.1"
+        "1.19.4-latest": "2.6",
+        "1.19.4-recommended": "2.6"
     }
 }
diff --git a/...stav/genshinstrument/util/ClientUtil.java → ...av/genshinstrument/client/ClientUtil.java b/...stav/genshinstrument/util/ClientUtil.java → ...av/genshinstrument/client/ClientUtil.java
@@ -1,12 +1,15 @@
-package com.cstav.genshinstrument.util;
+package com.cstav.genshinstrument.client;
 
 import java.awt.Point;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
+@OnlyIn(Dist.CLIENT)
 public class ClientUtil {
 
     /**

diff --git a/...java/com/cstav/genshinstrument/client/gui/screens/instrument/partial/note/NoteButton.java b/...java/com/cstav/genshinstrument/client/gui/screens/instrument/partial/note/NoteButton.java
@@ -4,14 +4,14 @@
 import java.awt.Point;
 import java.util.ArrayList;
 
+import com.cstav.genshinstrument.client.ClientUtil;
 import com.cstav.genshinstrument.client.config.ModClientConfigs;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.animation.NoteAnimationController;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.NoteLabelSupplier;
 import com.cstav.genshinstrument.networking.ModPacketHandler;
 import com.cstav.genshinstrument.networking.packets.instrument.InstrumentPacket;
 import com.cstav.genshinstrument.sound.NoteSound;
-import com.cstav.genshinstrument.util.ClientUtil;
 import com.cstav.genshinstrument.util.CommonUtil;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;

diff --git a/...n/java/com/cstav/genshinstrument/client/gui/screens/instrument/partial/note/NoteRing.java b/...n/java/com/cstav/genshinstrument/client/gui/screens/instrument/partial/note/NoteRing.java
@@ -2,13 +2,19 @@
 
 import java.awt.Point;
 
+import com.cstav.genshinstrument.Main;
+import com.cstav.genshinstrument.client.ClientUtil;
+import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.animation.RingAnimationController;
-import com.cstav.genshinstrument.util.ClientUtil;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 
 import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
+@OnlyIn(Dist.CLIENT)
 public class NoteRing {
     public static final String RING_GLOB_FILENAME = "ring.png";
 
@@ -37,7 +43,7 @@ public void render() {
             note.colorTheme.getBlue() / 255f,
             alpha
         );
-        ClientUtil.displaySprite(note.instrumentScreen.getResourceFromGlob(RING_GLOB_FILENAME));
+        ClientUtil.displaySprite(new ResourceLocation(Main.MODID, AbstractInstrumentScreen.getGlobalRootPath() + RING_GLOB_FILENAME));
 
         final Point ringCenter = ClientUtil.getInitCenter(note.getInitX(), note.getInitY(), NoteButton.getSize(), size);
         GuiComponent.blit(new PoseStack(),

diff --git a/...om/cstav/genshinstrument/client/gui/screens/instrument/vintagelyre/VintageNoteButton.java b/...om/cstav/genshinstrument/client/gui/screens/instrument/vintagelyre/VintageNoteButton.java
@@ -1,11 +1,11 @@
 package com.cstav.genshinstrument.client.gui.screens.instrument.vintagelyre;
 
+import com.cstav.genshinstrument.client.ClientUtil;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractGridInstrumentScreen;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.AbstractInstrumentScreen;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.NoteGridButton;
 import com.cstav.genshinstrument.client.gui.screens.instrument.partial.note.label.NoteLabelSupplier;
 import com.cstav.genshinstrument.sound.NoteSound;
-import com.cstav.genshinstrument.util.ClientUtil;
 import com.mojang.blaze3d.vertex.PoseStack;
 
 import net.minecraft.client.gui.GuiComponent;