Update CONTRIBUTING.md and gradle stuff

- Update gradle to 7.6
- Update gradle plugins
- Use essential repo
- Fix version in gradle.properties

Author: ILikePlayingGames

.github/docs/CONTRIBUTING.md

@@ -12,51 +12,32 @@ git checkout -b development --track origin/development
 ### Requirements
 - **IDE** (One of them)
   - [IntelliJ IDEA](https://www.jetbrains.com/idea/) **(Recommended)**
+    - Our team uses IDEA. We may not be able to provide support for other IDEs.
   - [Eclipse](https://www.eclipse.org/)
 - **(Plugin) Lombok** to help with things such as not having to manually create Getters and Setters.
-  - [IntelliJ IDEA](https://plugins.jetbrains.com/plugin/6317-lombok)
-    - **After installing the plugin**
-      - Go to `Preferences`
-      - Go to `Build, Execution, Deployment`
-      - Go to `Compiler`
-      - Go to `Annotation Processors`
-      - Check ☑ `Enable annotation processing`.
+  - IntelliJ IDEA (pre-installed)
   - [Eclipse](https://projectlombok.org/setup/eclipse)
 
 ### Getting started
 **Note:** You can use `gradle` instead of using gradle wrapper `./gradlew`.
 
 1. Clone the repository
-2. Setup the development environment
+2. Wait for the gradle project to import.
+3. Setup the development environment
     ```shell script
     ./gradlew setupDecompWorkspace
     ```
-3. Integrate the development environment with your IDE
+4. Integrate the development environment with your IDE
     - IntelliJ IDEA
-    ```shell script
-    ./gradlew idea genIntellijRuns
-    ```
+      - Done automatically
     - Eclipse **(doesn't generate debug configuration)**
     ```shell script
     ./gradlew eclipse
     ```
-    - (Eclipse) Change **Text File Encoding** from `Default` to `UTF-8`
+    - Change **Text File Encoding** from `Default` to `UTF-8`
       - Go to `Window` -> `Preferences` -> `General` -> `Workspace`
       - Change `Text File Encoding` from `Default` to `UTF-8`
-
-4. Make sure to add the **VM** arguments to your debug configuration:
-    ```text
-    -Dfml.coreMods.load=codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsLoadingPlugin
-    -Dlog4j.configurationFile=file:$ProjectFileDir$/log-config.xml
-    ```
-5. Include your **Minecraft** username and password as arguments in the **debug configuration**.
-   In order, to login into [Hypixel](https://hypixel.net) by your account.
-    ```text
-    --username "<username>" --password "<password>"
-    ```
-   > **Note:** Don't share your password with **anyone**.
-   > **We aren't going to ask you about your password!**
-6. **You are now ready to build the mod!**
+5. **You are now ready to build the mod!**
 
 ### How to build
 1. Build the mod
@@ -75,9 +56,14 @@ git checkout -b development --track origin/development
     > so the access transformers are applied to the source code!
     > 
 2. (Optional) Run the **Minecraft Forge** client
-    - Using an IDE
-        - Run the debug configuration you created in "Getting Started."
+    - Using IntelliJ IDEA
+        - Add the environment variable `FETCH_DATA_ONLINE=true` if you want to use data files from the CDN.
+        - Run the "Minecraft Client" debug configuration.
+        - Click the link in the console to log in with [DevAuth](https://github.com/DJtheRedstoner/DevAuth).
     - Using the command line
     ```shell script
     ./gradlew runClient --args="--username <username> --password <password>"
-    ```
+    ```
+
+### Questions?
+Visit our [Discord Server](https://discord.gg/zWyr3f5GXz) for support.

build.gradle

@@ -4,9 +4,9 @@ import java.text.ParseException
 
 plugins {
     id 'java'
-    id 'gg.essential.loom' version '0.10.0.4'
+    id 'gg.essential.loom' version '0.10.0.5'
     id 'dev.architectury.architectury-pack200' version '0.1.3'
-    id 'io.freefair.lombok' version "6.5.1"
+    id 'io.freefair.lombok' version "6.6.1"
     id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'net.kyori.blossom' version '1.3.1'
 }
@@ -56,6 +56,7 @@ blossom {
 }
 
 loom {
+    //noinspection GroovyAssignabilityCheck
     launchConfigs {
         "client" {
             property('fml.coreMods.load', 'codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsLoadingPlugin')
@@ -77,7 +78,7 @@ sourceSets {
 }
 
 configurations.create('bundle')
-configurations.implementation.extendsFrom(configurations.getByName('bundle'))
+configurations.implementation.extendsFrom(configurations.named('bundle').get())
 
 repositories {
     mavenCentral()
@@ -145,7 +146,7 @@ jar {
 
 remapJar {
     from(tasks.shadowJar)
-    input.set(tasks.shadowJar.archiveFile)
+    input.set(tasks.shadowJar.archiveFile.get())
 
     archiveFileName = "${project.name}-${project.version}-for-MC-${project.minecraftVersion}.jar"
 }

gradle.properties

@@ -3,7 +3,7 @@
 org.gradle.jvmargs=-Xmx2G
 
 # SkyblockAddons Properties
-version=1.7.0
+version=1.7.1
 # Set by CI
 buildNumber=0
 acceptedMinecraftVersions=[1.8.9]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -6,19 +6,19 @@ pluginManagement {
             url 'https://oss.sonatype.org/content/repositories/snapshots'
         }
         maven {
-            url 'https://maven.architectury.dev/'
+            url 'https://maven.architectury.dev'
         }
         maven {
             url 'https://maven.fabricmc.net'
         }
         maven {
-            url 'https://maven.minecraftforge.net/'
+            url 'https://maven.minecraftforge.net'
         }
         maven {
-            url 'https://repo.spongepowered.org/maven/'
+            url 'https://repo.spongepowered.org/maven'
         }
         maven {
-            url 'https://repo.sk1er.club/repository/maven-releases/'
+            url 'https://repo.essential.gg/repository/maven-public'
         }
     }
     resolutionStrategy {