update bs+sa+deps (#130)

* update bs+sa+deps

* Switch immibis microblocks to modrinth maven

* Remove modrinth from repositories as it's now in the buildscript

---------

Co-authored-by: Raven Szewczyk <[email protected]>

build.gradle

@@ -1,4 +1,4 @@
-//version: 1685785062
+//version: 1690104383
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -69,7 +69,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -115,6 +115,8 @@ propertyDefaultIfUnset("usesMixinDebug", project.usesMixins)
 propertyDefaultIfUnset("forceEnableMixins", false)
 propertyDefaultIfUnset("channel", "stable")
 propertyDefaultIfUnset("mappingsVersion", "12")
+propertyDefaultIfUnset("usesMavenPublishing", true)
+propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases")
 propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnset("curseForgeProjectId", "")
@@ -357,7 +359,27 @@ catch (Exception ignored) {
 String identifiedVersion
 String versionOverride = System.getenv("VERSION") ?: null
 try {
-    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+    // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
+    if (versionOverride == null) {
+        def gitDetails = versionDetails()
+        def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning
+        String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git')
+        if (branchName.startsWith('origin/')) {
+            branchName = branchName.minus('origin/')
+        }
+        branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver
+        identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}'
+        if (gitDetails.commitDistance > 0) {
+            identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}"
+            if (isDirty) {
+                identifiedVersion += "-dirty"
+            }
+        } else if (isDirty) {
+            identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
+        }
+    } else {
+        identifiedVersion = versionOverride
+    }
 }
 catch (Exception ignored) {
     out.style(Style.Failure).text(
@@ -465,10 +487,19 @@ sourceSets {
     }
 }
 
-if (file('addon.gradle').exists()) {
+if (file('addon.gradle.kts').exists()) {
+    apply from: 'addon.gradle.kts'
+} else if (file('addon.gradle').exists()) {
     apply from: 'addon.gradle'
 }
 
+// File for local tweaks not commited to Git
+if (file('addon.local.gradle.kts').exists()) {
+    apply from: 'addon.local.gradle.kts'
+} else if (file('addon.local.gradle').exists()) {
+    apply from: 'addon.local.gradle'
+}
+
 // Allow unsafe repos but warn
 repositories.configureEach { repo ->
     if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) {
@@ -479,7 +510,14 @@ repositories.configureEach { repo ->
     }
 }
 
-apply from: 'repositories.gradle'
+if (file('repositories.gradle.kts').exists()) {
+    apply from: 'repositories.gradle.kts'
+} else if (file('repositories.gradle').exists()) {
+    apply from: 'repositories.gradle'
+} else {
+    logger.error("Neither repositories.gradle.kts nor repositories.gradle was found, make sure you extracted the full ExampleMod template.")
+    throw new RuntimeException("Missing repositories.gradle[.kts]")
+}
 
 configurations {
     runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
@@ -537,13 +575,28 @@ repositories {
         }
     }
     if (includeWellKnownRepositories.toBoolean()) {
-        maven {
-            name "CurseMaven"
-            url "https://cursemaven.com"
-            content {
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name "CurseMaven"
+                    url "https://cursemaven.com"
+                }
+            }
+            filter {
                 includeGroup "curse.maven"
             }
         }
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = "Modrinth"
+                    url = "https://api.modrinth.com/maven"
+                }
+            }
+            filter {
+                includeGroup "maven.modrinth"
+            }
+        }
         maven {
             name = "ic2"
             url = "https://maven.ic2.player.to/"
@@ -585,7 +638,7 @@ dependencies {
         }
     }
     if (usesMixins.toBoolean()) {
-        implementation(mixinProviderSpec)
+        implementation(modUtils.enableMixins(mixinProviderSpec))
     } else if (forceEnableMixins.toBoolean()) {
         runtimeOnlyNonPublishable(mixinProviderSpec)
     }
@@ -611,12 +664,34 @@ configurations.all {
     }
 }
 
