Skip to content

Commit

Permalink
Merge pull request #244 from gottsch/1.16.5-develop
Browse files Browse the repository at this point in the history
1.16.5 develop
  • Loading branch information
gottsch authored Aug 30, 2021
2 parents ad7b1c1 + d0498a8 commit eac1430
Show file tree
Hide file tree
Showing 280 changed files with 9,972 additions and 5,547 deletions.
3 changes: 2 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry combineaccessrules="false" kind="src" path="/GottschCore"/>
<classpathentry combineaccessrules="false" kind="src" path="/forge-1.16.5-36.2.0"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/ModCommonLibs/libs/curios-forge-1.16.5-4.0.5.2.jar" sourcepath="/ModCommonLibs/libs/curios-forge-1.16.5-4.0.5.2.jar"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
17 changes: 16 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,29 @@ minecraft {
// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }

repositories {
// Put repositories for dependencies here
// ForgeGradle automatically adds the Forge maven and Maven Central for you

// If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
// flatDir {
// dir 'libs'
// }
maven {
url = "https://maven.theillusivec4.top/"
}
}

def gottschcore_path="../gottsch-minecraft-GottschCore/build/libs/GottschCore-mc${mc_version}-f${gottschcore_forge_version}-v${gottschcore_version}.jar"
println gottschcore_path
dependencies {
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
compile files('../../ModCommonLibs/libs/commons-cli-1.4.jar')
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.5-4.0.5.2")
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.5-4.0.5.2:api")
//compile files('../../ModCommonLibs/libs/commons-cli-1.4.jar')
compile files(gottschcore_path)
//shadow files(gottschcore_path)
}
Expand Down
45 changes: 23 additions & 22 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G

mod_name=Treasure2
package_group=someguyssoftware.treasure2
# use alpha, beta, or v (for version)
mod_version_type=v

mod_version=1.5.1

#versions
mc_version=1.16.5
forge_version=36.2.0
mappings_channel=official
mappings_version=1.16.5
gottschcore_version=1.3.0
gottschcore_forge_version=36.1.0

# paths
mods_folder=F:/Development/minecraft/mods
dest_folder=E:/Minecraft/mods/
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G

mod_name=Treasure2
package_group=someguyssoftware.treasure2
# use alpha, beta, or v (for version)
mod_version_type=v

mod_version=1.6.0


#versions
mc_version=1.16.5
forge_version=36.2.0
mappings_channel=official
mappings_version=1.16.5
gottschcore_version=1.3.0
gottschcore_forge_version=36.1.0

# paths
mods_folder=F:/Development/minecraft/mods
dest_folder=E:/Minecraft/mods/
Loading

0 comments on commit eac1430

Please sign in to comment.