Skip to content

Commit

Permalink
Revert "Update to 1.18.1. Runs but Wither is broken."
Browse files Browse the repository at this point in the history
This reverts commit d3c5286.
  • Loading branch information
Insane96 committed Dec 12, 2021
1 parent 8f76137 commit 20078c0
Show file tree
Hide file tree
Showing 71 changed files with 1,247 additions and 1,311 deletions.
Binary file modified banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified banner.psd
Binary file not shown.
22 changes: 13 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
//maven { url = 'https://maven.parchmentmc.org' }
maven { url = 'https://maven.parchmentmc.org' }
jcenter()
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
//classpath 'org.parchmentmc:librarian:1.+'
classpath 'org.parchmentmc:librarian:1.+'
}
}
apply plugin: 'net.minecraftforge.gradle'
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
//apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.spongepowered.mixin'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
Expand All @@ -22,15 +23,15 @@ version = "${mod_version}-mc${mc_version}"
group = 'insane96mcp.progressivebosses' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'ProgressiveBosses'

java.toolchain.languageVersion = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.

minecraft {
// The mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD Snapshot are built nightly.
// stable_# Stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'official', version: '1.18.1'
mappings channel: 'parchment', version: '2021.10.17-1.16.5'
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
Expand Down Expand Up @@ -106,19 +107,22 @@ 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:1.18.1-39.0.0'
minecraft 'net.minecraftforge:forge:1.16.5-36.2.9'

// Mixin annotation processor - generates the refmap
//annotationProcessor 'org.spongepowered:mixin:0.8.3:processor'
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
// This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
if (System.getProperty('idea.sync.active') != 'true') {
// Mixin annotation processor - generates the refmap
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
}
// You may put jars on which you depend on in ./libs or you may define them like so..
implementation fg.deobf("blank:InsaneLib:${lib_version}-mc${mc_version}")
// compile "some.group:artifact:version"

//implementation fg.deobf("curse.maven:endergetic-291509:3154938")
//implementation fg.deobf("curse.maven:abnormals_core-382216:3147409")
implementation fg.deobf("curse.maven:endergetic-291509:3154938")
implementation fg.deobf("curse.maven:abnormals_core-382216:3147409")

// Real examples
// compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
mc_version=1.18.1
mc_version=1.16.5
mod_version=3.4.1
lib_version=1.4.1
lib_version=1.4.0
mixin_version=0.8.4
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
Loading

0 comments on commit 20078c0

Please sign in to comment.