-apply from: 'dependencies.gradle'
+dependencies {
+    constraints {
+        def minGtnhLibVersion = "0.0.13"
+        implementation("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+        runtimeOnly("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+        devOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+        runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") {
+            because("fixes duplicate mod errors in java 17 configurations using old gtnhlib")
+        }
+    }
+}
+
+if (file('dependencies.gradle.kts').exists()) {
+    apply from: 'dependencies.gradle.kts'
+} else if (file('dependencies.gradle').exists()) {
+    apply from: 'dependencies.gradle'
+} else {
+    logger.error("Neither dependencies.gradle.kts nor dependencies.gradle was found, make sure you extracted the full ExampleMod template.")
+    throw new RuntimeException("Missing dependencies.gradle[.kts]")
+}
 
 def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins'
-def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap
-def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg"
 
 tasks.register('generateAssets') {
     group = "GTNH Buildscript"
@@ -648,46 +723,17 @@ tasks.register('generateAssets') {
 }
 
 if (usesMixins.toBoolean()) {
-    tasks.named("reobfJar", ReobfuscatedJar).configure {
-        extraSrgFiles.from(mixinSrg)
-    }
-
     tasks.named("processResources").configure {
         dependsOn("generateAssets")
     }
 
     tasks.named("compileJava", JavaCompile).configure {
-        doFirst {
-            new File(mixinTmpDir).mkdirs()
-        }
         options.compilerArgs += [
-            "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}",
-            "-AoutSrgFile=${mixinSrg}",
-            "-AoutRefMapFile=${refMap}",
             // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
             "-XDenableSunApiLintControl",
             "-XDignore.symbol.file"
         ]
     }
-
-    pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
-        kapt {
-            correctErrorTypes = true
-            javacOptions {
-                option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}")
-                option("-AoutSrgFile=$mixinSrg")
-                option("-AoutRefMapFile=$refMap")
-            }
-        }
-        tasks.configureEach { task ->
-            if (task.name == "kaptKotlin") {
-                task.doFirst {
-                    new File(mixinTmpDir).mkdirs()
-                }
-            }
-        }
-    }
-
 }
 
 tasks.named("processResources", ProcessResources).configure {
@@ -705,7 +751,6 @@ tasks.named("processResources", ProcessResources).configure {
     }
 
     if (usesMixins.toBoolean()) {
-        from refMap
         dependsOn("compileJava", "compileScala")
     }
 }
@@ -724,13 +769,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.3.5'
+    def lwjgl3ifyVersion = '1.4.0'
     def asmVersion = '9.4'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19')
     }
 
     java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
