3.2

TeamFelNull · Mar 1, 2022 · ca7876b · ca7876b
1 parent b1e232a
commit ca7876b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 19 deletions.
diff --git a/common/src/main/java/dev/felnull/imp/api/IamMusicPlayerAPI.java b/common/src/main/java/dev/felnull/imp/api/IamMusicPlayerAPI.java
@@ -89,7 +89,6 @@ public static List<MusicRingerAccess> getRingers() {
      */
     @NotNull
     public static List<MusicRingerAccess> getRingers(ServerLevel level) {
-
         List<MusicRingerAccess> pls = new ArrayList<>();
         var mr = MusicRingManager.getInstance().getMusicRingers().get(level);
         if (mr != null) {

diff --git a/common/src/main/java/dev/felnull/imp/client/IamMusicPlayerClient.java b/common/src/main/java/dev/felnull/imp/client/IamMusicPlayerClient.java
@@ -7,7 +7,6 @@
 import dev.felnull.imp.client.handler.ClientHandler;
 import dev.felnull.imp.client.handler.MusicHandler;
 import dev.felnull.imp.client.handler.RenderHandler;
-import dev.felnull.imp.client.model.IMPModels;
 import dev.felnull.imp.client.music.loader.IMPMusicLoaders;
 import dev.felnull.imp.client.music.loadertypes.IMPMusicLoaderTypes;
 import dev.felnull.imp.client.music.subtitle.IMPMusicSubtitles;

diff --git a/common/src/main/java/dev/felnull/imp/server/handler/ServerHandler.java b/common/src/main/java/dev/felnull/imp/server/handler/ServerHandler.java
@@ -2,7 +2,6 @@
 
 import com.mojang.brigadier.CommandDispatcher;
 import dev.architectury.event.events.common.CommandRegistrationEvent;
-import dev.architectury.event.events.common.EntityEvent;
 import dev.felnull.imp.IamMusicPlayer;
 import dev.felnull.imp.block.IMPBlocks;
 import dev.felnull.imp.item.IMPItems;

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -171,9 +171,9 @@ curseforge {
                 displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric"
             }
 
-         /*   addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.mod_version}-dev.jar")) {
-                displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric-dev"
-            }*/
+            /*   addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.mod_version}-dev.jar")) {
+                   displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric-dev"
+               }*/
             addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.mod_version}-sources.jar")) {
                 displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Fabric-sources"
             }

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -38,7 +38,7 @@
   "depends": {
     "fabric": "*",
     "minecraft": ">=1.18.1",
-    "otyacraftengine": ">=2.1",
+    "otyacraftengine": ">=2.2",
     "architectury": ">=3.7.22",
     "cloth-config2": ">=6.2.57"
   }

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -181,9 +181,9 @@ curseforge {
                 displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Forge"
             }
 
-        /*    addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.mod_version}-dev.jar")) {
-                displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Forge-dev"
-            }*/
+            /*    addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.mod_version}-dev.jar")) {
+                    displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Forge-dev"
+                }*/
             addArtifact(file("${project.buildDir}/libs/${rootProject.archives_base_name}-${project.mod_version}-sources.jar")) {
                 displayName = "${rootProject.mod_display_name}-${rootProject.minecraft_version}-${project.mod_version}-Forge-sources"
             }

diff --git a/forge/src/main/java/dev/felnull/imp/forge/IamMusicPlayerForge.java b/forge/src/main/java/dev/felnull/imp/forge/IamMusicPlayerForge.java
@@ -1,13 +1,9 @@
 package dev.felnull.imp.forge;
 
-import dev.architectury.event.events.common.TickEvent;
 import dev.architectury.platform.forge.EventBuses;
 import dev.felnull.imp.IamMusicPlayer;
 import dev.felnull.imp.client.IamMusicPlayerClient;
 import dev.felnull.imp.client.util.LavaPlayerUtil;
-import net.minecraft.world.entity.item.ItemEntity;
-import net.minecraft.world.item.EnderpearlItem;
-import net.minecraftforge.event.entity.EntityEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -50,6 +50,6 @@ side = "BOTH"
 [[dependencies.iammusicplayer]]
 modId = "otyacraftengine"
 mandatory = true
-versionRange = "[2.1,)"
+versionRange = "[2.2,)"
 ordering = "AFTER"
 side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -16,8 +16,8 @@ jei_version=1.18.1:9.2.1.69
 rei_version=7.3.432
 felnull_version=1.44
 cloth_config_version=6.2.57
-oe_version=2.2-build3
-oe_repo_pre=pre.
+oe_version=2.2
+oe_repo_pre=
 lava_version=1.3.78
 #---------------------MAVEN---------------------#
 maven_group=dev.felnull

diff --git a/version_check.json b/version_check.json
@@ -1,6 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/iammusicplayer",
   "1.18.1": {
+    "3.2": "Fix bug",
     "3.1": "First 1.18.1"
   },
   "1.17.1": {
@@ -19,8 +20,8 @@
     "1.0": "The Frist Release."
   },
   "promos": {
-    "1.18.1-latest": "3.1",
-    "1.18.1-recommended": "3.1",
+    "1.18.1-latest": "3.2",
+    "1.18.1-recommended": "3.2",
     "1.17.1-latest": "3.0",
     "1.17.1-recommended": "3.0",
     "1.16.5-latest": "2.8",