1.18 fuckery part 1
This commit is contained in:
parent
2d798cf9d1
commit
e83e47b3b1
17
build.gradle
17
build.gradle
|
|
@ -1,6 +1,6 @@
|
|||
buildscript {
|
||||
repositories {
|
||||
maven { url "https://maven.shedaniel.me/" }
|
||||
maven { url "https://maven.architectury.dev/" }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
@ -8,13 +8,11 @@ buildscript {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
plugins {
|
||||
id "architectury-plugin" version "3.2.112"
|
||||
id "dev.architectury.loom" version "0.9.0.131" apply false
|
||||
id "architectury-plugin" version "3.4-SNAPSHOT"
|
||||
id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
|
||||
}
|
||||
|
||||
|
||||
architectury {
|
||||
minecraft = rootProject.minecraft_version
|
||||
}
|
||||
|
|
@ -36,12 +34,15 @@ allprojects {
|
|||
version = rootProject.mod_version
|
||||
group = rootProject.maven_group
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.encoding = "UTF-8"
|
||||
it.options.release = 8
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = "UTF-8"
|
||||
options.release = 17
|
||||
}
|
||||
|
||||
java {
|
||||
withSourcesJar()
|
||||
}
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
|
|
@ -5,7 +5,7 @@ repositories {
|
|||
}
|
||||
|
||||
loom {
|
||||
accessWidener("src/main/resources/simpleauth.accesswidener")
|
||||
accessWidenerPath = file("src/main/resources/simpleauth.accesswidener")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
@ -13,7 +13,7 @@ dependencies {
|
|||
// Do NOT use other classes from fabric loader
|
||||
modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
|
||||
|
||||
modImplementation ("me.shedaniel:architectury:${rootProject.architectury_version}") {
|
||||
modImplementation ("dev.architectury:architectury:${rootProject.architectury_version}") {
|
||||
exclude(module: "fabric-api")
|
||||
}
|
||||
|
||||
|
|
@ -35,5 +35,8 @@ dependencies {
|
|||
}
|
||||
|
||||
architectury {
|
||||
common(false)
|
||||
common()
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
|
|
@ -71,10 +71,14 @@ public class AccountCommand {
|
|||
|
||||
// Different thread to avoid lag spikes
|
||||
THREADPOOL.submit(() -> {
|
||||
if (AuthHelper.checkPassword(((PlayerAuth) player).getFakeUuid(), pass.toCharArray()) == AuthHelper.PasswordOptions.CORRECT) {
|
||||
DB.deleteUserData(((PlayerAuth) player).getFakeUuid());
|
||||
String uuid = ((PlayerAuth) player).getFakeUuid();
|
||||
|
||||
if (AuthHelper.checkPassword(uuid, pass.toCharArray()) == AuthHelper.PasswordOptions.CORRECT) {
|
||||
DB.deleteUserData(uuid);
|
||||
player.sendMessage(new LiteralText(config.lang.accountDeleted), false);
|
||||
((PlayerAuth) player).setAuthenticated(false);
|
||||
player.networkHandler.disconnect(new LiteralText(config.lang.accountDeleted));
|
||||
playerCacheMap.remove(uuid);
|
||||
return;
|
||||
}
|
||||
player.sendMessage(
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ public class AuthCommand {
|
|||
Entity sender = source.getEntity();
|
||||
THREADPOOL.submit(() -> {
|
||||
DB.deleteUserData(uuid);
|
||||
playerCacheMap.put(uuid, null);
|
||||
playerCacheMap.remove(uuid);
|
||||
});
|
||||
|
||||
if(sender != null)
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ import static org.samo_lego.simpleauth.SimpleAuth.playerCacheMap;
|
|||
*/
|
||||
public class AuthEventHandler {
|
||||
|
||||
public static long lastAcceptedPacket = 0;
|
||||
|
||||
/**
|
||||
* Player pre-join.
|
||||
* Returns text as a reason for disconnect or null to pass
|
||||
|
|
@ -83,6 +85,7 @@ public class AuthEventHandler {
|
|||
}
|
||||
|
||||
if (
|
||||
playerCache != null &&
|
||||
playerCache.isAuthenticated &&
|
||||
playerCache.validUntil >= System.currentTimeMillis() &&
|
||||
player.getIp().equals(playerCache.lastIp)
|
||||
|
|
@ -152,6 +155,10 @@ public class AuthEventHandler {
|
|||
boolean auth = ((PlayerAuth) player).isAuthenticated();
|
||||
// Otherwise movement should be disabled
|
||||
if(!auth && !config.experimental.allowMovement) {
|
||||
if (System.nanoTime() >= lastAcceptedPacket + config.experimental.teleportationTimeoutInMs * 1000000) {
|
||||
player.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch());
|
||||
lastAcceptedPacket = System.nanoTime();
|
||||
}
|
||||
if(!player.isInvulnerable())
|
||||
player.setInvulnerable(true);
|
||||
return ActionResult.FAIL;
|
||||
|
|
|
|||
|
|
@ -67,8 +67,6 @@ public abstract class MixinServerPlayNetworkHandler {
|
|||
private void onPlayerMove(PlayerMoveC2SPacket playerMoveC2SPacket, CallbackInfo ci) {
|
||||
ActionResult result = AuthEventHandler.onPlayerMove(player);
|
||||
if (result == ActionResult.FAIL) {
|
||||
// A bit ugly, I know. (we need to update player position)
|
||||
player.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch());
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class MixinServerPlayerEntity implements PlayerAuth {
|
|||
logInfo("Teleporting " + player.getName().asString() + (hide ? " to spawn." : " to original position."));
|
||||
if (hide) {
|
||||
// Saving position
|
||||
cache.lastLocation.dimension = player.getServerWorld();
|
||||
cache.lastLocation.dimension = player.getWorld();
|
||||
cache.lastLocation.position = player.getPos();
|
||||
cache.lastLocation.yaw = player.getYaw();
|
||||
cache.lastLocation.pitch = player.getPitch();
|
||||
|
|
@ -192,6 +192,9 @@ public class MixinServerPlayerEntity implements PlayerAuth {
|
|||
if(kickTimer <= 0 && player.networkHandler.getConnection().isOpen()) {
|
||||
player.networkHandler.disconnect(new LiteralText(config.lang.timeExpired));
|
||||
}
|
||||
else if (!playerCacheMap.containsKey(((PlayerAuth) player).getFakeUuid())) {
|
||||
player.networkHandler.disconnect(new LiteralText(config.lang.accountDeleted));
|
||||
}
|
||||
else {
|
||||
// Sending authentication prompt every 10 seconds
|
||||
if(kickTimer % 200 == 0)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import java.io.*;
|
|||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static org.samo_lego.simpleauth.SimpleAuth.serverProp;
|
||||
import static org.samo_lego.simpleauth.utils.SimpleLogger.logError;
|
||||
|
|
@ -273,6 +272,16 @@ public class AuthConfig {
|
|||
* their stuff, unless you migrate it manually.
|
||||
*/
|
||||
public boolean forceoOfflineUuids = false;
|
||||
/**
|
||||
* Cancellation of packets with player's movement and
|
||||
* teleportation back leads to an increase number of that packets.
|
||||
* That settings limits players teleportation.
|
||||
* This settings is server-wide so maximum rate would be
|
||||
* (1000/teleportationTimeoutInMs) per seconds for every unauthorised players.
|
||||
* Value 0 would effectively disable this settings
|
||||
* so players will be teleported after each packet.
|
||||
*/
|
||||
public long teleportationTimeoutInMs = 5;
|
||||
}
|
||||
|
||||
public MainConfig main = new MainConfig();
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ public class PlayerCache {
|
|||
playerCache = new PlayerCache();
|
||||
if(player != null) {
|
||||
// Setting position cache
|
||||
playerCache.lastLocation.dimension = player.getServerWorld();
|
||||
playerCache.lastLocation.dimension = player.getWorld();
|
||||
playerCache.lastLocation.position = player.getPos();
|
||||
playerCache.lastLocation.yaw = player.getYaw();
|
||||
playerCache.lastLocation.pitch = player.getPitch();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package org.samo_lego.simpleauth.utils;
|
||||
|
||||
import me.shedaniel.architectury.ExpectPlatform;
|
||||
import dev.architectury.injectables.annotations.ExpectPlatform;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
|
||||
public class PlatformSpecific {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
},
|
||||
|
||||
"license": "MIT",
|
||||
"environment": "*",
|
||||
"environment": "server",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"org.samo_lego.simpleauth.SimpleAuthFabric"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"required": true,
|
||||
"package": "org.samo_lego.simpleauth.mixin",
|
||||
"compatibilityLevel": "JAVA_16",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"mixins": [
|
||||
"MixinPlayerAdvancementTracker",
|
||||
"MixinPlayerManager",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
plugins {
|
||||
id "com.github.johnrengelman.shadow" version "5.0.0"
|
||||
id "com.github.johnrengelman.shadow" version "7.1.0"
|
||||
}
|
||||
|
||||
repositories {
|
||||
|
|
@ -40,7 +40,7 @@ dependencies {
|
|||
// from masa's maven
|
||||
//modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
|
||||
// jitpack for quicker updating
|
||||
modImplementation "com.github.gnembon:fabric-carpet:${project.carpet_branch}-SNAPSHOT"
|
||||
modImplementation "carpet:fabric-carpet:1.18-${project.carpet_core_version}"
|
||||
|
||||
// Password hashing
|
||||
// Argon2
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
},
|
||||
|
||||
"license": "MIT",
|
||||
"environment": "*",
|
||||
"environment": "server",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"org.samo_lego.simpleauth.SimpleAuthFabric"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
plugins {
|
||||
id "com.github.johnrengelman.shadow" version "5.0.0"
|
||||
}
|
||||
|
||||
configurations {
|
||||
shadow
|
||||
id "com.github.johnrengelman.shadow" version "7.1.0"
|
||||
}
|
||||
|
||||
architectury {
|
||||
|
|
@ -12,24 +8,25 @@ architectury {
|
|||
}
|
||||
|
||||
loom {
|
||||
// Enable this for yarn to work
|
||||
//useFabricMixin = true
|
||||
mixinConfigs = ["mixins.simpleauth.json"]
|
||||
useFabricMixin = true
|
||||
forge {
|
||||
mixinConfig "mixins.simpleauth.json"
|
||||
}
|
||||
}
|
||||
|
||||
configurations {
|
||||
common
|
||||
shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
|
||||
compileClasspath.extendsFrom common
|
||||
runtimeClasspath.extendsFrom common
|
||||
developmentForge.extendsFrom common
|
||||
}
|
||||
|
||||
dependencies {
|
||||
forge("net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}")
|
||||
forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
|
||||
modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
|
||||
|
||||
implementation(project(path: ":common")) {
|
||||
transitive = false
|
||||
}
|
||||
developmentForge(project(path: ":common")) {
|
||||
transitive = false
|
||||
}
|
||||
shadow(project(path: ":common", configuration: "transformProductionForge")) {
|
||||
transitive = false
|
||||
}
|
||||
common(project(path: ":common", configuration: "namedElements")) { transitive = false }
|
||||
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
|
||||
|
||||
// Password hashing
|
||||
// Argon2
|
||||
|
|
@ -51,20 +48,33 @@ dependencies {
|
|||
shadowJar {
|
||||
exclude "fabric.mod.json"
|
||||
|
||||
configurations = [project.configurations.shadow]
|
||||
classifier "shadow"
|
||||
configurations = [project.configurations.shadowCommon]
|
||||
classifier "dev-shadow"
|
||||
}
|
||||
|
||||
remapJar {
|
||||
dependsOn(shadowJar)
|
||||
input.set(shadowJar.archivePath)
|
||||
input.set shadowJar.archiveFile
|
||||
dependsOn shadowJar
|
||||
archiveClassifier = "forge"
|
||||
}
|
||||
|
||||
jar {
|
||||
classifier "dev"
|
||||
manifest {
|
||||
attributes([
|
||||
"MixinConfigs": "mixins.simpleauth.json",
|
||||
])
|
||||
}
|
||||
}
|
||||
|
||||
sourcesJar {
|
||||
def commonSources = project(":common").sourcesJar
|
||||
dependsOn commonSources
|
||||
from commonSources.archiveFile.map { zipTree(it) }
|
||||
}
|
||||
|
||||
components.java {
|
||||
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
||||
skip()
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
loom.forge = true
|
||||
loom.platform = forge
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.samo_lego.simpleauth;
|
||||
package org.samo_lego.simpleauth.forge;
|
||||
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import net.minecraft.server.command.ServerCommandSource;
|
||||
|
|
@ -6,8 +6,10 @@ import net.minecraftforge.common.MinecraftForge;
|
|||
import net.minecraftforge.event.RegisterCommandsEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
|
||||
import net.minecraftforge.event.server.ServerStoppedEvent;
|
||||
import net.minecraftforge.fml.loading.FMLPaths;
|
||||
|
||||
import org.samo_lego.simpleauth.SimpleAuth;
|
||||
import org.samo_lego.simpleauth.commands.*;
|
||||
|
||||
@Mod(SimpleAuth.MOD_ID)
|
||||
|
|
@ -30,7 +32,7 @@ public class SimpleAuthForge {
|
|||
|
||||
|
||||
@SubscribeEvent
|
||||
public void onStopServer(FMLServerStoppedEvent event) {
|
||||
public void onStopServer(ServerStoppedEvent event) {
|
||||
SimpleAuth.stop();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.samo_lego.simpleauth.event;
|
||||
package org.samo_lego.simpleauth.forge.event;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
|
@ -11,6 +11,8 @@ import net.minecraftforge.fml.common.Mod;
|
|||
import static net.minecraftforge.eventbus.api.EventPriority.HIGHEST;
|
||||
import static org.samo_lego.simpleauth.SimpleAuth.MOD_ID;
|
||||
|
||||
import org.samo_lego.simpleauth.event.AuthEventHandler;
|
||||
|
||||
/**
|
||||
* This class will take care of actions players try to do,
|
||||
* and cancel them if they aren't authenticated
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.samo_lego.simpleauth.utils.forge;
|
||||
package org.samo_lego.simpleauth.forge.utils.forge;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
modLoader="javafml" #mandatory
|
||||
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
||||
loaderVersion="[34,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
||||
loaderVersion="[38,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
||||
|
||||
license="MIT"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"pack": {
|
||||
"description": "SimpleAuth",
|
||||
"pack_format": 6
|
||||
"pack_format": 8
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@
|
|||
org.gradle.jvmargs=-Xmx1G
|
||||
|
||||
# Fabric properties
|
||||
minecraft_version=1.17.1-pre2
|
||||
yarn_mappings=1.17.1-pre2+build.1
|
||||
loader_version=0.11.6
|
||||
minecraft_version=1.18.1
|
||||
yarn_mappings=1.18.1+build.2
|
||||
loader_version=0.12.11
|
||||
|
||||
#Fabric api
|
||||
fabric_version=0.36.0+1.17
|
||||
fabric_version=0.44.0+1.18
|
||||
|
||||
# Forge
|
||||
forge_version=36.0.4
|
||||
forge_version=39.0.8
|
||||
|
||||
# Architectury
|
||||
architectury_version=1.14.156
|
||||
architectury_version=3.2.57
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.8.3
|
||||
mod_version = 1.8.4-agatha
|
||||
maven_group = org.samo_lego
|
||||
archives_base_name = simpleauth
|
||||
|
||||
|
|
@ -27,5 +27,5 @@ bytes_version = 1.3.0
|
|||
|
||||
|
||||
# Carpet for debugging
|
||||
carpet_core_version = 1.4.40+v210608
|
||||
carpet_core_version = 1.4.56+v211130
|
||||
carpet_branch = master
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -17,67 +17,101 @@
|
|||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# 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"
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MSYS* | MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
|
@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
|
@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
|
|
@ -106,80 +140,95 @@ location of your Java installation."
|
|||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
# 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
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ pluginManagement {
|
|||
name = 'Fabric'
|
||||
url = 'https://maven.fabricmc.net/'
|
||||
}
|
||||
maven { url "https://maven.shedaniel.me/" }
|
||||
maven { url "https://maven.architectury.dev/" }
|
||||
maven { url "https://files.minecraftforge.net/maven/" }
|
||||
gradlePluginPortal()
|
||||
}
|
||||
|
|
@ -13,6 +13,6 @@ pluginManagement {
|
|||
|
||||
include("common")
|
||||
include("fabric")
|
||||
//include("forge")
|
||||
include("forge")
|
||||
|
||||
rootProject.name = "simpleauth"
|
||||
Loading…
Reference in New Issue