@@ -979,6 +1024,9 @@ idea {
                 }
             }
             runConfigurations {
+                "0. Build and Test"(Gradle) {
+                    taskNames = ["build"]
+                }
                 "1. Run Client"(Gradle) {
                     taskNames = ["runClient"]
                 }
@@ -1098,6 +1146,11 @@ tasks.named("processIdeaSettings").configure {
     dependsOn("injectTags")
 }
 
+tasks.named("ideVirtualMainClasses").configure {
+    // Make IntelliJ "Build project" build the mod jars
+    dependsOn("jar", "reobfJar", "spotlessCheck")
+}
+
 // workaround variable hiding in pom processing
 def projectConfigs = project.configurations
 
@@ -1118,12 +1171,14 @@ publishing {
     }
 
     repositories {
-        maven {
-            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
-            allowInsecureProtocol = true
-            credentials {
-                username = System.getenv("MAVEN_USER") ?: "NONE"
-                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+        if (usesMavenPublishing.toBoolean()) {
+            maven {
+                url = mavenPublishUrl
+                allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
+                credentials {
+                    username = System.getenv("MAVEN_USER") ?: "NONE"
+                    password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+                }
             }
         }
     }
@@ -1238,7 +1293,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.1.1"
+def buildscriptGradleVersion = "8.2.1"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion
@@ -1344,8 +1399,14 @@ boolean isNewBuildScriptVersionAvailable() {
 
     String currentBuildScript = getFile("build.gradle").getText()
     String currentBuildScriptHash = getVersionHash(currentBuildScript)
-    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
-    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+    String availableBuildScriptHash
+    try {
+        String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+        availableBuildScriptHash = getVersionHash(availableBuildScript)
+    } catch (IOException e) {
+        logger.warn("Could not check for buildscript update availability: {}", e.message)
+        return false
+    }
 
     boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
     return !isUpToDate
@@ -1510,3 +1571,17 @@ def getSecondaryArtifacts() {
     if (apiPackage) secondaryArtifacts += [apiJar]
     return secondaryArtifacts
 }
+
+// For easier scripting of things that require variables defined earlier in the buildscript
+if (file('addon.late.gradle.kts').exists()) {
+    apply from: 'addon.late.gradle.kts'
+} else if (file('addon.late.gradle').exists()) {
+    apply from: 'addon.late.gradle'
+}
+
+// File for local tweaks not commited to Git
+if (file('addon.late.local.gradle.kts').exists()) {
+    apply from: 'addon.late.local.gradle.kts'
+} else if (file('addon.late.local.gradle').exists()) {
+    apply from: 'addon.late.local.gradle'
+}

dependencies.gradle

@@ -1,26 +1,26 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.2.14:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.7:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.2.16:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.6.13:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.76-GTNH:dev')
     implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
-    api('com.github.GTNewHorizons:BuildCraft:7.1.33:dev')
+    api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
     compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-215-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-240-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.46:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.2.0-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.11.0-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.5-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.140:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.14.6:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.0-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.11.3-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.12-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
-    compileOnly(deobf('https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
-    compileOnly(deobf('https://media.forgecdn.net/files/2426/270/Mekanism-1.7.10-9.1.0.281.jar')) // https://aidancbrady.com/mekanism/download/
-    compileOnly(deobf('https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar'))
+    compileOnly(rfg.deobf('curse.maven:computercraft-67504:2269339')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339
+    compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
+    compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java

@@ -4,10 +4,20 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 import cofh.api.energy.IEnergyContainerItem;
+import crazypants.enderio.config.Config;
 
 public interface IItemOfTravel extends IEnergyContainerItem {
 
     boolean isActive(EntityPlayer ep, ItemStack equipped);
 
     void extractInternal(ItemStack equipped, int power);
+
+    /**
+     * @param equipped player who is currently holding this item. caller will ensure the item held has your Item as item
+     *                 type
+     * @return -1 if method not supported, or max(can extract, power), e.g. 0 if item is empty.
+     */
+    default int canExtractInternal(ItemStack equipped, int power) {
+        return Config.strictTPItemChecking ? 0 : -1;
+    }
 }

src/main/java/crazypants/enderio/config/Config.java

@@ -563,6 +563,8 @@ public final class Config {
     public static float inventoryPanelExtractCostPerItem = 12.0f;
     public static float inventoryPanelExtractCostPerOperation = 32.0f;
 
+    public static boolean strictTPItemChecking = true;
+
     public static void load(FMLPreInitializationEvent event) {
         PacketHandler.INSTANCE
                 .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT);
@@ -2884,6 +2886,12 @@ public final class Config {
                 0.0f,
                 10000.0f,
                 "Internal power used per extract operation (independent of stack size)");
+        strictTPItemChecking = config.get(
+                sectionMisc.name,
+                "strictTPItemChecking",
+                strictTPItemChecking,
+                "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.")
+                .getBoolean(strictTPItemChecking);
     }
 
     public static void checkYetaAccess() {

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java

@@ -331,6 +331,11 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe
         extractEnergy(equipped, power, false);
     }
 
+    @Override
+    public int canExtractInternal(ItemStack equipped, int power) {
+        return extractEnergy(equipped, power, true);
+    }
+
     private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
         return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
     }

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java

@@ -394,6 +394,11 @@ public class ItemDarkSteelSword extends ItemSword
         extractEnergy(equipped, power, false);
     }
 
+    @Override
+    public int canExtractInternal(ItemStack equipped, int power) {
+        return extractEnergy(equipped, power, true);
+    }
+
     private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) {
         return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null;
     }

src/main/java/crazypants/enderio/machine/painter/TileEntityPainter.java

@@ -96,9 +96,10 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid
             // next result is a different item type
             return 0;
         } else if (result.hasTagCompound() && inventory[2].hasTagCompound()) {
-            int cookedId = result.getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID);
-            int invId = inventory[2].getTagCompound().getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID);
-            if (cookedId != invId) {
+            if (inventory[2].getTagCompound().hasKey("Items")) return 0; // presence of internal items
+            String cookedId = result.getTagCompound().getString(BlockPainter.KEY_SOURCE_BLOCK_ID);
+            String invId = inventory[2].getTagCompound().getString(BlockPainter.KEY_SOURCE_BLOCK_ID);
+            if (!cookedId.equals(invId)) {
                 // next result has a different source item than the current one
                 return 0;
             }

src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java

@@ -84,6 +84,11 @@ public class ItemTeleportStaff extends ItemTravelStaff {
         // Do nothing, as we have infinite energy.
     }
 
+    @Override
+    public int canExtractInternal(ItemStack equipped, int power) {
+        return power;
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {

src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java

@@ -132,6 +132,11 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave
         setEnergy(item, res);
     }
 
+    @Override
+    public int canExtractInternal(ItemStack equipped, int power) {
+        return Math.min(getEnergyStored(equipped), power);
+    }
+
     void setEnergy(ItemStack container, int energy) {
         if (container.stackTagCompound == null) {
             container.stackTagCompound = new NBTTagCompound();

src/main/java/crazypants/enderio/teleport/TravelController.java

@@ -111,6 +111,47 @@ public class TravelController {
         }
     }
 
+    public boolean validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse,
+            boolean conserveMotion, TravelSource source) {
+        BlockCoord target = new BlockCoord(x, y, z);
+        double dist = getDistanceSquared(toTp, target);
+        // allow 15% overshoot to account for rounding
+        if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return false;
+        if (powerUse < getRequiredPower(toTp, source, target)) return false;
+        ItemStack equippedItem = toTp.getCurrentEquippedItem();
+        switch (source) {
+            case TELEPAD:
+                // this source is invalid for this type of packet
+                return false;
+            case BLOCK:
+                // this source is only triggered when player is on any active travel anchor
+                BlockCoord on = getActiveTravelBlock(toTp);
+                if (on == null) return false;
+                // target must be a valid selectedCoord
+                // selectedCoord can either be a block right above/below when the player is on anchor...
+                if (on.x == x && on.z == z) return true;
+                // or another anchor
+                TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj);
+                if (!(maybeAnchor instanceof ITravelAccessable)) return false;
+                ITravelAccessable anchor = (ITravelAccessable) maybeAnchor;
+                return anchor.canBlockBeAccessed(toTp) || !isValidTarget(toTp, target, TravelSource.BLOCK);
+            case STAFF:
+            case STAFF_BLINK:
+                if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return false;
+                if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return false;
+                int energy = ((IItemOfTravel) equippedItem.getItem()).canExtractInternal(equippedItem, powerUse);
+                return energy == -1 || energy == powerUse;
+            case TELEPORT_STAFF_BLINK:
+            case TELEPORT_STAFF:
+                // tp staff is creative version of traveling staff
+                // no energy check or anything else needed
+                // but the player must actually be equipped with one of these
+                return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff;
+            default:
+                throw new AssertionError("unidentified travel source");
+        }
+    }
+
     public void addBlockToBlinkBlackList(String blockName) {
         blackList.add(new UniqueIdentifier(blockName));
     }
@@ -733,35 +774,41 @@ public class TravelController {
                 && y <= 255; i++, y += direction) {
 
             // Circumvents the raytracing used to find candidates on the y axis
-            TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z);
-
-            if (selectedBlock instanceof ITravelAccessable) {
-                ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock;
-                BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z);
-
-                if (Config.travelAnchorSkipWarning) {
-                    if (travelBlock.getRequiresPassword(player)) {
-                        showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked"));
-                    }
-
-                    if (travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE
-                            && !travelBlock.canUiBeAccessed(player)) {
-                        showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate"));
-                    }
-                    if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
-                        showMessage(
-                                player,
-                                new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed"));
-                    }
-                }
-                if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
-                    selectedCoord = targetBlock;
-                    return;
-                }
+            BlockCoord targetBlock = getValidVerticalTarget(player, currentBlock, world, y);
+            if (targetBlock != null) {
+                selectedCoord = targetBlock;
+                return;
             }
         }
     }
 
