diff options
26 files changed, 36 insertions, 743 deletions
diff --git a/.editorconfig b/.editorconfig index ebbc2b6320..6dd440507f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,5 +15,5 @@ trim_trailing_whitespace = true [*.{bat,ini}] end_of_line = crlf -[*.{dtd,json,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}] +[*.{dtd,json,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml,info}] indent_size = 2 diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index db39c4eff7..1cd4e47f0b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -25,4 +25,5 @@ dff9a4e6c3e688dd66dd44ce546d1d1e01f5c77a # TecTech spotlessApply reformat f32d404a051f6ad9d181792d6b489ed6e4a8f80f a242a3324c398a709ce83325160ffe593bfe2a81 - +# KekzTech spotlessApply reformat +ec910ff188fe0600182e00f3c279c37998ebaf4b diff --git a/kekztech/screenshots/SOFC_Display.jpeg b/archive/kekz-screenshots/SOFC_Display.jpeg Binary files differindex 975f13e086..975f13e086 100644 --- a/kekztech/screenshots/SOFC_Display.jpeg +++ b/archive/kekz-screenshots/SOFC_Display.jpeg diff --git a/kekztech/screenshots/TFFT_Display.jpeg b/archive/kekz-screenshots/TFFT_Display.jpeg Binary files differindex eeae2d2cf6..eeae2d2cf6 100644 --- a/kekztech/screenshots/TFFT_Display.jpeg +++ b/archive/kekz-screenshots/TFFT_Display.jpeg diff --git a/kekztech/LICENSE b/archive/original-kekztech-license-notice.txt index 8b23445f4a..8b23445f4a 100644 --- a/kekztech/LICENSE +++ b/archive/original-kekztech-license-notice.txt diff --git a/dependencies.gradle b/dependencies.gradle index 5a8d180d5a..11a5ce583c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -43,6 +43,7 @@ dependencies { api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-402-GTNH:dev") api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.0-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') + api('com.github.GTNewHorizons:ThaumicTinkerer:2.9.4:dev') implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.2.0:dev') { transitive = false } implementation("com.github.GTNewHorizons:Avaritia:1.49:dev") diff --git a/kekztech/.editorconfig b/kekztech/.editorconfig deleted file mode 100644 index 6effbc91a8..0000000000 --- a/kekztech/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -# This is the universal Text Editor Configuration -# for all GTNewHorizons projects -# See: https://editorconfig.org/ - -root = true - -[*] -charset = utf-8 -end_of_line = lf -indent_size = 4 -indent_style = space -insert_final_newline = true -trim_trailing_whitespace = true - -[*.{bat,ini}] -end_of_line = crlf - -[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}] -indent_size = 2 diff --git a/kekztech/.git-blame-ignore-revs b/kekztech/.git-blame-ignore-revs deleted file mode 100644 index 29ba4a0898..0000000000 --- a/kekztech/.git-blame-ignore-revs +++ /dev/null @@ -1,2 +0,0 @@ -# Ignore spotlessApply reformat -ec910ff188fe0600182e00f3c279c37998ebaf4b diff --git a/kekztech/.gitattributes b/kekztech/.gitattributes deleted file mode 100644 index fd2792b6cb..0000000000 --- a/kekztech/.gitattributes +++ /dev/null @@ -1,44 +0,0 @@ -* text eol=lf - -*.[jJ][aA][rR] binary - -*.[pP][nN][gG] binary -*.[jJ][pP][gG] binary -*.[jJ][pP][eE][gG] binary -*.[gG][iI][fF] binary -*.[tT][iI][fF] binary -*.[tT][iI][fF][fF] binary -*.[iI][cC][oO] binary -*.[sS][vV][gG] text -*.[eE][pP][sS] binary -*.[xX][cC][fF] binary - -*.[kK][aA][rR] binary -*.[mM]4[aA] binary -*.[mM][iI][dD] binary -*.[mM][iI][dD][iI] binary -*.[mM][pP]3 binary -*.[oO][gG][gG] binary -*.[rR][aA] binary - -*.7[zZ] binary -*.[gG][zZ] binary -*.[tT][aA][rR] binary -*.[tT][gG][zZ] binary -*.[zZ][iI][pP] binary - -*.[tT][cC][nN] binary -*.[sS][oO] binary -*.[dD][lL][lL] binary -*.[dD][yY][lL][iI][bB] binary -*.[pP][sS][dD] binary -*.[tT][tT][fF] binary -*.[oO][tT][fF] binary - -*.[pP][aA][tT][cC][hH] -text - -*.[bB][aA][tT] text eol=crlf -*.[cC][mM][dD] text eol=crlf -*.[pP][sS]1 text eol=crlf - -*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary diff --git a/kekztech/.github/workflows/build-and-test.yml b/kekztech/.github/workflows/build-and-test.yml deleted file mode 100644 index 3ee2f686fd..0000000000 --- a/kekztech/.github/workflows/build-and-test.yml +++ /dev/null @@ -1,13 +0,0 @@ - -name: Build and test - -on: - pull_request: - branches: [ master, main ] - push: - branches: [ master, main ] - -jobs: - build-and-test: - uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master - secrets: inherit diff --git a/kekztech/.github/workflows/release-tags.yml b/kekztech/.github/workflows/release-tags.yml deleted file mode 100644 index e4c0be6b0d..0000000000 --- a/kekztech/.github/workflows/release-tags.yml +++ /dev/null @@ -1,14 +0,0 @@ - -name: Release tagged build - -on: - push: - tags: [ '*' ] - -permissions: - contents: write - -jobs: - release-tags: - uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master - secrets: inherit diff --git a/kekztech/.gitignore b/kekztech/.gitignore deleted file mode 100644 index 5e80e0ae57..0000000000 --- a/kekztech/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -.gradle -.settings -/.idea/ -/.vscode/ -/run/ -/build/ -/eclipse/ -.classpath -.project -/bin/ -/config/ -/crash-reports/ -/logs/ -options.txt -/saves/ -usernamecache.json -banned-ips.json -banned-players.json -eula.txt -ops.json -server.properties -servers.dat -usercache.json -whitelist.json -/out/ -*.iml -*.ipr -*.iws -src/main/resources/mixins.*([!.]).json -*.bat -*.DS_Store -!gradlew.bat -.factorypath -addon.local.gradle -addon.local.gradle.kts -addon.late.local.gradle -addon.late.local.gradle.kts -layout.json diff --git a/kekztech/CODEOWNERS b/kekztech/CODEOWNERS deleted file mode 100644 index a6b5f68cd0..0000000000 --- a/kekztech/CODEOWNERS +++ /dev/null @@ -1,3 +0,0 @@ -# Any Github changes require admin approval -/.github/** @GTNewHorizons/admin - diff --git a/kekztech/README.md b/kekztech/README.md deleted file mode 100644 index d800cb789c..0000000000 --- a/kekztech/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# KekzTech -A Minecraft mod for the 1.7.10 modpack GTNH. -No compatibility outside GTNH guaranteed. - -My mod adds Solid Oxide Fuel Cells to turn gas fuels into electricity and steam, a multi tank that can store up to 25 different fluids in one structure, and a nuclear reactor in the future. - -Solid Oxide Fuel Cell MK1 and MK2: - - -Multi Tank: - diff --git a/kekztech/build.gradle b/kekztech/build.gradle deleted file mode 100644 index e57a16f9f1..0000000000 --- a/kekztech/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -//version: 1707058017 - -plugins { - id 'com.gtnewhorizons.gtnhconvention' -} diff --git a/kekztech/dependencies.gradle b/kekztech/dependencies.gradle deleted file mode 100644 index b5563b3f23..0000000000 --- a/kekztech/dependencies.gradle +++ /dev/null @@ -1,7 +0,0 @@ -// Add your dependencies here - -dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.09:dev') - api('com.github.GTNewHorizons:bartworks:0.10.0:dev') - api('com.github.GTNewHorizons:ThaumicTinkerer:2.9.4:dev') -} diff --git a/kekztech/gradle.properties b/kekztech/gradle.properties index 60a7397d1c..1aedbf93d3 100644 --- a/kekztech/gradle.properties +++ b/kekztech/gradle.properties @@ -1,192 +1,2 @@ -# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable. -# LOCAL to test local config updates. -gtnh.settings.blowdryerTag = 0.2.2 -# Human-readable mod name, available for mcmod.info population. -modName = KekzTech - -# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation. -# Conventionally lowercase. -modId = kekztech - -# Root package of the mod, used to find various classes in other properties, -# mcmod.info substitution, enabling assertions in run tasks, etc. -modGroup = kekztech - -# Whether to use modGroup as the maven publishing group. -# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods. -useModGroupForPublishing = false - -# Updates your build.gradle and settings.gradle automatically whenever an update is available. -autoUpdateBuildScript = false - -# Version of Minecraft to target -minecraftVersion = 1.7.10 - -# Version of Minecraft Forge to target -forgeVersion = 10.13.4.1614 - -# Specify an MCP channel for dependency deobfuscation and the deobfParams task. -channel = stable - -# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task. -mappingsVersion = 12 - -# Defines other MCP mappings for dependency deobfuscation. -remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ - -# Select a default username for testing your mod. You can always override this per-run by running -# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. -developmentEnvironmentUserName = Developer - -# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. -# See https://github.com/bsideup/jabel for details on how this works. -enableModernJavaSyntax = false - -# Enables injecting missing generics into the decompiled source code for a better coding experience. -# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types. -enableGenericInjection = false - -# Generate a class with a String field for the mod version named as defined below. -# If generateGradleTokenClass is empty or not missing, no such class will be generated. -# If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = - -# Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION - -# [DEPRECATED] Mod ID replacement token. -gradleTokenModId = - -# [DEPRECATED] Mod name replacement token. -gradleTokenModName = - -# [DEPRECATED] Mod Group replacement token. -gradleTokenGroupName = - -# [DEPRECATED] -# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java -# public static final String VERSION = "GRADLETOKEN_VERSION"; -# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's -# version in @Mod([...], version = VERSION, [...]). -# Leave these properties empty to skip individual token replacements. replaceGradleTokenInFile = KekzCore.java - -# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can -# leave this property empty. -# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api -apiPackage = - -# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/ -# There can be multiple files in a space-separated list. -# Example value: mymodid_at.cfg nei_at.cfg -accessTransformersFile = - -# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! -usesMixins = false - -# Adds some debug arguments like verbose output and class export. -usesMixinDebug = false - -# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. -mixinPlugin = - -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! -mixinsPackage = - -# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! -# This parameter is for legacy compatibility only -# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin -coreModClass = - -# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class -# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! -containsMixinsAndOrCoreModOnly = false - -# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. -forceEnableMixins = false - -# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your -# responsibility to check the license and request permission for distribution if required. -usesShadowedDependencies = false - -# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access -# their own classes, making the minimization unreliable. -minimizeShadowedDependencies = true - -# If disabled, won't rename the shadowed classes. -relocateShadowedDependencies = true - -# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. -includeWellKnownRepositories = true - -# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. -# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. -# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. -usesMavenPublishing = true - -# Maven repository to publish the mod to. -# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/ - -# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token. -# -# The project's ID on Modrinth. Can be either the slug or the ID. -# Leave this empty if you don't want to publish to Modrinth. -modrinthProjectId = - -# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth. -# Syntax: scope1-type1:name1;scope2-type2:name2;... -# Where scope can be one of [required, optional, incompatible, embedded], -# type can be one of [project, version], -# and the name is the Modrinth project or version slug/id of the other mod. -# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true -modrinthRelations = - -# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. -# -# The project's numeric ID on CurseForge. You can find this in the About Project box. -# Leave this empty if you don't want to publish on CurseForge. -curseForgeProjectId = - -# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. -# Syntax: type1:name1;type2:name2;... -# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], -# and the name is the CurseForge project slug of the other mod. -# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft -# Note: UniMixins is automatically set as a required dependency if usesMixins = true. -curseForgeRelations = - -# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older -# projects. New projects should not use this parameter. -# customArchiveBaseName = - -# Optional parameter to have the build automatically fail if an illegal version is used. -# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. -# The check is ONLY performed if the version is a git tag. -# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+ -# versionPattern = - -# Uncomment to prevent the source code from being published. -# noPublishedSources = true - -# Uncomment this to disable Spotless checks. -# This should only be uncommented to keep it easier to sync with upstream/other forks. -# That is, if there is no other active fork/upstream, NEVER change this. -# disableSpotless = true - -# Uncomment this to disable Checkstyle checks (currently wildcard import check). -# disableCheckstyle = true - -# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle" -# (force use delegated build). -# This is meant to be set in $HOME/.gradle/gradle.properties. -# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build. -# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want! -# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you. -# ideaOverrideBuildType = idea - -# Whether IDEA should run spotless checks when pressing the Build button. -# This is meant to be set in $HOME/.gradle/gradle.properties. -# ideaCheckSpotlessOnBuild = true - diff --git a/kekztech/gradle/wrapper/gradle-wrapper.jar b/kekztech/gradle/wrapper/gradle-wrapper.jar Binary files differdeleted file mode 100644 index e6441136f3..0000000000 --- a/kekztech/gradle/wrapper/gradle-wrapper.jar +++ /dev/null diff --git a/kekztech/gradle/wrapper/gradle-wrapper.properties b/kekztech/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index b82aa23a4f..0000000000 --- a/kekztech/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/kekztech/gradlew b/kekztech/gradlew deleted file mode 100755 index 1aa94a4269..0000000000 --- a/kekztech/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# 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. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# 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/HEAD/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 -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 - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -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 ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -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 - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - 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 -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -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=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# 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. - -# 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 - - -# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# 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" "$@" diff --git a/kekztech/gradlew.bat b/kekztech/gradlew.bat deleted file mode 100644 index 25da30dbde..0000000000 --- a/kekztech/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/kekztech/jitpack.yml b/kekztech/jitpack.yml deleted file mode 100644 index 09bbb514fc..0000000000 --- a/kekztech/jitpack.yml +++ /dev/null @@ -1,2 +0,0 @@ -before_install: - - ./gradlew setupCIWorkspace
\ No newline at end of file diff --git a/kekztech/repositories.gradle b/kekztech/repositories.gradle deleted file mode 100644 index c227b16ec2..0000000000 --- a/kekztech/repositories.gradle +++ /dev/null @@ -1,4 +0,0 @@ -// Add any additional repositories for your dependencies here - -repositories { -} diff --git a/kekztech/settings.gradle b/kekztech/settings.gradle deleted file mode 100644 index 94c2daf35c..0000000000 --- a/kekztech/settings.gradle +++ /dev/null @@ -1,23 +0,0 @@ - -pluginManagement { - repositories { - maven { - // RetroFuturaGradle - name "GTNH Maven" - url "https://nexus.gtnewhorizons.com/repository/public/" - mavenContent { - includeGroup("com.gtnewhorizons") - includeGroupByRegex("com\\.gtnewhorizons\\..+") - } - } - gradlePluginPortal() - mavenCentral() - mavenLocal() - } -} - -plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22' -} - - diff --git a/kekztech/src/main/resources/mcmod.info b/kekztech/src/main/resources/mcmod.info deleted file mode 100644 index 4967006f06..0000000000 --- a/kekztech/src/main/resources/mcmod.info +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "modid": "${modId}", - "name": "${modName}", - "description": "", - "version": "${modVersion}", - "mcversion": "${minecraftVersion}", - "url": "", - "updateUrl": "", - "authorList": [""], - "credits": "", - "logoFile": "", - "screenshots": [], - "requiredMods": [ "IC2", "gregtech", "tectech", "Thaumcraft", "ThaumicTinkerer" ], - "dependencies": [ "IC2", "gregtech", "tectech", "Thaumcraft", "ThaumicTinkerer", "bartworks", "dreamcraft" ], - "useDependencyInformation": true - } -] diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9069018cba..a39fa4e83c 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -204,6 +204,38 @@ "logoFile": "TecTechIcon.png", "screenshots": [], "dependencies": [] + }, + { + "modid": "kekztech", + "name": "KekzTech", + "description": "", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", + "url": "", + "updateUrl": "", + "authorList": [ + "Shinkuri" + ], + "credits": "", + "logoFile": "", + "screenshots": [], + "requiredMods": [ + "IC2", + "gregtech", + "tectech", + "Thaumcraft", + "ThaumicTinkerer" + ], + "dependencies": [ + "IC2", + "gregtech", + "tectech", + "Thaumcraft", + "ThaumicTinkerer", + "bartworks", + "dreamcraft" + ], + "useDependencyInformation": true } ] } |
