diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..4ffbd9082 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,22 @@ +# 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 + +[*.lang] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes index dfe077042..fd2792b6c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,44 @@ -# Auto detect text files and perform LF normalization -* text=auto +* 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/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml new file mode 100644 index 000000000..3ee2f686f --- /dev/null +++ b/.github/workflows/build-and-test.yml @@ -0,0 +1,13 @@ + +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/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml new file mode 100644 index 000000000..e4c0be6b0 --- /dev/null +++ b/.github/workflows/release-tags.yml @@ -0,0 +1,14 @@ + +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/.gitignore b/.gitignore index f87f9c2a1..5e80e0ae5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,38 @@ -# Personal Directory and Files - .gradle -.idea -build -eclipse +.settings +/.idea/ +/.vscode/ +/run/ +/build/ +/eclipse/ .classpath .project -.settings -bin -.metadata -*.bak -classes +/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/build.gradle b/build.gradle index ae3246422..0495effa2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,214 +1,39 @@ -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "https://maven.minecraftforge.net/" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - maven { - name = "jitpack" - url = "https://jitpack.io" - } - maven { - name = "gt" - url = "https://gregtech.mechaenetia.com/" - } - } - dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.11' - } -} +//version: 1707058017 -task submodulesUpdate(type:Exec) { - description 'Updates (and inits) git submodules' - commandLine 'git', 'submodule', 'update', '--init', '--recursive' - group 'Build Setup' +plugins { + id 'com.gtnewhorizons.gtnhconvention' + id 'idea' } -configurations { - embed - compile.extendsFrom(embed) - shade - compile.extendsFrom(shade) -} - -apply plugin: 'forge' - version = "1.9-beta6" -group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" -minecraft { - version = "1.7.10-10.13.4.1614-1.7.10" - runDir = "eclipse" - - sourceSets { - api { - java { - srcDir 'src/api/java' - } - } - } -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html -} - -processResources - { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } - } - -jar { - from sourceSets.api.output - - manifest { - attributes( - 'FMLAT': "customnpcs_at.cfg", - ) - } -} - -//########################################################################################################## -//######################################## Mixin Part ################################################ -//########################################################################################################## -//Add -//--tweakClass org.spongepowered.asm.launch.MixinTweaker --mixin customnpcs.mixins.json -//to your client and server program arguments if working in a dev environment. def embedMixin = !project.hasProperty("nomixin"); -def yourMixinConfig = 'customnpcs.mixins.json' -def refMapForYourConfig = 'customnpcs.refmap.json' -def relativePathToMixinAP = 'tools/mixin-0.8-SNAPSHOT.jar' - if(!embedMixin){ version += "-nomixin" } -repositories { - maven { - name = "sponge" - url = "https://repo.spongepowered.org/maven/" - } +// API Task +tasks.create('updateAPI', Exec) { + description 'Updates (and Inits) git submodules' + commandLine 'git', 'submodule', 'update', '--init', '--recursive' + group 'CustomNPC+' } -dependencies { - if(embedMixin){ - embed('org.spongepowered:mixin:0.7.11-SNAPSHOT') { - // Mixin includes a lot of dependencies that are too up-to-date - exclude module: 'launchwrapper' - exclude module: 'guava' - exclude module: 'gson' - exclude module: 'commons-io' - exclude module: 'log4j-core' - } - } else { - implementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') { - // Mixin includes a lot of dependencies that are too up-to-date - exclude module: 'launchwrapper' - exclude module: 'guava' - exclude module: 'gson' - exclude module: 'commons-io' - exclude module: 'log4j-core' - } - } -} - -def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + refMapForYourConfig - -def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" - -jar { - configurations.shade.each { dep -> - from(project.zipTree(dep)){ - exclude 'META-INF', 'META-INF/**' - } - } - - from refMap - manifest { - attributes.put("TweakClass", "org.spongepowered.asm.launch.MixinTweaker") - attributes.put("FMLCorePluginContainsFMLMod", true) - attributes.put("ForceLoadAsMod", true) - attributes.put("MixinConfigs", yourMixinConfig) - } - - // embed libraries in jar - from configurations.embed.collect { - exclude '**/LICENSE.txt' - it.isDirectory() ? it : zipTree(it) - } -} - -reobf { - addExtraSrgFile mixinSrg -} - -afterEvaluate { - def fixedRelPathToAP = relativePathToMixinAP - if(fixedRelPathToAP.startsWith('./') || fixedRelPathToAP.startsWith('.\\')){ - fixedRelPathToAP = fixedRelPathToAP.substring(2) - } else if(fixedRelPathToAP.startsWith('/') || fixedRelPathToAP.startsWith('\\')){ - fixedRelPathToAP = fixedRelPathToAP.substring(1) - } - - tasks.compileJava { - println "Path: " + projectDir.absolutePath - options.compilerArgs += [ - // There's a bug in the AnnotationProcessor for 0.7.11 that will generate the annotations pointing to the parent class instead of subclass - // resulting in the mixin not being applied. This is fixed in 0.8, however 0.8 needs guava > 21.0, and minecraft ships with 17.0. - // So as a hacky workaround... ship with 0.7.11, but use the AP from 0.8 for compiling - "-processorpath", projectDir.absolutePath + '/' + fixedRelPathToAP, - "-processor", "org.spongepowered.tools.obfuscation.MixinObfuscationProcessorInjection,org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets", - "-Xlint:-sunapi", "-XDenableSunApiLintControl", "-XDignore.symbol.file", - "-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinSrg}", "-AoutRefMapFile=${refMap}" - ] - } -} - -task deobfJar(type: Jar) { - classifier = 'dev' - from sourceSets.main.output +// No Mixin Build Task +tasks.create('buildNoMixin', Exec) { + description 'Builds mod without embed' + group 'CustomNPC+' + commandLine 'build', '-Pnomixin' } sourceSets { - main { - ext.refMap = refMapForYourConfig + named("main").configure { + java { + srcDirs += ['src/api/java'] + } } } -// Enable Temporarily if Assets not loading -sourceSets {main { output.resourcesDir = output.classesDir }} \ No newline at end of file + diff --git a/build.gradleOLD b/build.gradleOLD new file mode 100644 index 000000000..ae3246422 --- /dev/null +++ b/build.gradleOLD @@ -0,0 +1,214 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "https://maven.minecraftforge.net/" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + maven { + name = "jitpack" + url = "https://jitpack.io" + } + maven { + name = "gt" + url = "https://gregtech.mechaenetia.com/" + } + } + dependencies { + classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.11' + } +} + +task submodulesUpdate(type:Exec) { + description 'Updates (and inits) git submodules' + commandLine 'git', 'submodule', 'update', '--init', '--recursive' + group 'Build Setup' +} + +configurations { + embed + compile.extendsFrom(embed) + shade + compile.extendsFrom(shade) +} + +apply plugin: 'forge' + +version = "1.9-beta6" +group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "CustomNPC-Plus" + +minecraft { + version = "1.7.10-10.13.4.1614-1.7.10" + runDir = "eclipse" + + sourceSets { + api { + java { + srcDir 'src/api/java' + } + } + } +} + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +dependencies { + // you may put jars on which you depend on in ./libs + // or you may define them like so.. + //compile "some.group:artifact:version:classifier" + //compile "some.group:artifact:version" + + // real examples + //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // for more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +processResources + { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } + +jar { + from sourceSets.api.output + + manifest { + attributes( + 'FMLAT': "customnpcs_at.cfg", + ) + } +} + +//########################################################################################################## +//######################################## Mixin Part ################################################ +//########################################################################################################## +//Add +//--tweakClass org.spongepowered.asm.launch.MixinTweaker --mixin customnpcs.mixins.json +//to your client and server program arguments if working in a dev environment. +def embedMixin = !project.hasProperty("nomixin"); +def yourMixinConfig = 'customnpcs.mixins.json' +def refMapForYourConfig = 'customnpcs.refmap.json' +def relativePathToMixinAP = 'tools/mixin-0.8-SNAPSHOT.jar' + +if(!embedMixin){ + version += "-nomixin" +} + +repositories { + maven { + name = "sponge" + url = "https://repo.spongepowered.org/maven/" + } +} + +dependencies { + if(embedMixin){ + embed('org.spongepowered:mixin:0.7.11-SNAPSHOT') { + // Mixin includes a lot of dependencies that are too up-to-date + exclude module: 'launchwrapper' + exclude module: 'guava' + exclude module: 'gson' + exclude module: 'commons-io' + exclude module: 'log4j-core' + } + } else { + implementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') { + // Mixin includes a lot of dependencies that are too up-to-date + exclude module: 'launchwrapper' + exclude module: 'guava' + exclude module: 'gson' + exclude module: 'commons-io' + exclude module: 'log4j-core' + } + } +} + +def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + refMapForYourConfig + +def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" + +jar { + configurations.shade.each { dep -> + from(project.zipTree(dep)){ + exclude 'META-INF', 'META-INF/**' + } + } + + from refMap + manifest { + attributes.put("TweakClass", "org.spongepowered.asm.launch.MixinTweaker") + attributes.put("FMLCorePluginContainsFMLMod", true) + attributes.put("ForceLoadAsMod", true) + attributes.put("MixinConfigs", yourMixinConfig) + } + + // embed libraries in jar + from configurations.embed.collect { + exclude '**/LICENSE.txt' + it.isDirectory() ? it : zipTree(it) + } +} + +reobf { + addExtraSrgFile mixinSrg +} + +afterEvaluate { + def fixedRelPathToAP = relativePathToMixinAP + if(fixedRelPathToAP.startsWith('./') || fixedRelPathToAP.startsWith('.\\')){ + fixedRelPathToAP = fixedRelPathToAP.substring(2) + } else if(fixedRelPathToAP.startsWith('/') || fixedRelPathToAP.startsWith('\\')){ + fixedRelPathToAP = fixedRelPathToAP.substring(1) + } + + tasks.compileJava { + println "Path: " + projectDir.absolutePath + options.compilerArgs += [ + // There's a bug in the AnnotationProcessor for 0.7.11 that will generate the annotations pointing to the parent class instead of subclass + // resulting in the mixin not being applied. This is fixed in 0.8, however 0.8 needs guava > 21.0, and minecraft ships with 17.0. + // So as a hacky workaround... ship with 0.7.11, but use the AP from 0.8 for compiling + "-processorpath", projectDir.absolutePath + '/' + fixedRelPathToAP, + "-processor", "org.spongepowered.tools.obfuscation.MixinObfuscationProcessorInjection,org.spongepowered.tools.obfuscation.MixinObfuscationProcessorTargets", + "-Xlint:-sunapi", "-XDenableSunApiLintControl", "-XDignore.symbol.file", + "-AreobfSrgFile=${tasks.reobf.srg}", "-AoutSrgFile=${mixinSrg}", "-AoutRefMapFile=${refMap}" + ] + } +} + +task deobfJar(type: Jar) { + classifier = 'dev' + from sourceSets.main.output +} + +sourceSets { + main { + ext.refMap = refMapForYourConfig + } +} + +// Enable Temporarily if Assets not loading +sourceSets {main { output.resourcesDir = output.classesDir }} \ No newline at end of file diff --git a/debug.log b/debug.log deleted file mode 100644 index 06b228e58..000000000 --- a/debug.log +++ /dev/null @@ -1,14 +0,0 @@ -[0514/203945.010:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0514/203945.039:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0514/203945.047:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0514/205447.662:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0514/205458.151:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0514/205458.162:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0514/205458.186:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/004913.901:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/004914.692:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/004914.711:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/004914.724:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/011427.812:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/011427.829:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. -[0515/011427.838:WARNING:dns_config_service_win.cc(668)] Failed to read DnsConfig. diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 000000000..a7c959872 --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,52 @@ +/* + * Add your dependencies here. Supported configurations: + * - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod + * Available at runtime and compiletime for mods depending on this mod + * - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API + * Available at runtime but not compiletime for mods depending on this mod + * - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods + * Not available at all for mods depending on this mod, only visible at compiletime for this mod + * - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod + * Available at compiletime but not runtime for mods depending on this mod + * - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency + * Not available at all for mods depending on this mod, only visible at runtime for this mod + * - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime, + * but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing + * - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime + * Available at runtime for mods depending on this mod + * - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry + * - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main + * + * - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name + * Requires you to enable usesShadowedDependencies in gradle.properties + * + * - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient) + * + * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed, + * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful. + * + * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven, + * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file. + * + * Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not. + * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published. + * + * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph + */ +def embedMixin = !project.hasProperty("nomixin"); +dependencies { + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev") + runtimeOnlyNonPublishable("curse.maven:Nashorn-374413:2924946") + + if(embedMixin){ + // Normal Jar will include built in Mixins + shadowImplementation("org.spongepowered:mixin:0.7.11-SNAPSHOT"){ + // Mixin includes a lot of dependencies that are too up-to-date + exclude module: 'launchwrapper' + exclude module: 'guava' + exclude module: 'gson' + exclude module: 'commons-io' + exclude module: 'log4j-core' + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..9114ad711 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,142 @@ +# Human-readable mod name, available for mcmod.info population. +modName = CustomNPC+ + +# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation. +# Conventionally lowercase. +modId = customnpcs + +# Root package of the mod, used to find various classes in other properties, +# mcmod.info substitution, enabling assertions in run tasks, etc. +modGroup = noppes.npcs +modVersion = 1.9 + +gtnh.modules.codeStyle=true +gtnh.modules.gitVersion=false + +# 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 +forgeVersion = 10.13.4.1614 + +# Specify an MCP channel for dependency deobfuscation and the deobfParams task. +channel = stable +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 = Kam + +# 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, Map 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 = VERSION + +# [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 = + +# 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 = customnpcs_at.cfg + +# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! +usesMixins = true +# Adds some debug arguments like verbose output and class export. +usesMixinDebug = true +mixinPlugin = mixin.CustomNPCsMixinPlugin +mixinsPackage = mixin +containsMixinsAndOrCoreModOnly = false +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 = true +# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access +# their own classes, making the minimization unreliable. +minimizeShadowedDependencies = false +# If disabled, won't rename the shadowed classes. +relocateShadowedDependencies = false + +# Adds the GTNH maven, CurseMaven, IC2/Player maven, 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 = false + +# 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 = +modrinthRelations = +curseForgeProjectId = +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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b76121670..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6d7cad24..a80b22ce5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip \ No newline at end of file diff --git a/gradlew b/gradlew index 91a7e269e..1aa94a426 100644 --- a/gradlew +++ b/gradlew @@ -1,79 +1,127 @@ -#!/usr/bin/env bash +#!/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 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/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/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# 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" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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 -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - 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" + 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 @@ -82,83 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - 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. + 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" = "false" -a "$darwin" = "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, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # 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=$((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*) + # 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 -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# 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. -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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/gradlew.bat b/gradlew.bat index 8a0b282aa..25da30dbd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 @@ -8,26 +24,30 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +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%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -35,54 +55,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :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 %CMD_LINE_ARGS% +"%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%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/repositories.gradle b/repositories.gradle new file mode 100644 index 000000000..12ce0d893 --- /dev/null +++ b/repositories.gradle @@ -0,0 +1,8 @@ +// Add any additional repositories for your dependencies here. + +repositories { + maven { + name = "sponge" + url = "https://repo.spongepowered.org/maven/" + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..69d2d74ce --- /dev/null +++ b/settings.gradle @@ -0,0 +1,21 @@ + +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.14' +} diff --git a/src/api b/src/api index a55f9b010..665a5daab 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit a55f9b0109e4437dc41b0d8ebcd1fe473ec0b927 +Subproject commit 665a5daaba63eab3ff3e20941cb42bfc02a48939 diff --git a/src/main/java/foxz/command/CmdNpc.java b/src/main/java/foxz/command/CmdNpc.java index e9ee236aa..cca2fa243 100644 --- a/src/main/java/foxz/command/CmdNpc.java +++ b/src/main/java/foxz/command/CmdNpc.java @@ -2,10 +2,8 @@ package foxz.command; import java.util.List; -import scala.actors.threadpool.Arrays; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.command.PlayerSelector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; @@ -33,10 +31,10 @@ public class CmdNpc extends ChMcLogger { CmdNpc(Object ctorParm) { super (ctorParm); } - + public EntityNPCInterface selectedNpc; - - + + @SubCommand( desc="Set Home (respawn place)", usage="" @@ -45,16 +43,16 @@ public class CmdNpc extends ChMcLogger { double posX = pcParam.getPlayerCoordinates().posX; double posY = pcParam.getPlayerCoordinates().posY; double posZ = pcParam.getPlayerCoordinates().posZ; - + if(args.length == 3){ posX = CommandBase.func_110666_a(pcParam, selectedNpc.posX, args[0]); posY = CommandBase.func_110665_a(pcParam, selectedNpc.posY, args[1].trim(), 0, 0); posZ = CommandBase.func_110666_a(pcParam, selectedNpc.posZ, args[2]); } - + selectedNpc.ai.startPos = new int[]{MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)}; } - + @SubCommand( desc="Set npc visibility", usage="" @@ -64,7 +62,7 @@ public class CmdNpc extends ChMcLogger { return; boolean bo = args[0].equalsIgnoreCase("true"); boolean semi = args[0].equalsIgnoreCase("semi"); - + int current = selectedNpc.display.visible; if(semi) selectedNpc.display.visible = 2; @@ -72,12 +70,12 @@ public class CmdNpc extends ChMcLogger { selectedNpc.display.visible = 0; else selectedNpc.display.visible = 1; - + if(current != selectedNpc.display.visible) selectedNpc.updateClient = true; - + } - + @SubCommand( desc="Delete an NPC", usage="" @@ -85,7 +83,7 @@ public class CmdNpc extends ChMcLogger { public void delete(String[] args){ selectedNpc.delete(); } - + @SubCommand( desc="Owner", usage="" @@ -95,10 +93,10 @@ public class CmdNpc extends ChMcLogger { EntityPlayer player = null; if(selectedNpc.roleInterface instanceof RoleFollower) player = ((RoleFollower)selectedNpc.roleInterface).owner; - + if(selectedNpc.roleInterface instanceof RoleCompanion) player = ((RoleCompanion)selectedNpc.roleInterface).owner; - + if(player == null) sendmessage("No owner"); else @@ -108,13 +106,13 @@ public class CmdNpc extends ChMcLogger { EntityPlayerMP player = CommandBase.getPlayer(pcParam, args[0]); if(selectedNpc.roleInterface instanceof RoleFollower) ((RoleFollower)selectedNpc.roleInterface).setOwner(player); - + if(selectedNpc.roleInterface instanceof RoleCompanion) ((RoleCompanion)selectedNpc.roleInterface).setOwner(player); } } - + @SubCommand( desc="Set npc name", usage="" @@ -122,18 +120,18 @@ public class CmdNpc extends ChMcLogger { public void name(String[] args){ if(args.length < 1) return; - + String name = args[0]; for(int i = 1; i < args.length; i++){ name += " " + args[i]; } - + if(!selectedNpc.display.name.equals(name)){ selectedNpc.display.name = name; selectedNpc.updateClient = true; } } - + @SubCommand( desc = "Creates an NPC", usage = "[name]", @@ -151,7 +149,7 @@ public class CmdNpc extends ChMcLogger { npc.setHealth(npc.getMaxHealth()); NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc); } - + @Override public List addTabCompletion(ICommandSender par1, String[] args) { if(args.length == 2){ @@ -160,7 +158,7 @@ public class CmdNpc extends ChMcLogger { if(args.length == 3 && args[1].equalsIgnoreCase("owner")){ return CommandBase.getListOfStringsMatchingLastWord(args, MinecraftServer.getServer().getAllUsernames()); } - + return super.addTabCompletion(par1, args); } } diff --git a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java index 1f3193de3..8d8a510b2 100644 --- a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java @@ -117,7 +117,6 @@ public class ImageDownloadAlt extends SimpleTexture { this.imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet()) { - private static final String __OBFID = "CL_00001050"; public void run() { HttpURLConnection connection = null; diff --git a/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java b/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java index 71f7c234f..7ca893a4e 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiMerchantAdd.java @@ -35,8 +35,6 @@ public class GuiMerchantAdd extends GuiContainer private MerchantButton previousRecipeButtonIndex; private int currentRecipeIndex; private String field_94082_v; - - public GuiMerchantAdd() { super(new ContainerMerchantAdd(Minecraft.getMinecraft().thePlayer, ServerEventsHandler.Merchant, Minecraft.getMinecraft().theWorld)); @@ -50,7 +48,7 @@ public class GuiMerchantAdd extends GuiContainer public void initGui() { super.initGui(); - + int i = (this.width - this.xSize) / 2; int j = (this.height - this.ySize) / 2; this.buttonList.add(this.nextRecipeButtonIndex = new MerchantButton(1, i + 120 + 27, j + 24 - 1, true)); @@ -104,7 +102,7 @@ public class GuiMerchantAdd extends GuiContainer --this.currentRecipeIndex; flag = true; } - + if(par1GuiButton.id == 4){ MerchantRecipeList merchantrecipelist = this.theIMerchant.getRecipes(mc.thePlayer); if(currentRecipeIndex < merchantrecipelist.size()){ @@ -114,7 +112,7 @@ public class GuiMerchantAdd extends GuiContainer Client.sendData(EnumPacketServer.MerchantUpdate, ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist); } } - + if(par1GuiButton.id == 5){ ItemStack item1 = this.inventorySlots.getSlot(0).getStack(); ItemStack item2 = this.inventorySlots.getSlot(1).getStack(); @@ -123,7 +121,7 @@ public class GuiMerchantAdd extends GuiContainer item1 = item2; item2 = null; } - + if(item1 != null && sold != null){ item1 = item1.copy(); sold = sold.copy(); @@ -136,7 +134,7 @@ public class GuiMerchantAdd extends GuiContainer merchantrecipelist.add(recipe); Client.sendData(EnumPacketServer.MerchantUpdate, ServerEventsHandler.Merchant.getEntityId(), merchantrecipelist); } - + } if (flag) @@ -266,7 +264,6 @@ public class GuiMerchantAdd extends GuiContainer static class MerchantButton extends GuiButton { private final boolean field_146157_o; - private static final String __OBFID = "CL_00000763"; public MerchantButton(int par1, int par2, int par3, boolean par4) { diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index c1d7ad867..42de415d7 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -23,7 +23,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene private DataDisplay display; public GuiNpcTextField nameText; - + public GuiNpcDisplay(EntityNPCInterface npc) { super(npc,1); display = npc.display; @@ -205,7 +205,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene mc.renderGlobal.onEntityDestroy(npc); mc.renderGlobal.onEntityCreate(npc); Client.sendData(EnumPacketServer.MainmenuDisplaySave, display.writeToNBT(new NBTTagCompound())); - + } @Override diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiBook.java b/src/main/java/noppes/npcs/client/gui/player/GuiBook.java index 9ec122271..512a973c3 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiBook.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiBook.java @@ -57,9 +57,9 @@ public class GuiBook extends GuiScreen private GuiButton buttonSign; private GuiButton buttonFinalize; private GuiButton buttonCancel; - + private int x, y, z; - + public GuiBook(EntityPlayer par1EntityPlayer, ItemStack item, int x, int y, int z){ this.x = x; this.y = y; @@ -177,9 +177,9 @@ public class GuiBook extends GuiScreen this.bookObj.setTagInfo("title", new NBTTagString(this.bookTitle.trim())); this.bookObj.func_150996_a(Items.written_book); } - + NoppesUtilPlayer.sendData(EnumPlayerPacket.SaveBook, x, y, z, sign, bookObj.writeToNBT(new NBTTagCompound())); - + } } } @@ -426,7 +426,6 @@ public class GuiBook extends GuiScreen static class NextPageButton extends GuiButton { private final boolean field_146151_o; - private static final String __OBFID = "CL_00000745"; public NextPageButton(int par1, int par2, int par3, boolean par4) { @@ -461,4 +460,4 @@ public class GuiBook extends GuiScreen } } } -} \ No newline at end of file +} diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java b/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java index a8617ec1e..67b50575a 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiButtonNextPage.java @@ -6,7 +6,6 @@ import org.lwjgl.opengl.GL11; public class GuiButtonNextPage extends GuiNpcButton{ private final boolean field_146151_o; - private static final String __OBFID = "CL_00000745"; private static final ResourceLocation field_110405_a = new ResourceLocation("textures/gui/book.png"); public GuiButtonNextPage(int par1, int par2, int par3, boolean par4) diff --git a/src/main/java/noppes/npcs/containers/ContainerMail.java b/src/main/java/noppes/npcs/containers/ContainerMail.java index 33cd80f32..27696f5a2 100644 --- a/src/main/java/noppes/npcs/containers/ContainerMail.java +++ b/src/main/java/noppes/npcs/containers/ContainerMail.java @@ -10,11 +10,10 @@ import noppes.npcs.controllers.data.PlayerMailData; import java.util.Iterator; public class ContainerMail extends ContainerNpcInterface{ - private static final String __OBFID = "CL_00001742"; public static PlayerMail staticmail = new PlayerMail(); public PlayerMail mail = new PlayerMail(); private boolean canEdit, canSend; - + public ContainerMail(EntityPlayer player, boolean canEdit, boolean canSend){ super(player); @@ -29,7 +28,7 @@ public class ContainerMail extends ContainerNpcInterface{ { this.addSlotToContainer(new SlotValid(mail, k , 179 + k * 24, 138, canEdit)); } - + for (int j = 0; j < 3; ++j) { diff --git a/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java b/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java index 04ffff3b3..955febfde 100644 --- a/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java +++ b/src/main/java/noppes/npcs/mixin/MixinRenderPlayer.java @@ -4,9 +4,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.client.renderer.entity.RendererLivingEntity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.constants.EnumAnimationPart; diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/BlackMoon.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/BlackMoon.png new file mode 100644 index 000000000..f304a8e13 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/BlackMoon.png differ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/Crescent.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/Crescent.png new file mode 100644 index 000000000..0f6b9762e Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/Crescent.png differ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/DarkCrescent.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/DarkCrescent.png new file mode 100644 index 000000000..d62d4b5cc Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/DarkCrescent.png differ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/Eclipse.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/Eclipse.png new file mode 100644 index 000000000..2a2b9cf67 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/Eclipse.png differ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/FullMoon.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/FullMoon.png new file mode 100644 index 000000000..813f105a7 Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/FullMoon.png differ diff --git a/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/HalfMoon.png b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/HalfMoon.png new file mode 100644 index 000000000..e0db8708f Binary files /dev/null and b/src/main/resources/assets/customnpcs/textures/cloak/Guilds/Eclipse/HalfMoon.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index aea5605b0..48740ce42 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,19 +1,24 @@ -[ { - "modid": "customnpcs", - "name": "CustomNPC+", - "version": "1.7.10", - "mcversion": "1.7.10", - "description": "CustomNPC+ is a continuation of the Custom NPCs Mod which allows you to create NPCs with various different functionalities", - "credits": "Noppes (CNPC), DarkSignal (AI), Foxz (Commands) and tons more see original forums post and new CustomNPC+ Github", - "logoFile": "assets/customnpcs/textures/gui/logo.png", - "url": "https://tinyurl.com/customnpc-plus", - "updateUrl": "", - "authorList": [ - "KAMKEEL (CNPC+)", - "Louis XII (CNPC+ Scripting)"], - "parent":"", - "screenshots": [], - "dependencies": [] -} -] \ No newline at end of file + "modListVersion": 2, + "modList": [{ + "modid": "${modId}", + "name": "${modName}", + "description": "CustomNPC+ is a continuation of the Custom NPCs Mod which allows you to create NPCs with various different functionalities", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", + "url": "https://tinyurl.com/customnpc-plus", + "updateUrl": "", + "authorList": [ + "KAMKEEL (CNPC+)", + "Louis XII (CNPC+ Scripting)" + ], + "credits": "Noppes (CNPC), DarkSignal (AI), Foxz (Commands), PopsicleNate (Textures), Goodbird (CustomModel)", + "logoFile": "assets/customnpcs/textures/gui/logo.png", + "screenshots": [], + "parent": "", + "requiredMods": [], + "dependencies": [], + "dependants": [], + "useDependencyInformation": false + }] +} \ No newline at end of file diff --git a/src/main/resources/customnpcs.mixins.json b/src/main/resources/mixins.customnpcs.json similarity index 57% rename from src/main/resources/customnpcs.mixins.json rename to src/main/resources/mixins.customnpcs.json index 878e42ba7..9d065ba13 100644 --- a/src/main/resources/customnpcs.mixins.json +++ b/src/main/resources/mixins.customnpcs.json @@ -3,7 +3,10 @@ "minVersion": "0.7.11", "package": "noppes.npcs.mixin", "plugin": "noppes.npcs.mixin.CustomNPCsMixinPlugin", - "refmap": "customnpcs.refmap.json", + "refmap": "mixins.customnpcs.refmap.json", "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8" + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [], + "server": [] }