2.7

TeamFelNull · Oct 10, 2021 · fb9c149 · fb9c149
1 parent 8f7dcbb
commit fb9c149
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 45 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -19,9 +19,12 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build curseforge
+        run: ./gradlew build publish curseforge publishModrinth --stacktrace
         env:
           curesforgeapikey: ${{secrets.CURESFORGEAPIKEY}}
+          modrinthapikey: ${{secrets.MODRINTH}}
+          mavenname: ${{secrets.MAVEN_NAME}}
+          mavenpassword: ${{secrets.MAVEN_PASSWORD}}
       - name: Zip create
         run: |
           cd build/libs

diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,8 @@ buildscript {
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
+        classpath "gradle.plugin.com.modrinth.minotaur:Minotaur:1.2.0"
     }
 }
 
@@ -15,7 +17,8 @@ plugins {
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
-
+apply plugin: com.matthewprenger.cursegradle.CurseGradlePlugin
+apply plugin: com.modrinth.minotaur.Minotaur
 //def dest = "pre-${getDate()}"
 
 version = "${mod_version}"
@@ -74,7 +77,6 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 repositories {
     maven { url = "https://dvs1.progwml6.com/files/maven/" }//JEI
     maven { url = "https://modmaven.k-4u.nl" }//JEI
-    maven { url "https://maven.latmod.com/" }//FGL
     maven { url "https://maven.felnull.dev/" }//OE
     maven {
         url 'https://m2.dv8tion.net/releases'
@@ -94,7 +96,6 @@ dependencies {
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
     compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
-    compile fg.deobf("com.feed_the_beast.mods:ftb-gui-library:${fgl_version}")
     compile fg.deobf("red.felnull:otyacraftengine:${oe_version}")
     shadowAll 'com.sedmelluq:lavaplayer:1.3.75'
     shadowAll 'org.apache.httpcomponents:httpclient:4.5.13'
@@ -162,14 +163,114 @@ artifacts {
 publishing {
     publications {
         mavenJava(MavenPublication) {
+            artifactId = 'iammusicplayer'
             artifact jar
-            artifact devJar
-            artifact sourceJar
+            pom {
+                name = 'IamMusicPlayer'
+                description = 'Music Player which supports Multiplayer.'
+                licenses {
+                    license {
+                        name = 'GNU Lesser General Public License v3.0'
+                        url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'MORIMORI0317'
+                        name = 'MORIMORI0317'
+                    }
+                    developer {
+                        id = 'FelNull'
+                        name = 'TeamFelNull'
+                        email = '[email protected]'
+                    }
+                }
+            }
         }
     }
     repositories {
         maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
+            url "https://maven.felnull.dev/"
+            credentials {
+                username = System.getenv('mavenname')
+                password = System.getenv('mavenpassword')
+            }
         }
     }
 }
+
+if (System.getenv('curesforgeapikey') != null && "${project.curesforge_id}" != '') {
+    curseforge {
+        apiKey = System.getenv('curesforgeapikey')
+        project {
+            id = "${project.curesforge_id}"
+            changelog = ""
+            releaseType = "${project.release_type}"
+            addGameVersion "${project.mc_version}"
+            project.support_versions.split(",").each {
+                String version -> addGameVersion version
+            }
+            if ("${project.loader_type}" == 'Fabric')
+                addGameVersion 'Fabric'
+
+            if (JavaVersion.current().ordinal() + 1 >= 16)
+                addGameVersion 'Java 16'
+
+            mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${project.mod_version}.jar")) {
+                displayName = "${project.mod_name}-${project.mc_version}-${project.mod_version}-${project.loader_type}"
+
+                if ("${project.loader_type}" == 'Fabric' || "${project.required_mods}" != '' || "${project.optional_mods}" != '' || "${project.embedded_mods}" != '') {
+                    relations {
+                        if ("${project.loader_type}" == 'Fabric') {
+                            requiredDependency 'fabric-api'
+                            if ("${project.cloth_config_version}" != '')
+                                requiredDependency 'cloth-config'
+                        }
+
+                        if ("${project.required_mods}" != '') {
+                            project.required_mods.split(",").each {
+                                String name -> requiredDependency name
+                            }
+                        }
+
+                        if ("${project.optional_mods}" != '') {
+                            project.optional_mods.split(",").each {
+                                String name -> optionalDependency name
+                            }
+                        }
+
+                        if ("${project.embedded_mods}" != '') {
+                            project.embedded_mods.split(",").each {
+                                String name -> embeddedLibrary name
+                            }
+                        }
+                    }
+                }
+            }
+
+            addArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${project.mod_version}-dev.jar")) {
+                displayName = "${project.mod_name}-${project.mc_version}-${project.mod_version}-${project.loader_type}-dev"
+            }
+            addArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${project.mod_version}-source.jar")) {
+                displayName = "${project.mod_name}-${project.mc_version}-${project.mod_version}-${project.loader_type}-source"
+            }
+        }
+    }
+}
+
+if (System.getenv('modrinthapikey') != null && "${modrinth_id}" != '') {
+    task publishModrinth(type: com.modrinth.minotaur.TaskModrinthUpload) {
+
+        token = System.getenv('modrinthapikey')
+        projectId = "${project.modrinth_id}"
+        versionName = "${project.mod_name}-${project.mc_version}-${project.mod_version}-${project.loader_type}"
+        versionNumber = "${project.mc_version}-${project.mod_version}-${project.loader_type}"
+        uploadFile = file("${project.buildDir}/libs/${archivesBaseName}-${project.mod_version}.jar")
+        versionType = "${project.release_type}".toUpperCase()
+        addGameVersion("${project.mc_version}")
+        addLoader("${project.loader_type}".toLowerCase())
+        project.support_versions.split(",").each {
+            String version -> addGameVersion version
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -8,9 +8,15 @@ mod_version=2.7
 mod_changelog=
 mod_vendor=TeamFelNull
 mc_version=1.16.5
-curesfg_id=386380
-releasetype=beta
 jei_version=1.16.5:7.7.1.121
 fgl_version=1.0.0.18
 oe_version=1.23
-jave_version=3.0.1
+
+curesforge_id=386380
+modrinth_id=ZHHXRhiU
+release_type=beta
+loader_type=Forge
+support_versions=1.16.5
+required_mods=
+optional_mods=
+embedded_mods=
diff --git a/src/main/java/red/felnull/imp/client/gui/screen/IMPAbstractMonitorEquipmentScreen.java b/src/main/java/red/felnull/imp/client/gui/screen/IMPAbstractMonitorEquipmentScreen.java
@@ -8,7 +8,6 @@
 import net.minecraft.util.text.ITextComponent;
 import red.felnull.otyacraftengine.client.gui.widget.StringImageButton;
 import red.felnull.otyacraftengine.client.util.IKSGScreenUtil;
-import red.felnull.otyacraftengine.util.IKSGStyles;
 
 public abstract class IMPAbstractMonitorEquipmentScreen<T extends Container> extends IMPAbstractEquipmentScreen<T> implements IMonitorScreen {
     public IMPAbstractMonitorEquipmentScreen(T screenContainer, PlayerInventory playerInventory, ITextComponent titleIn) {

diff --git a/src/main/java/red/felnull/imp/client/gui/widget/UploadLocationSelectButton.java b/src/main/java/red/felnull/imp/client/gui/widget/UploadLocationSelectButton.java
@@ -8,10 +8,8 @@
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import red.felnull.imp.client.data.MusicSourceClientReferencesType;
-import red.felnull.imp.client.gui.screen.IMPAbstractEquipmentScreen;
 import red.felnull.imp.client.gui.screen.MusicSharingDeviceScreen;
 import red.felnull.otyacraftengine.client.util.IKSGRenderUtil;
-import red.felnull.otyacraftengine.util.IKSGStyles;
 
 public class UploadLocationSelectButton extends ImageButton {
     private static final ResourceLocation WorldIcon = new ResourceLocation("textures/misc/unknown_server.png");

diff --git a/src/main/java/red/felnull/imp/client/gui/widget/YoutubeSearchResultScrollListButton.java b/src/main/java/red/felnull/imp/client/gui/widget/YoutubeSearchResultScrollListButton.java
@@ -5,7 +5,6 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.util.text.TranslationTextComponent;
-import red.felnull.imp.client.gui.screen.IMPAbstractEquipmentScreen;
 import red.felnull.imp.client.gui.screen.MusicSharingDeviceScreen;
 import red.felnull.imp.client.music.player.IMusicPlayer;
 import red.felnull.imp.client.music.player.YoutubeMusicPlayer;

diff --git a/src/main/java/red/felnull/imp/client/util/RenderUtil.java b/src/main/java/red/felnull/imp/client/util/RenderUtil.java
@@ -8,14 +8,12 @@
 import net.minecraft.util.text.IFormattableTextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import red.felnull.imp.IamMusicPlayer;
-import red.felnull.imp.client.gui.screen.IMPAbstractEquipmentScreen;
 import red.felnull.imp.data.IMPWorldData;
 import red.felnull.imp.music.resource.PlayImage;
 import red.felnull.otyacraftengine.client.util.IKSGRenderUtil;
 import red.felnull.otyacraftengine.client.util.IKSGTextureUtil;
 import red.felnull.otyacraftengine.util.IKSGColorUtil;
 import red.felnull.otyacraftengine.util.IKSGMath;
-import red.felnull.otyacraftengine.util.IKSGStyles;
 
 import java.util.Random;
 

diff --git a/src/main/java/red/felnull/imp/handler/ServerHandler.java b/src/main/java/red/felnull/imp/handler/ServerHandler.java
@@ -7,11 +7,8 @@
 import net.minecraft.loot.conditions.RandomChance;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraftforge.event.LootTableLoadEvent;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
@@ -27,7 +24,6 @@
 import red.felnull.otyacraftengine.data.SendReceiveLogger;
 import red.felnull.otyacraftengine.util.IKSGDataUtil;
 import red.felnull.otyacraftengine.util.IKSGFileLoadUtil;
-import red.felnull.otyacraftengine.util.IKSGStyles;
 
 import java.io.File;
 

diff --git a/src/main/java/red/felnull/imp/handler/WorldMusicServerHandler.java b/src/main/java/red/felnull/imp/handler/WorldMusicServerHandler.java
@@ -1,23 +1,5 @@
 package red.felnull.imp.handler;
 
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.network.PacketDistributor;
-import red.felnull.imp.data.IMPWorldData;
-import red.felnull.imp.data.WorldMusicFileDataInfo;
-import red.felnull.imp.packet.PacketHandler;
-import red.felnull.imp.packet.WorldMusicSendByteMessage;
-import red.felnull.imp.util.MusicUtils;
-import red.felnull.imp.util.PathUtils;
-import red.felnull.otyacraftengine.api.ResponseSender;
-import red.felnull.otyacraftengine.api.event.common.ResponseEvent;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.nio.file.Files;
-import java.util.HashMap;
-import java.util.Map;
 /*
 public class WorldMusicServerHandler {
     public static int sendByteLength = 32 * 1024;

diff --git a/src/main/java/red/felnull/imp/proxy/CommonProxy.java b/src/main/java/red/felnull/imp/proxy/CommonProxy.java
@@ -5,17 +5,15 @@
 import red.felnull.imp.data.IMPWorldData;
 import red.felnull.imp.data.PlayListGuildManeger;
 import red.felnull.imp.data.PlayMusicManeger;
-import red.felnull.imp.exception.IMPFFmpegException;
-import red.felnull.imp.handler.*;
+import red.felnull.imp.handler.MusicReceiveHandler;
+import red.felnull.imp.handler.ServerHandler;
+import red.felnull.imp.handler.TradeHandler;
+import red.felnull.imp.handler.WorldRingerHandler;
 import red.felnull.imp.lava.LavaPlayerPort;
 import red.felnull.imp.music.ServerWorldMusicManager;
 import red.felnull.imp.packet.PacketHandler;
 import red.felnull.imp.recipe.ComposterRecipes;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
 public class CommonProxy {
     public void preInit() {
         LavaPlayerPort.init();

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -2,7 +2,7 @@ modLoader="javafml"
 loaderVersion="[33,)" 
 issueTrackerURL="https://github.com/TeamFelnull/IamMusicPlayer/issues"
 logoFile="logo.png" 
-license="LGPL v3"
+license="GNU LGPL v3"
 [[mods]]
 modId="iammusicplayer"
 version="${file.jarVersion}"