fix(*): fixing missing mixin targets

c0nstexpr · Jun 17, 2024 · 451278a · 451278a
1 parent c5e3420
commit 451278a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/...ient/java/org/c0nstexpr/fishology/mixin/client/network/ClientPlayNetworkHandlerMixin.java b/...ient/java/org/c0nstexpr/fishology/mixin/client/network/ClientPlayNetworkHandlerMixin.java
@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
-public abstract class ClientPlayNetworkHandlerMixin {
+abstract class ClientPlayNetworkHandlerMixin {
     @Shadow private ClientWorld world;
 
     @Inject(method = "onScreenHandlerSlotUpdate", at = @At("TAIL"))

diff --git a/core/src/client/resources/fishology-core.client.mixins.json b/core/src/client/resources/fishology-core.client.mixins.json
@@ -1,6 +1,7 @@
 {
   "required": true,
   "package": "org.c0nstexpr.fishology.mixin",
+  "compatibilityLevel": "JAVA_21",
   "client": [
     "client.network.ClientPlayNetworkHandlerMixin",
     "entity.projecttile.FishingBobberEntityMixin",

diff --git a/gradle.properties b/gradle.properties
@@ -5,5 +5,4 @@ org.gradle.parallel=true
 modGroup=org.c0nstexpr
 modVersion=0.1.0
 modId=fishology
-modName=Fishology
-fabric.loom.multiProjectOptimisation=true
+modName=Fishology
diff --git a/interact/build.gradle.kts b/interact/build.gradle.kts
@@ -8,10 +8,8 @@ repositories {
     maven("https://maven.terraformersmc.com")
 }
 
-base { archivesName.set("fishology") }
-
 dependencies {
-    project(":core", "namedElements").let {
+    project(":core").let {
         api(it)
         include(it)
         clientImplementation(it.dependencyProject.srcClient.output)

diff --git a/interact/gradle.properties b/interact/gradle.properties
@@ -1,3 +1,3 @@
 # suppress inspection "UnusedProperty" for whole file
-modId=fishology-interact
-modName=Fishology Interact
+modId=fishology
+modName=Fishology
diff --git a/interact/src/client/kotlin/org/c0nstexpr/fishology/interact/ChatInteraction.kt b/interact/src/client/kotlin/org/c0nstexpr/fishology/interact/ChatInteraction.kt
@@ -28,7 +28,7 @@ abstract class ChatInteraction(val client: MinecraftClient, val defaultTranslate
 
     protected fun notify(txt: Text) =
         when (notifyLevel) {
-            NotifyLevel.HUD -> client.msg(defaultMsg.append(txt))
+            NotifyLevel.HUD -> client.msg(txt)
             NotifyLevel.Chat -> client.chat(fmt.format(txt.string), logger)
             NotifyLevel.None -> {}
         }

diff --git a/interact/src/main/resources/assets/fishology-interact/lang/en_us.json b/interact/src/main/resources/assets/fishology-interact/lang/en_us.json
@@ -5,5 +5,5 @@
   "fishology.left_brace": "(",
   "fishology.right_brace": ")",
   "fishology.comma": ",",
-  "fishology.discard_loots_notification": "Rod is selected, discard loots feature will not work"
+  "fishology.discard_loots_notification": "Rod is selected, discard loots feature will not work. If needed, please move the rod to secondary slot."
 }
diff --git a/interact/src/main/resources/assets/fishology-interact/lang/zh_cn.json b/interact/src/main/resources/assets/fishology-interact/lang/zh_cn.json
@@ -5,5 +5,5 @@
   "fishology.left_brace": "（",
   "fishology.right_brace": "）",
   "fishology.comma": "，",
-  "fishology.discard_loots_notification": "鱼竿处于选中状态，不会扔出被排除的战利品"
+  "fishology.discard_loots_notification": "鱼竿处于选中状态，不会扔出被排除的战利品。如有需要，请将鱼竿置于副手"
 }