diff --git a/build.gradle b/build.gradle index e810eee5b..37efb4e4a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,11 @@ buildscript { mavenCentral() maven { name = "forge" - url = "https://files.minecraftforge.net/maven" + url = "https://maven.minecraftforge.net/" + } + maven { + name = "gt" + url = "http://gregtech.overminddl1.com/" } maven { name = "sonatype" @@ -14,15 +18,18 @@ buildscript { } } dependencies { - classpath 'com.github.CDAGaming:ForgeGradle:1c670759c5' - classpath 'com.github.CDAGaming:CurseGradle:184e4322fd' + classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7' + classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' } } -apply plugin: 'scala' +plugins { + id 'scala' + id 'idea' + id 'maven-publish' +} + apply plugin: 'forge' -apply plugin: 'idea' -apply plugin: 'maven-publish' apply plugin: 'com.matthewprenger.cursegradle' file "build.properties" withReader { @@ -77,15 +84,36 @@ repositories { maven { name = "mightypirates" url = "https://maven.cil.li/" + metadataSources { + mavenPom() + artifact() + } + } + maven { + name 'Overmind forge repo mirror' + url 'https://gregtech.overminddl1.com/' } // These are necessary because some parts of the maven repo is weirdly structured, this needs to be fixed. ivy { name 'weird maven repos' artifactPattern "https://maven.cil.li/[module]/[revision]/[module]-[revision].[ext]" + metadataSources { + artifact() + } } ivy { name 'weird maven repos 2' artifactPattern "https://maven.cil.li/[module]/[revision]/[module]-[revision]-[classifier].[ext]" + metadataSources { + artifact() + } + } + ivy { + name 'asie dependency mirror' + artifactPattern "http://asie.pl/javadeps/[module]-[revision](-[classifier]).[ext]" + metadataSources { + artifact() + } } } @@ -119,20 +147,20 @@ dependencies { } // compileOnly "coloredlightscore:ColoredLightsCore:${config.coloredlights.version}:api" - compileOnly name: 'buildcraft', version: config.bc.version, classifier: "dev", ext: 'jar' + compileOnly name: 'buildcraft', version: config.bc.version, classifier: 'dev', ext: 'jar' compileOnly name: 'GalacticraftCoreAll', version: config.gc.version, ext: 'jar' compileOnly name: 'MekanismAll', version: config.mekanism.version, ext: 'jar' - compileOnly name: 'redlogic', version: config.redlogic.version, ext: 'jar' + compileOnly name: 'redlogic', version: config.redlogic.version, classifier: 'dev', ext: 'jar' - compileOnly name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - compileOnly name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' - compileOnly name: 'MineFactoryReloaded', version: config.mfr.version, ext: 'jar' - compileOnly name: 'ComputerCraft', version: config.cc.version, ext: 'jar' - compileOnly name: 'EnderIO', version: config.eio.version, ext: 'jar' - compileOnly name: 'Railcraft', version: config.rc.version, ext: 'jar' - compileOnly name: 'BloodMagic', version: config.bloodmagic.version, ext: 'jar' - compileOnly name: 'ExtraCells', version: config.ec.version, ext: 'jar' - compileOnly name: 'ThaumicEnergistics', version: config.thaumicenergistics.version, ext: 'jar' + compileOnly name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'MineFactoryReloaded', version: config.mfr.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'ComputerCraft', version: config.cc.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'EnderIO', version: config.eio.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'Railcraft', version: config.rc.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'BloodMagic', version: config.bloodmagic.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'ExtraCells', version: config.ec.version, ext: 'jar', classifier: 'dev' + compileOnly name: 'thaumicenergistics', version: config.thaumicenergistics.version, ext: 'jar', classifier: 'dev' compile 'com.google.code.findbugs:jsr305:1.3.9' // Annotations used by google libs. @@ -257,6 +285,8 @@ curseforge { changelog = file("changelog.md") addGameVersion config.minecraft.version addGameVersion "Java 8" + addGameVersion "Forge" + mainArtifact jar } } @@ -264,6 +294,6 @@ curseforge { // this is needed for IntelliJ so we don't have to copy over the assets manually every time idea { module { - outputDir = file('build/classes/main') + inheritOutputDirs = true } } diff --git a/build.properties b/build.properties index cd7736ec6..7d9c019da 100644 --- a/build.properties +++ b/build.properties @@ -3,25 +3,25 @@ forge.version=10.13.4.1614-1.7.10 oc.version=1.7.5 -ae2.version=rv2-beta-26 -bc.version=7.0.9 +ae2.version=rv2-stable-10 +bc.version=7.1.24 bloodmagic.cf=2223/203 -bloodmagic.version=1.3.0a-1 -bluepower.version=0.2.928 -cc.cf=2228/723 -cc.version=1.73 -ccl.version=1.1.1.104 -cofhlib.cf=2230/207 -cofhlib.version=[1.7.10]1.0.0RC7-127 +bloodmagic.version=1.7.10-1.3.3-17 +bluepower.version=0.2.962 +cc.cf=2269/399 +cc.version=1.75 +ccl.version=1.1.3.136 +cofhlib.cf=2388/747 +cofhlib.version=[1.7.10]1.2.1-185 coloredlights.version=1.3.7.35 coloredlights.build=35 ec.cf=2242/839 ec.version=deobf-1.7.10-2.2.73b129 -eio.cf=2219/296 -eio.version=1.7.10-2.2.1.276 +eio.cf=2322/348 +eio.version=1.7.10-2.3.0.429_beta es.version=1.4.5.24 -fmp.version=1.1.0.308 -forestry.version=4.1.0.44 +fmp.version=1.2.0.344 +forestry.version=4.2.16.64 gc.build=3 gc.version=3.0.7 gt.version=5.04.06 @@ -29,25 +29,25 @@ ic2.version=2.2.654-experimental igwmod.version=1.1.3-18 mekanism.build=5 mekanism.version=7.1.2 -mfr.cf=2229/626 -mfr.version=[1.7.10]2.8.0RC8-86 -nei.version=1.0.3.57 +mfr.cf=2277/485 +mfr.version=[1.7.10]2.8.1-174 +nei.version=1.0.4.107 nek.version=2.0.0b4 -projred.version=1.7.10-4.6.2.82 +projred.version=1.7.10-4.7.0pre12.95 qmunitylib.version=0.1.105 -rc.cf=2219/321 -rc.version=1.7.10-9.4.0.0 -redlogic.version=59.0.3 +rc.cf=2458/987 +rc.version=1.7.10-9.12.2.1 +redlogic.version=59.1.13 rotc.version=V5c -thaumicenergistics.cf=2277/520 -thaumicenergistics.version=1.0.0.1-RV2 -tis3d.version=MC1.7.10-1.2.4.70 +thaumicenergistics.cf=2542/305 +thaumicenergistics.version=1.1.2.0-RV2 +tis3d.version=MC1.7.10-1.4.0.78 tmech.version=75.0afb56c re.version=3.0.0.342 waila.version=1.5.10 wrcbe.version=1.4.1.2 -cofhcore.cf=2246/697 -cofhcore.version=[1.7.10]3.0.3B4-302-dev +cofhcore.cf=2388/750 +cofhcore.version=[1.7.10]3.1.4-329 curse.project.id=223008 curse.project.releaseType=release diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6afbcbb43..a3b3e1544 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip diff --git a/src/main/scala/li/cil/oc/integration/cofh/tileentity/DriverSecureTile.java b/src/main/scala/li/cil/oc/integration/cofh/tileentity/DriverSecureTile.java index 4c7e5cc53..40eedb6c4 100644 --- a/src/main/scala/li/cil/oc/integration/cofh/tileentity/DriverSecureTile.java +++ b/src/main/scala/li/cil/oc/integration/cofh/tileentity/DriverSecureTile.java @@ -1,13 +1,17 @@ package li.cil.oc.integration.cofh.tileentity; import cofh.api.tileentity.ISecurable; +import com.mojang.authlib.GameProfile; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverSidedTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.text.WordUtils; @@ -29,7 +33,7 @@ public final class DriverSecureTile extends DriverSidedTileEntity { @Callback(doc = "function(name:string):boolean -- Returns whether the player with the given name can access the component") public Object[] canPlayerAccess(final Context context, final Arguments args) { - return new Object[]{tileEntity.canPlayerAccess(args.checkString(0))}; + return new Object[]{tileEntity.canPlayerAccess(MinecraftServer.getServer().getConfigurationManager().func_152612_a(args.checkString(0)))}; } @Callback(doc = "function():string -- Returns the type of the access.") diff --git a/src/main/scala/li/cil/oc/integration/enderio/EventHandlerEnderIO.scala b/src/main/scala/li/cil/oc/integration/enderio/EventHandlerEnderIO.scala index 0daebf856..723f7253d 100644 --- a/src/main/scala/li/cil/oc/integration/enderio/EventHandlerEnderIO.scala +++ b/src/main/scala/li/cil/oc/integration/enderio/EventHandlerEnderIO.scala @@ -1,6 +1,6 @@ package li.cil.oc.integration.enderio -import crazypants.enderio.tool.ITool +import crazypants.enderio.api.tool.ITool import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack diff --git a/src/main/scala/li/cil/oc/integration/projectred/EventHandlerProjectRed.scala b/src/main/scala/li/cil/oc/integration/projectred/EventHandlerProjectRed.scala index 34c110c81..c0c95cd12 100644 --- a/src/main/scala/li/cil/oc/integration/projectred/EventHandlerProjectRed.scala +++ b/src/main/scala/li/cil/oc/integration/projectred/EventHandlerProjectRed.scala @@ -9,7 +9,7 @@ object EventHandlerProjectRed { player.getHeldItem.getItem match { case wrench: IScrewdriver => if (changeDurability) { - wrench.damageScrewdriver(player.getEntityWorld, player) + wrench.damageScrewdriver(player, player.getHeldItem) true } else true