Merge pull request #84 from AnonymousHacker1279/1.19.3-dev

Update master branch with 1.19.3-dev changes

README.md

@@ -2,10 +2,10 @@
 
 # Immersive Weapons for Minecraft
 
-![CodeQL](https://github.com/AnonymousHacker1279/ImmersiveWeapons/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)
+[![Discord](https://img.shields.io/discord/871953129355214858?color=2a3445)](https://discord.gg/WNMCTg7TsT)
 
 ## A weapons mod for Minecraft
 
@@ -99,8 +99,9 @@ looking for was merged into a newer release.
 
 ## Translations
 
-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.
+Some translations other than English were generated automatically using
+my [Mr. Worldwide](https://github.com/AnonymousHacker1279/MrWorldwide) toolkit. They are probably not too accurate,
+and I don't have the time to fix them. I have not generated any other translations in a long time as the toolkit proved
+to be too unreliable.
 
-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 please go ahead and make a contribution. I appreciate it.

build.gradle

@@ -1,5 +1,4 @@
 plugins {
-	id 'eclipse'
 	id 'maven-publish'
 	id 'net.minecraftforge.gradle' version '5.+'
 	id 'org.parchmentmc.librarian.forgegradle' version '1.+'
@@ -11,8 +10,8 @@ repositories {
 		url "https://maven.anonymoushacker1279.tech/releases"
 	}
 	maven {
-		name "Progwml6 Maven"
-		url "https://dvs1.progwml6.com/files/maven/"
+		name "Jared's Maven"
+		url 'https://maven.blamejared.com'
 	}
 	maven {
 		name "ModMaven"
@@ -26,9 +25,6 @@ repositories {
 		name "Bai Maven"
 		url "https://maven.bai.lol"
 	}
-	maven {
-		url 'https://maven.blamejared.com'
-	}
 	maven {
 		url "https://cursemaven.com"
 		content {
@@ -122,14 +118,12 @@ dependencies {
 	implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${terrablender_version}")
 
 	// Include Immersive Weapons Compatibility Bridge (IWCB)
-	runtimeOnly fg.deobf("tech.anonymoushacker1279.iwcompatbridge:IWCompatBridge:${iwcb_version}")
+	// runtimeOnly fg.deobf("tech.anonymoushacker1279.iwcompatbridge:IWCompatBridge:${iwcb_version}")
 	// Include JEI
-	// runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:${jei_version}") //  TODO: Uncomment when ported to 1.19.3
+	runtimeOnly fg.deobf("mezz.jei:jei-1.19.3-forge:${jei_version}")
 	// Include WTHIT and badpackets
 	runtimeOnly fg.deobf("mcp.mobius.waila:wthit:forge-${wthit_version}")
 	implementation fg.deobf("lol.bai:badpackets:forge-${badpackets_version}")
-	// Include Patchouli
-	// runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}") //   TODO: Uncomment when ported to 1.19.3
 	// Include MmmMmmMmmMmm (Target Dummy)
 	// runtimeOnly fg.deobf("curse.maven:mmmmmmmmmmmm-225738:${target_dummy_version}") //   TODO: Uncomment when ported to 1.19.3
 }
@@ -173,7 +167,10 @@ publishing {
 		repositories {
 			maven {
 				name "AnonymousHacker1279"
-				url "https://maven.anonymoushacker1279.tech/releases"
+
+				def baseMavenUrl = "https://maven.anonymoushacker1279.tech/"
+				url version.contains("SNAPSHOT") ? baseMavenUrl + "snapshots" : baseMavenUrl + "releases"
+
 				credentials(PasswordCredentials)
 				authentication {
 					basic(BasicAuthentication)
@@ -185,4 +182,5 @@ publishing {
 
 tasks.withType(JavaCompile).configureEach {
 	options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+	options.fork = true // Use a separate JVM process for Java compilation
 }

gradle.properties

@@ -2,15 +2,14 @@ org.gradle.jvmargs=-Xmx6G
 org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=true
-version=1.19.3-1.19.1
+version=1.19.3-1.20.0
 group=tech.anonymoushacker1279.immersiveweapons
 mappings_channel=parchment
-mappings_version=2022.12.18-1.19.3
-forge_version=1.19.3-44.1.0
+mappings_version=2023.02.26-1.19.3
+forge_version=1.19.3-44.1.21
 terrablender_version=1.19.3-2.1.0.139
-iwcb_version=1.19-1.1.2
-jei_version=11.4.0.288
-wthit_version=6.1.1
+iwcb_version=1.19.3-1.2.0
+jei_version=12.2.0.16
+wthit_version=6.1.4
 badpackets_version=0.3.4
-patchouli_version=1.19.2-77
 target_dummy_version=4132216

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/generated/resources/assets/immersiveweapons/blockstates/rusted_iron_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "immersiveweapons:block/rusted_iron_block"
+    }
+  }
+}