v1.2.4 Update

CHANGELOG.md

@@ -1,8 +1,3 @@
-# v1.2.3 Update
+# v1.2.5 Update
 
-## Misc
-- Ported to 1.21.9+
-
-## Fixes
-- Fixed some issues with leashing mobs
-- Fixed *wrong* min/max sound pitch id options in custom animations, now you can use both `min_pitch` and `minPitch`. 
+- Fixed issue with second pat animation with enabled shaders

build.gradle

@@ -1,13 +1,13 @@
-import net.lopymine.mossy.MossyPlugin
+import net.lopymine.utils.MossyUtils
 
 plugins {
-	id("net.lopymine.mossy-plugin")
+	id "net.lopymine.mossy-plugin-core" version "$mossy_plugin_version"
 }
 
 mossyDependencies {
 	def mcVersion = stonecutter.current.version.toString()
 	minecraft = mcVersion
-	mappings = prop("build.yarn")
+	mappings = "mojang"
 	lombok = prop("base.lombok_version")
 	fabricApi = prop("build.fabric_api")
 	fabricLoader = prop("build.fabric_loader")
@@ -24,6 +24,7 @@ mossyDependencies {
 
 		override("modCompileOnly", "flashback")
 		override("modCompileOnly", "replaymod")
+		//override("modCompileOnly", "iris")
 
 		// Fabric Permissions Api
 		disable("fabric-permissions-api")
@@ -63,11 +64,16 @@ repositories {
 	}
 }
 
+loom.runConfigs.configureEach { config ->
+	if (config.getEnvironment() == "client") {
+		config.vmArg("-Dpatpat.debug=true")
+	}
+}
+
+
 dependencies {
 	def mcVersion = stonecutter.current.version.toString()
 
-	mappings loom.officialMojangMappings()
-
 	// Fabric permission api
 	def fpaVersion = prop("build.fabric-permissions-api")
 	include(modImplementation('me.lucko:fabric-permissions-api:' + fpaVersion)){
@@ -76,7 +82,7 @@ dependencies {
 
 	// Cloth Config
 	def clothConfigVersion = prop("dep.cloth-config")
-	modApi("me.shedaniel.cloth:cloth-config-fabric:${stonecutter.compare("1.19", mcVersion) == 1 ? clothConfigVersion : MossyPlugin.substringBefore(clothConfigVersion, "+")}") {
+	modApi("me.shedaniel.cloth:cloth-config-fabric:${stonecutter.compare("1.19", mcVersion) == 1 ? clothConfigVersion : MossyUtils.substringBefore(clothConfigVersion, "+")}") {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
 
@@ -103,6 +109,11 @@ dependencies {
 	if (proxlibVersion != "unknown") {
 		include(modApi("maven.modrinth:proxlib:${proxlibVersion}"))
 	}
+
+	// Requires Iris
+	modRuntimeOnly("org.antlr:antlr4-runtime:4.13.1")
+	modRuntimeOnly("io.github.douira:glsl-transformer:3.0.0-pre3")
+	modRuntimeOnly("org.anarres:jcpp:1.4.14")
 }
 
 // TODO: Добавить тесты на версию раньше, чем 1.18.2
@@ -112,6 +123,20 @@ if (stonecutter.compare(stonecutter.current.version.toString(), "1.18.2") >= 0)
 	}
 }
 
+test {
+	failOnNoDiscoveredTests = false
+}
+
+//fabricApi {
+//	configureTests {
+//		createSourceSet = true
+//		modId = "patpat-mod-test-${project.name}"
+//		enableGameTests = true // Default is true
+//		enableClientGameTests = true // Default is true
+//		eula = true // By setting this to true, you agree to the Minecraft EULA.
+//	}
+//}
+
 configurations.configureEach {
 	resolutionStrategy {
 		force("net.fabricmc:fabric-loader:${prop("build.fabric_loader")}")
@@ -121,9 +146,48 @@ configurations.configureEach {
 stonecutter {
 	var buildTime = (int) (System.currentTimeMillis() / 10000) - 174611089
 	var buildCodeTime = String.format("%07x", buildTime & 0xFFFFFFF)
-	swap("build_code_time", "\"${buildCodeTime}\";")
+	swaps["build_code_time"] = "\"${buildCodeTime}\";".toString()
+	dependencies["yacl"] = MossyUtils.substringBefore(prop("dep.yacl"), "+")
+
+//	replacements.regex(current.parsed.matches(">=1.21.11")) {
+//		replace(
+//				"(^|[^A-Za-z0-9_])ResourceLocation([^A-Za-z0-9_]|\$)", "\$1Identifier\$2",
+//				"(^|[^A-Za-z0-9_])Identifier([^A-Za-z0-9_]|\$)", "\$1ResourceLocation\$2"
+//		)
+//	}
+
+	replacements.string(current.parsed < "1.17") {
+		replace("ControllingOptionsScreenMixin", "ControllingOptionsScreenMixin")
+		replace("ControllingOptionsScreen", "ControlsSettingsGuiNew")
+	}
+
+	replacements.string(current.parsed >= "1.18") {
+		replace("KeyBindsScreenAccessor", "KeyBindsScreenAccessor")
+		replace("KeyBindsScreenMixin", "KeyBindsScreenMixin")
+		replace("NewKeyBindsScreen", "NewKeyBindsScreen")
+		replace("ControlsScreen", "KeyBindsScreen")
+	}
+
+	replacements.string(current.parsed >= "1.21") {
+		replace("import net.minecraft.client.gui.screens.controls.*;", "import net.minecraft.client.gui.screens.options.controls.*;")
+	}
+
+	replacements.string(current.parsed >= "1.21.9") {
+		replace("int keyCode, int scanCode, int modifiers", "net.minecraft.client.input.KeyEvent event")
+		replace("double mouseX, double mouseY, int button", "net.minecraft.client.input.MouseButtonEvent event, boolean bl")
+	}
+
+	replacements.string(current.parsed >= "1.21.11") {
+		replace("ProxPacketIdentifier", "ProxPacketIdentifier")
+		replace("ResourceLocation", "Identifier")
+		replace(".location()", ".identifier()")
+		replace("RenderType", "RenderTypes")
+	}
+
 }
 
+stonecutter.filters.exclude("**/*.accesswidener")
+
 
 jar {
 	duplicatesStrategy = DuplicatesStrategy.EXCLUDE