+    private BlockCoord getValidVerticalTarget(EntityPlayer player, BlockCoord currentBlock, World world, int y) {
+        TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z);
+
+        if (selectedBlock instanceof ITravelAccessable) {
+            ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock;
+            BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z);
+
+            if (Config.travelAnchorSkipWarning) {
+                if (travelBlock.getRequiresPassword(player)) {
+                    showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked"));
+                }
+
+                if (travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE
+                        && !travelBlock.canUiBeAccessed(player)) {
+                    showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate"));
+                }
+                if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
+                    showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed"));
+                }
+            }
+            if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
+                return targetBlock;
+            }
+        }
+        return null;
+    }
+
     @SideOnly(Side.CLIENT)
     private void updateSelectedTarget(EntityPlayer player) {
         selectedCoord = null;
@@ -923,19 +970,16 @@ public class TravelController {
         return true;
     }
 
-    @SideOnly(Side.CLIENT)
     private BlockCoord getActiveTravelBlock(EntityPlayer player) {
-        World world = Minecraft.getMinecraft().theWorld;
-        if (world != null && player != null) {
-            int x = MathHelper.floor_double(player.posX);
-            int y = MathHelper.floor_double(player.boundingBox.minY) - 1;
-            int z = MathHelper.floor_double(player.posZ);
-            TileEntity tileEntity = world.getTileEntity(x, y, z);
-            if (tileEntity instanceof ITravelAccessable) {
-                if (((ITravelAccessable) tileEntity).isTravelSource()) {
-                    return new BlockCoord(x, y, z);
-                }
-            }
+        if (player == null) return null;
+        World world = player.worldObj;
+        if (world == null) return null;
+        int x = MathHelper.floor_double(player.posX);
+        int y = MathHelper.floor_double(player.boundingBox.minY) - 1;
+        int z = MathHelper.floor_double(player.posZ);
+        TileEntity tileEntity = world.getTileEntity(x, y, z);
+        if (tileEntity instanceof ITravelAccessable && ((ITravelAccessable) tileEntity).isTravelSource()) {
+            return new BlockCoord(x, y, z);
         }
         return null;
     }

src/main/java/crazypants/enderio/teleport/packet/PacketLongDistanceTravelEvent.java

@@ -16,9 +16,11 @@ import com.enderio.core.common.vecmath.Vector3d;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.Log;
 import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.teleport.TeleportEntityEvent;
 import crazypants.enderio.api.teleport.TravelSource;
+import crazypants.enderio.teleport.ItemTeleportStaff;
 import crazypants.enderio.teleport.TravelController;
 import io.netty.buffer.ByteBuf;
 
@@ -53,16 +55,50 @@ public class PacketLongDistanceTravelEvent
 
     @Override
     public IMessage onMessage(PacketLongDistanceTravelEvent message, MessageContext ctx) {
-        Entity toTp = message.entityId == -1 ? ctx.getServerHandler().playerEntity
-                : ctx.getServerHandler().playerEntity.worldObj.getEntityByID(message.entityId);
+        if (message.entityId != -1) {
+            // after checking the code base, this type of packet won't be sent at all,
+            // so we can assume this to be an attempt to hack
+            Log.LOGGER.warn(
+                    Log.securityMarker,
+                    "Player {} tried to illegally tp other entity {}.",
+                    ctx.getServerHandler().playerEntity.getGameProfile(),
+                    message.entityId);
+            return null;
+        }
+        EntityPlayerMP toTp = ctx.getServerHandler().playerEntity;
 
         TravelSource source = TravelSource.values()[message.source];
 
+        if (!validate(toTp, source)) {
+            Log.LOGGER.warn(
+                    Log.securityMarker,
+                    "Player {} tried to tp without valid prereq.",
+                    ctx.getServerHandler().playerEntity.getGameProfile());
+            return null;
+        }
+
         doServerTeleport(toTp, message.conserveMotion, source);
 
         return null;
     }
 
+    private static boolean validate(EntityPlayerMP toTp, TravelSource source) {
+        ItemStack equippedItem = toTp.getCurrentEquippedItem();
+        switch (source) {
+            case STAFF:
+                return equippedItem != null && equippedItem.getItem() instanceof IItemOfTravel
+                        && ((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem);
+            case TELEPORT_STAFF:
+                // tp staff is creative version of traveling staff
+                // no energy check or anything else needed
+                // but the player must actually be equipped with one of these
+                return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff;
+            default:
+                // all other types are not allowed
+                return false;
+        }
+    }
+
     public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source) {
         EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null;
         Optional<BlockCoord> travelDestination = TravelController.instance.findTravelDestination(player, source);
@@ -77,6 +113,14 @@ public class PacketLongDistanceTravelEvent
         if (powerUse < 0) {
             return false;
         }
+        if (player != null && player.getCurrentEquippedItem() != null
+                && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) {
+            int used = ((IItemOfTravel) player.getCurrentEquippedItem().getItem())
+                    .canExtractInternal(player.getCurrentEquippedItem(), powerUse);
+            if (used != -1 && used != powerUse) {
+                return false;
+            }
+        }
 
         TeleportEntityEvent evt = new TeleportEntityEvent(toTp, source, x, y, z);
         if (MinecraftForge.EVENT_BUS.post(evt)) {

src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java

@@ -13,9 +13,11 @@ import com.enderio.core.common.vecmath.Vector3d;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import crazypants.enderio.Log;
 import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.teleport.TeleportEntityEvent;
 import crazypants.enderio.api.teleport.TravelSource;
+import crazypants.enderio.teleport.TravelController;
 import io.netty.buffer.ByteBuf;
 
 public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravelEvent, IMessage> {
@@ -65,13 +67,31 @@ public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravel
 
     @Override
     public IMessage onMessage(PacketTravelEvent message, MessageContext ctx) {
-        Entity toTp = message.entityId == -1 ? ctx.getServerHandler().playerEntity
-                : ctx.getServerHandler().playerEntity.worldObj.getEntityByID(message.entityId);
+        if (message.entityId != -1) {
+            // after checking the code base, this type of packet won't be sent at all,
+            // so we can assume this to be an attempt to hack
+            Log.LOGGER.warn(
+                    Log.securityMarker,
+                    "Player {} tried to illegally tp other entity {}.",
+                    ctx.getServerHandler().playerEntity.getGameProfile(),
+                    message.entityId);
+            return null;
+        }
+        EntityPlayerMP toTp = ctx.getServerHandler().playerEntity;
 
         int x = message.x, y = message.y, z = message.z;
 
         TravelSource source = TravelSource.values()[message.source];
 
+        if (!TravelController.instance
+                .validatePacketTravelEvent(toTp, x, y, z, message.powerUse, message.conserveMotion, source)) {
+            Log.LOGGER.warn(
+                    Log.securityMarker,
+                    "Player {} tried to tp without valid prereq.",
+                    ctx.getServerHandler().playerEntity.getGameProfile());
+            return null;
+        }
+
         doServerTeleport(toTp, x, y, z, message.powerUse, message.conserveMotion, source);
 
         return null;