Merge pull request #65 from AnonymousHacker1279/v1.14.0-update-indev

Moving from indev to regular 1.18.x-dev
AnonymousHacker1279 · Apr 15, 2022 · 57d0775 · 57d0775
2 parents 4caa698 + e77ddeb
commit 57d0775
Show file tree

Hide file tree

Showing 542 changed files with 17,956 additions and 10,830 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 ![Immersive Weapons Logo](logo.png)
 
-# Immersive Weapons for Minecraft 1.18.1/1.18/1.17.1/1.16.5/1.16.4/1.15.2
+# Immersive Weapons for Minecraft 1.18.2/1.18.1/1.18/1.17.1/1.16.5/1.16.4/1.15.2
 
 ![CodeQL](https://github.com/AnonymousHacker1279/ImmersiveWeapons-Mod/workflows/CodeQL/badge.svg)
 [![](http://cf.way2muchnoise.eu/full_494454_Downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/immersive-weapons)
 [![](http://cf.way2muchnoise.eu/versions/494454.svg)](https://www.curseforge.com/minecraft/mc-mods/immersive-weapons)
 [![CodeFactor](https://www.codefactor.io/repository/github/anonymoushacker1279/immersiveweapons/badge/master)](https://www.codefactor.io/repository/github/anonymoushacker1279/immersiveweapons/overview/master)
 
-## A weapons mod for Minecraft 1.18.1/1.18/1.17.1/1.16.5/1.16.4/1.15.2
+## A weapons mod for Minecraft
 
 Immersive Weapons is <s>a weapons mod</s> more than just a weapons mod aiming to spice up your combat skills.
 
@@ -40,37 +40,34 @@ A few other notes:
 Active development will be focused on the latest Minecraft version. You should upgrade to newer versions of Immersive
 Weapons for bug fixes and new features.
 
-When looking at the mod file, the version looks like this: "immersiveweapons-\<Minecraft version\>-\<Immersive Weapons
-version\>". For example, "immersiveweapons-1.17.1-1.6.0". The Minecraft version is simple: it only changes when the mod
-is updated to newer versions of Minecraft.
+When looking at the mod file, the version looks like
+this: `ImmersiveWeapons-<Minecraft version>-<Immersive Weapons version>`. For example, `ImmersiveWeapons-1.18.2-1.15.0`.
+The Minecraft version is simple: it only changes when the mod is updated to newer versions of Minecraft.
 
 The Immersive Weapons version is a bit more complex:  
-When the first number changes (**1**.6.0), it is a major change. For example, changing from a beta to a full release.
-This probably won't change.  
-When the second number changes (1.**6**.0), it is a minor change. For example, adding new features, improvements, etc.
+When the first number changes (**1**.15.0), it is a major change. For example, changing from an in-dev to a full
+release. This probably won't ever change.  
+When the second number changes (1.**15**.0), it is a minor change. For example, adding new features, improvements, etc.
 These are usually content releases or large rewrites.  
-When the third number changes (1.6.**0**), it is a bugfix/patch. These are small changes that correct behaviors or
+When the third number changes (1.15.**0**), it is a bugfix/patch. These are small changes that correct behaviors or
 otherwise add small functionalities.
 
 You should always update to the latest bugfix/patch version. Updating to the latest minor version is also recommended,
 but can be treated with a lower priority. Read the update changelogs associated with new releases for any important
 information about that release.
 
-This table lists the latest Immersive Weapons version for a Minecraft version. If anything is listed other than **Latest**,
-consider it to be at the End of Life. In some cases, an older version will receive bugfixes should the
+This table lists the latest Immersive Weapons version for a Minecraft version. If anything is listed other than
+**Latest**, consider it to be at the End of Life. In some cases, an older version will receive bugfixes should the
 community describe an interest in it (This excludes versions listed as **N/A - Build From Source**).
 
-| MC Version | Immersive Weapons Version Support | 
-| :-- | :-- | 
-| 1.18.1 | [(BETA) Latest](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases) |
-| 1.18 | [(BETA) 1.13.0-beta9](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.13.0-beta9) |
-| 1.17.1 | [1.12.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.12.1) |
-| 1.16.5 | [1.4.3](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.4.3) |
-| 1.16.4 | [1.1.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.1.1) |
-| 1.15.2 | [N/A - Build From Source](https://github.com/AnonymousHacker1279/ImmersiveWeapons/tree/1.15.2-dev) |
-
-***Note: 1.18.x releases are currently in a beta state due to major breaking changes in the Forge API and MC 1.18.
-Expect missing features and potential game-breaking bugs.***
+| MC Version | Immersive Weapons Latest Version                                                                             |
+|------------|--------------------------------------------------------------------------------------------------------------|
+| 1.18.2     | [(ALPHA) Latest](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases)                           |
+| 1.18.1     | [(ALPHA) 1.14.0-alpha1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.14.0-alpha1) |
+| 1.17.1     | [1.12.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.12.1)                       |
+| 1.16.5     | [1.4.3](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.4.3)                         |
+| 1.16.4     | [1.1.1](https://github.com/AnonymousHacker1279/ImmersiveWeapons/releases/tag/v1.1.1)                         |
+| 1.15.2     | [N/A - Build From Source](https://github.com/AnonymousHacker1279/ImmersiveWeapons/tree/1.15.2-dev)           |
 
 ## Contributing
 
@@ -104,4 +101,4 @@ Translations other than English are generated automatically using
 my [Mr. Worldwide](https://github.com/AnonymousHacker1279/MrWorldwide) toolkit. Chances are that it's not completely
 accurate and needs refinements. I do not have the time nor will to refine these.
 
-If you want to clean up the translations then go ahead and make a contribution. I appreciate it.
+If you want to clean up the translations then go ahead and make a contribution. I appreciate it.
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,8 @@ buildscript {
 	repositories {
 		maven { url = 'https://maven.minecraftforge.net' }
 		maven { url = 'https://maven.parchmentmc.org' }
+		maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
+		mavenCentral()
 	}
 	dependencies {
 		classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
@@ -26,20 +28,20 @@ repositories {
 		name "Bai Maven"
 		url "https://maven.bai.lol"
 	}
+	maven {
+		url 'https://maven.blamejared.com'
+	}
 }
 
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'maven-publish'
 
-version = '1.18.1-1.13.0-beta10'
-group = 'com.anonymoushacker1279.immersiveweapons'
-
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-	mappings channel: 'parchment', version: '2021.12.19-1.18.1'
+	mappings channel: mappings_channel, version: mappings_version
 
 	accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -51,6 +53,10 @@ minecraft {
 
 			property 'forge.logging.console.level', 'debug'
 
+			// For Patchouli to work in-dev
+			property 'mixin.env.remapRefMap', 'true'
+			property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
+
 			mods {
 				immersiveweapons {
 					source sourceSets.main
@@ -65,6 +71,10 @@ minecraft {
 
 			property 'forge.logging.console.level', 'debug'
 
+			// For Patchouli to work in-dev
+			property 'mixin.env.remapRefMap', 'true'
+			property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
+
 			mods {
 				immersiveweapons {
 					source sourceSets.main
@@ -79,6 +89,10 @@ minecraft {
 
 			property 'forge.logging.console.level', 'debug'
 
+			// For Patchouli to work in-dev
+			property 'mixin.env.remapRefMap', 'true'
+			property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
+
 			args '--mod', 'immersiveweapons', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
 
 			mods {
@@ -96,13 +110,48 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 dependencies {
 	implementation 'org.jetbrains:annotations:23.0.0'
 
-	minecraft 'net.minecraftforge:forge:1.18.1-39.0.55'
+	minecraft "net.minecraftforge:forge:${forge_version}"
 
 	// Include JEI
-	implementation fg.deobf("mezz.jei:jei-1.18.1:9.2.1.69")
+	implementation fg.deobf("mezz.jei:jei-${jei_version}")
 
 	// Include WTHIT
-	implementation fg.deobf("mcp.mobius.waila:wthit:forge-4.4.1")
+	compileOnly fg.deobf("mcp.mobius.waila:wthit-api:${wthit_version}")
+	runtimeOnly fg.deobf("mcp.mobius.waila:wthit:${wthit_version}")
+
+	// Include Patchouli
+	compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api")
+	runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
+
+	// Include TerraBlender
+	implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${terrablender_version}")
+}
+
+// This block of code expands all the gradle properties in the specified resource targets.
+// It copies them into the targets and expands all the defined properties.
+def resourceTargets = ['data/immersiveweapons/patchouli_books/encyclopedia/book.json',
+                       'data/immersiveweapons/patchouli_books/lorebook/book.json']
+def intoTargets = ["$rootDir/out/production/resources/", "$rootDir/out/production/${project.name}.main/", "$rootDir/bin/main/"]
+def replaceProperties = [build_version: version]
+processResources {
+	inputs.properties replaceProperties
+	replaceProperties.put 'project', project
+
+	filesMatching(resourceTargets) {
+		expand replaceProperties
+	}
+
+	intoTargets.each { target ->
+		if (file(target).exists()) {
+			copy {
+				from(sourceSets.main.resources) {
+					include resourceTargets
+					expand replaceProperties
+				}
+				into target
+			}
+		}
+	}
 }
 
 // Add properties to JAR manifest
@@ -133,4 +182,8 @@ publishing {
 			url "file:///${project.projectDir}/mcmodsrepo"
 		}
 	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,12 @@
-# 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=-Xmx6G
-org.gradle.daemon=true
+org.gradle.daemon=true
+org.gradle.caching=true
+version=1.18.2-1.15.0-alpha1
+group=com.anonymoushacker1279.immersiveweapons
+mappings_channel=parchment
+mappings_version=2022.03.13-1.18.2
+forge_version=1.18.2-40.0.52
+jei_version=1.18.2:9.5.5.174
+wthit_version=forge-4.8.1
+patchouli_version=1.18.2-66
+terrablender_version=1.18.2-1.1.0.99
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists