diff --git a/build.gradle b/build.gradle index 2f59b1b..35b0653 100644 --- a/build.gradle +++ b/build.gradle @@ -31,19 +31,38 @@ archivesBaseName = mod_archives_name minecraft { version = "1.7.10-10.13.4.1614-1.7.10" - runDir = "eclipse" replace "@VERSION@", project.version } repositories { - maven { - name = 'chickenbones' - url = "http://chickenbones.net/maven" - } maven { name = "gt" url = "http://gregtech.overminddl1.com/" } + ivy { + name = "gtnh_download_source" + artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]") + } + maven { + name = "gtnh_download_source" + url = "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/" + } + maven { + name = "curse" + url = "https://cursemaven.com" + } + maven { + name = "jitpack" + url = "https://jitpack.io" + } + maven { + name = 'tterrag Repo' + url = "https://maven.tterrag.com" + } + maven { + name = "BlameJared" + url = "https://maven.blamejared.com/" + } flatDir { dirs 'libs' } @@ -51,9 +70,19 @@ repositories { dependencies { - compile "codechicken:NotEnoughItems:${mc_version}-${nei_version}:universal" - compile "codechicken:CodeChickenLib:1.7.10-1.1.3.138:dev" - compile "codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev" + compile("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev") + compile("com.github.GTNewHorizons:CodeChickenCore:master-SNAPSHOT:dev") + compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev") + compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") + compile("com.github.GTNewHorizons:Avaritia:master-SNAPSHOT") + compile("com.github.GTNewHorizons:Avaritiaddons:master-SNAPSHOT") + compile("curse.maven:cofh-lib-220333:2388748") + compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev") + compileOnly("com.github.GTNewHorizons:EnderIO:master-SNAPSHOT:dev") + compileOnly("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") + compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:master-SNAPSHOT:dev") + compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:master-SNAPSHOT:dev") + compileOnly("blusunrize:ImmersiveEngineering:0.10-50:deobf") } diff --git a/gradle.properties b/gradle.properties index 48aa3c1..8ef5c0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,6 @@ org.gradle.daemon=false # General Specifications mc_version=1.7.10 -nei_version=2.1.6-GTNH -ae2_version=rv3-beta-52-GTNH mod_version=1.3.4 forge_version=10.13.4.1614 mod_group=com.github.vfyjxf.neenergistics diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..5c2d1cf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f0b5a51..a774fd3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/libs/Avaritia-1.19-deobf.jar b/libs/Avaritia-1.19-deobf.jar deleted file mode 100644 index 821db55..0000000 Binary files a/libs/Avaritia-1.19-deobf.jar and /dev/null differ diff --git a/libs/Avaritiaddons-1.4b.1-GTNH.jar b/libs/Avaritiaddons-1.4b.1-GTNH.jar deleted file mode 100644 index ff54169..0000000 Binary files a/libs/Avaritiaddons-1.4b.1-GTNH.jar and /dev/null differ diff --git a/libs/Baubles-1.7.10-1.0.1.11.jar b/libs/Baubles-1.7.10-1.0.1.11.jar deleted file mode 100644 index 6f05d62..0000000 Binary files a/libs/Baubles-1.7.10-1.0.1.11.jar and /dev/null differ diff --git a/libs/BetterCrashes-1.0.0-dev.jar b/libs/BetterCrashes-1.0.0-dev.jar deleted file mode 100644 index e575138..0000000 Binary files a/libs/BetterCrashes-1.0.0-dev.jar and /dev/null differ diff --git a/libs/BloodMagic-1.7.10-1.3.3-44-deobf.jar b/libs/BloodMagic-1.7.10-1.3.3-44-deobf.jar deleted file mode 100644 index 2be358c..0000000 Binary files a/libs/BloodMagic-1.7.10-1.3.3-44-deobf.jar and /dev/null differ diff --git a/libs/BloodMagic-1.7.10-1.3.3-44-sources.jar b/libs/BloodMagic-1.7.10-1.3.3-44-sources.jar deleted file mode 100644 index ad87a98..0000000 Binary files a/libs/BloodMagic-1.7.10-1.3.3-44-sources.jar and /dev/null differ diff --git a/libs/EnderCore-1.7.10-0.2.0.39_beta.jar b/libs/EnderCore-1.7.10-0.2.0.39_beta.jar deleted file mode 100644 index 1fdf703..0000000 Binary files a/libs/EnderCore-1.7.10-0.2.0.39_beta.jar and /dev/null differ diff --git a/libs/EnderIO-1.7.10-2.3.1.16_beta.32-dev.jar b/libs/EnderIO-1.7.10-2.3.1.16_beta.32-dev.jar deleted file mode 100644 index 53d80c6..0000000 Binary files a/libs/EnderIO-1.7.10-2.3.1.16_beta.32-dev.jar and /dev/null differ diff --git a/libs/EnderIO-1.7.10-2.3.1.16_beta.32-sources.jar b/libs/EnderIO-1.7.10-2.3.1.16_beta.32-sources.jar deleted file mode 100644 index bbf2eb3..0000000 Binary files a/libs/EnderIO-1.7.10-2.3.1.16_beta.32-sources.jar and /dev/null differ diff --git a/libs/GT-PlusPlus-1.7.09.GTNH.jar b/libs/GT-PlusPlus-1.7.09.GTNH.jar deleted file mode 100644 index 9239558..0000000 Binary files a/libs/GT-PlusPlus-1.7.09.GTNH.jar and /dev/null differ diff --git a/libs/Grimoire-mc1.7.10-dev-3.2.7.jar b/libs/Grimoire-mc1.7.10-dev-3.2.7.jar deleted file mode 100644 index 943ab93..0000000 Binary files a/libs/Grimoire-mc1.7.10-dev-3.2.7.jar and /dev/null differ diff --git a/libs/ImmersiveEngineering-0.7.7-deobf.jar b/libs/ImmersiveEngineering-0.7.7-deobf.jar deleted file mode 100644 index 13fce96..0000000 Binary files a/libs/ImmersiveEngineering-0.7.7-deobf.jar and /dev/null differ diff --git a/libs/JustEnoughCalculation-1.7.10-3.6.3.jar b/libs/JustEnoughCalculation-1.7.10-3.6.3.jar deleted file mode 100644 index 306b7d5..0000000 Binary files a/libs/JustEnoughCalculation-1.7.10-3.6.3.jar and /dev/null differ diff --git a/libs/Mekanism-1.7.10-9.1.1.1031.jar b/libs/Mekanism-1.7.10-9.1.1.1031.jar deleted file mode 100644 index 68e5c4f..0000000 Binary files a/libs/Mekanism-1.7.10-9.1.1.1031.jar and /dev/null differ diff --git a/libs/NotEnoughItems-1.7.10-2.1.6-GTNH-src.jar b/libs/NotEnoughItems-1.7.10-2.1.6-GTNH-src.jar deleted file mode 100644 index 8931a9b..0000000 Binary files a/libs/NotEnoughItems-1.7.10-2.1.6-GTNH-src.jar and /dev/null differ diff --git a/libs/NotEnoughItems-1.7.10-2.1.6-GTNH-universal.jar b/libs/NotEnoughItems-1.7.10-2.1.6-GTNH-universal.jar deleted file mode 100644 index 949ea5a..0000000 Binary files a/libs/NotEnoughItems-1.7.10-2.1.6-GTNH-universal.jar and /dev/null differ diff --git a/libs/StructureLib-1.0.8-deobf.jar b/libs/StructureLib-1.0.8-deobf.jar deleted file mode 100644 index 494f861..0000000 Binary files a/libs/StructureLib-1.0.8-deobf.jar and /dev/null differ diff --git a/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.9-GTNH-deobf.jar b/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.9-GTNH-deobf.jar deleted file mode 100644 index 01a8053..0000000 Binary files a/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.9-GTNH-deobf.jar and /dev/null differ diff --git a/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.9-GTNH-sources.jar b/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.9-GTNH-sources.jar deleted file mode 100644 index dfa2e19..0000000 Binary files a/libs/WirelessCraftingTerminal-1.7.10-rv3-1.8.7.9-GTNH-sources.jar and /dev/null differ diff --git a/libs/appliedenergistics2-rv3-beta-58-GTNH-dev.jar b/libs/appliedenergistics2-rv3-beta-58-GTNH-dev.jar deleted file mode 100644 index bdcbd80..0000000 Binary files a/libs/appliedenergistics2-rv3-beta-58-GTNH-dev.jar and /dev/null differ diff --git a/libs/appliedenergistics2-rv3-beta-58-GTNH-sources.jar b/libs/appliedenergistics2-rv3-beta-58-GTNH-sources.jar deleted file mode 100644 index 82460e3..0000000 Binary files a/libs/appliedenergistics2-rv3-beta-58-GTNH-sources.jar and /dev/null differ diff --git a/libs/buildcraft-compat-1.7.10-7.1.3-30-ge6a6a94-dev.jar b/libs/buildcraft-compat-1.7.10-7.1.3-30-ge6a6a94-dev.jar new file mode 100644 index 0000000..b0916e4 Binary files /dev/null and b/libs/buildcraft-compat-1.7.10-7.1.3-30-ge6a6a94-dev.jar differ diff --git a/libs/buildcraft-compat-7.1.7-dev.jar b/libs/buildcraft-compat-7.1.7-dev.jar deleted file mode 100644 index 57f5dd3..0000000 Binary files a/libs/buildcraft-compat-7.1.7-dev.jar and /dev/null differ diff --git a/libs/buildcraft-compat-7.1.7-sources.jar b/libs/buildcraft-compat-7.1.7-sources.jar deleted file mode 100644 index b07b594..0000000 Binary files a/libs/buildcraft-compat-7.1.7-sources.jar and /dev/null differ diff --git a/libs/forestry_1.7.10-4.3.1.45-dev.jar b/libs/forestry_1.7.10-4.3.1.45-dev.jar deleted file mode 100644 index 173743a..0000000 Binary files a/libs/forestry_1.7.10-4.3.1.45-dev.jar and /dev/null differ diff --git a/libs/forestry_1.7.10-4.3.1.45-sources.jar b/libs/forestry_1.7.10-4.3.1.45-sources.jar deleted file mode 100644 index ffb7160..0000000 Binary files a/libs/forestry_1.7.10-4.3.1.45-sources.jar and /dev/null differ diff --git a/libs/gregtech-5.09.37.06-dev.jar b/libs/gregtech-5.09.37.06-dev.jar deleted file mode 100644 index 67af476..0000000 Binary files a/libs/gregtech-5.09.37.06-dev.jar and /dev/null differ diff --git a/libs/gregtech-5.09.37.06-sources.jar b/libs/gregtech-5.09.37.06-sources.jar deleted file mode 100644 index 10f01ae..0000000 Binary files a/libs/gregtech-5.09.37.06-sources.jar and /dev/null differ diff --git a/libs/industrialcraft-2-2.2.790-experimental-dev.jar b/libs/industrialcraft-2-2.2.828-experimental-dev.jar similarity index 76% rename from libs/industrialcraft-2-2.2.790-experimental-dev.jar rename to libs/industrialcraft-2-2.2.828-experimental-dev.jar index f618195..83a0f9d 100644 Binary files a/libs/industrialcraft-2-2.2.790-experimental-dev.jar and b/libs/industrialcraft-2-2.2.828-experimental-dev.jar differ diff --git a/libs/thaumicenergistics-1.1.3.12-GTNH.jar b/libs/thaumicenergistics-1.1.3.12-GTNH.jar deleted file mode 100644 index 1388899..0000000 Binary files a/libs/thaumicenergistics-1.1.3.12-GTNH.jar and /dev/null differ diff --git a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketArcaneRecipe.java b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketArcaneRecipe.java index ff3331d..04d5662 100644 --- a/src/main/java/com/github/vfyjxf/nee/network/packet/PacketArcaneRecipe.java +++ b/src/main/java/com/github/vfyjxf/nee/network/packet/PacketArcaneRecipe.java @@ -60,7 +60,7 @@ public class PacketArcaneRecipe implements IMessage, IMessageHandler