Client-Server desync fixes for potion effects, sounds, and damage logic

CREDITS.md

@@ -1,7 +1,7 @@
 # Credits
 
 Electroblob's Wizardry: Twilight Forest Spell Pack  
-Version 1.1.0  
+Version 1.1.1  
 For Minecraft 1.12.2, Twilight Forest 3.10 and Wizardry 4.3
 
 Designed, coded and textured by Electroblob

build.gradle

@@ -1,108 +1,151 @@
+import groovy.json.JsonOutput
+
 buildscript {
     repositories {
-        jcenter()
-        maven { url = "https://files.minecraftforge.net/maven" }
+        gradlePluginPortal()
+        maven {
+            name 'MinecraftForge'
+            url 'https://maven.minecraftforge.net/'
+        }
+        maven {
+            name 'Garden of Fancy'
+            url 'https://maven.gofancy.wtf/releases'
+        }
+        //fallback for fancygradle maven
+        //mavenLocal()
+        maven {
+            name 'Sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public/'
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.+'
+        classpath 'org.ajoberstar.grgit:grgit-gradle:3.1.1'
+        classpath group: 'wtf.gofancy.fancygradle', name: 'wtf.gofancy.fancygradle.gradle.plugin', version: '1.1.+'
+    }
+
+    repositories.each {
+        if (it instanceof MavenArtifactRepository && it.url.toString() == "https://files.minecraftforge.net/maven") {
+            it.url = "https://maven.minecraftforge.net"
+        }
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'idea'
+apply plugin: 'maven-publish'
+apply plugin: org.ajoberstar.grgit.gradle.GrgitPlugin
+apply plugin: 'wtf.gofancy.fancygradle'
 
-version = "1.1.0"
+version = "1.1.1"
 group = "electroblob.tfspellpack" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "TFSpellPack"
 
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-}
+// Need this here so eclipse task generates correctly.
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
-repositories {
+minecraft {
+    // The mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   Snapshot are built nightly.
+    // stable_#            Stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not always work.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+    //mappings channel: 'snapshot', version: '20171003-1.12'
+    mappings channel: "stable", version: "39-1.12"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
-    // Twilight Forest
-	maven {
-		name = "Twilight Forest Maven"
-		url = "http://repository.steamnsteel.info/artifactory/twilight-forest"
-	}
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
 
-    // ... and all of its dependencies
+    def argsz = ['--username', 'WinDanesz', '--user', 'WinDanesz', '--uuid', '7faee354-8c60-4f5c-9862-fc0ce5f7f575']
+    runs {
+        client {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'info'
+            args argsz
+        }
+
+        server {
+
+            // Recommended logging data for a userdev environment
+            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'info'
+        }
+    }
+}
+
+repositories {
+    google()
+    mavenCentral()
     maven {
-        name 'progwm\'s Maven' // JEI + Mantle + TCon
-        url 'https://dvs1.progwml6.com/files/maven'
+        url = uri('https://www.cursemaven.com')
+        content {
+            includeGroup 'curse.maven'
+        }
     }
     maven {
-        name 'tterrag\'s Maven' // CTM
-        url 'https://maven.tterrag.com/'
-}
+        name = 'Modrinth'
+        url = uri('https://api.modrinth.com/maven')
+        content {
+            includeGroup 'maven.modrinth'
+        }
+    }
     maven {
-        name 'Jared\'s Maven' // Immersive Engineering + Patchouli
-        url 'https://blamejared.com/maven'
+        name = 'Sponge'
+        url = uri('https://repo.spongepowered.org/maven')
     }
     maven {
-        name 'player\'s Maven' // Forestry
-        url 'http://maven.ic2.player.to/'
+        url = uri('https://maven.blamejared.com')
     }
     maven {
-        name 'Curseforge Maven' // Baubles, Thaumcraft, Wizardry
-        url 'https://minecraft.curseforge.com/api/maven/'
+        url = uri('https://m2.dv8tion.net/releases')
+    }
+    maven {
+        url = uri('https://jitpack.io')
     }
-
-}
-
-minecraft {
-    version = "1.12.2-14.23.5.2847"
-    runDir = "run"
-
-    // the mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   snapshot are built nightly.
-    // stable_#            stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
-    // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "stable_39"
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
 dependencies {
+    //// MC version ////
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
+    minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}"
+    //// MC version ////
+    implementation fg.deobf("curse.maven:baubles-${baubles_projectid}:${baubles_fileid}")
+    implementation fg.deobf("curse.maven:electroblobs-wizardry-${wizardry_projectid}:${wizardry_fileid}")
+    implementation fg.deobf("curse.maven:twilight-forest-${tf_projectid}:${tf_fileid}")
+    implementation fg.deobf("curse.maven:jei-${jei_projectid}:${jei_fileid}")
+}
 
-    // Oh my goodness it actually works
-    // Better not touch it now, lest we break it again!
-
-    // TF's own dependencies
-    deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
-    deobfCompile "slimeknights.mantle:Mantle:${mc_version_short}-${mantle_version}"
-    deobfCompile "slimeknights:TConstruct:${mc_version}-${tcon_version}"
-    deobfCompile "team.chisel.ctm:CTM:MC${mc_version}-${ctm_version}"
-    deobfCompile "team.chisel:Chisel:MC${mc_version}-${chisel_version}"
-    deobfCompile "blusunrize:ImmersiveEngineering:${immersive_engineering_version}"
-    deobfCompile "vazkii.patchouli:Patchouli:${patchouli_version}"
-    deobfCompile "net.sengir.forestry:forestry_${mc_version}:${forestry_version}"
-    deobfCompile "baubles:Baubles:${mc_version_short}:${baubles_version}"
-    deobfCompile "thaumcraft:Thaumcraft:${mc_version}:${thaumcraft_version}"
-
-    // My dependencies
-    deobfCompile "electroblobs-wizardry:ElectroblobsWizardry:${wizardry_version}:MC${mc_version}"
-	deobfCompile "com.github.teamtwilight.twilightforest:twilightforest-${mc_version}:${tf_version}:universal"
-
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'deobf'
 }
 
 processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
+    // replace tokens in mcmod.info, and pack.mcmeta
     from(sourceSets.main.resources.srcDirs) {
+        include 'pack.mcmeta'
         include 'mcmod.info'
-
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
     }
-
-    // copy everything else except the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+
+    duplicatesStrategy = 'include'
+}
+
+fancyGradle {
+    patches {
+        resources
+        coremods
+        asm
     }
 }

gradle.properties

@@ -1,18 +1,25 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
+mod_id=tfspellpack
 mc_version=1.12.2
 mc_version_short=1.12
 jei_version=4.15.0.291
+baubles_version=1.5.2
+wizardry_projectid=265642
 wizardry_version=4.3.1
+wizardry_fileid=5354477
 tf_version=3.11.1021
-
-ctm_version=+
-chisel_version=+
-mantle_version=+
-tcon_version=+
-immersive_engineering_version=+
-patchouli_version=1.0+
-forestry_version=5.8.2.354
-baubles_version=1.5.2
-thaumcraft_version=6.1.BETA26
+antique_atlas_version=4.6.3
+forge_version=14.23.5.2860
+mappings_version=39
+mappings_channel=stable
+mappings_mc_version=1.12
+baubles_projectid=227083
+baubles_fileid=2518667
+jei_projectid=238222
+jei_fileid=2803400
+tf_projectid=227639
+tf_fileid=2818055
+org.gradle.daemon=false
+org.gradle.java.home=C:/Users/Admin/.gradle/jdks/jdk8u482-b08

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Oct 06 00:40:31 BST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip