Merge branch 'master' into 1.20.1

Wurst-Imperium · Sep 26, 2023 · 3b26aaa · 3b26aaa
2 parents 9380774 + 3334169
commit 3b26aaa
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 41 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: https://www.paypal.me/WurstImperium
+custom: https://www.wurstclient.net/donate/?utm_source=GitHub&utm_medium=WI+Zoom&utm_campaign=FUNDING.yml
diff --git a/README.md b/README.md
@@ -14,13 +14,12 @@ The zoom from the [Wurst Client](https://www.wurstclient.net/) as a standalone m
 
 (This assumes that you are using Windows with [Eclipse](https://www.eclipse.org/downloads/) and [Java Development Kit 17](https://adoptium.net/?variant=openjdk17&jvmVariant=hotspot) already installed.)
 
-1. Clone / download the repository.
+1. Clone or download the repository.
 
-2. Run these two commands in PowerShell:
+2. Run this command in PowerShell:
 
    ```powershell
-   ./gradlew.bat genSources
-   ./gradlew.bat eclipse
+   ./gradlew.bat genSources eclipse
    ```
 
 3. In Eclipse, go to `Import...` > `Existing Projects into Workspace` and select this project.
@@ -58,20 +57,18 @@ While zooming, you can use the <kbd>mouse wheel</kbd> to zoom in further.
 </details>
 
 ## Supported Languages
+- Azerbaijani (Azerbaijan) (since v1.5)
 - Chinese (Simplified/Mainland) (since v1.4)
 - Chinese (Traditional/Taiwan) (since v1.4)
 - Cantonese (Hong Kong) (since v1.4)
 - Classical Chinese (since v1.4)
+- Dutch (Netherlands) (since v1.5)
 - English (US)
 - Estonian (Estonia) (since v1.4)
 - French (France) (since v1.4)
 - German (Germany)
+- Kurdish (since v1.5)
+- Portuguese (Brazil) (since v1.5)
 - Russian (Russia) (since v1.3)
-
-## Will you add Forge support?
-
-Aside from the 1.12.2 Forge version that already exists, no. A modern Forge version is not being considered due to <a href="https://forums.minecraftforge.net/topic/58706-regarding-minecraft-112-and-policy-changes/" target="_blank" rel="noopener noreferrer">Forge's new CoreMod policy</a> (effective since 1.13) as well as issues with the <a href="https://web.archive.org/web/20201125032822/https://gist.github.com/jellysquid3/629eb84a74ab326046faf971150dc6c3" target="_blank" rel="noopener noreferrer">Forge community's treatment of modders</a>.
-
-However, the experimental&nbsp;<a href="https://patchworkmc.net/">Patchwork</a> project can sometimes make Forge mods and Fabric mods work together. Depending on which other mods you use, this might work with WI Zoom.
-
-Also, keep in mind that many former Forge mods now have Fabric versions (or have switched to Fabric entirely due to the above-mentioned issues).
+- Turkish (Turkey) (since v1.5)
+- Ukrainian (Ukraine) (since v1.5)
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,6 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
 
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
@@ -12,7 +13,7 @@ loader_version=0.14.22
 fabric_version=0.89.0+1.20.1
 
 # Mod Properties
-mod_version = 1.4-MC1.20.1
+mod_version = 1.5-MC1.20.1
 maven_group = net.wurstclient.zoom
 archives_base_name = WI-Zoom
 

diff --git a/src/main/java/net/wurstclient/zoom/WiZoom.java b/src/main/java/net/wurstclient/zoom/WiZoom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 - 2020 | Alexander01998 | All rights reserved.
+ * Copyright (c) 2019-2023 Wurst-Imperium and contributors.
  *
  * This source code is subject to the terms of the GNU General Public
  * License, version 3. If a copy of the GPL was not distributed with this

diff --git a/src/main/java/net/wurstclient/zoom/WiZoomInitializer.java b/src/main/java/net/wurstclient/zoom/WiZoomInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 - 2020 | Alexander01998 | All rights reserved.
+ * Copyright (c) 2019-2023 Wurst-Imperium and contributors.
  *
  * This source code is subject to the terms of the GNU General Public
  * License, version 3. If a copy of the GPL was not distributed with this

diff --git a/src/main/java/net/wurstclient/zoom/mixin/GameRendererMixin.java b/src/main/java/net/wurstclient/zoom/mixin/GameRendererMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 - 2020 | Alexander01998 | All rights reserved.
+ * Copyright (c) 2019-2023 Wurst-Imperium and contributors.
  *
  * This source code is subject to the terms of the GNU General Public
  * License, version 3. If a copy of the GPL was not distributed with this
@@ -14,15 +14,13 @@
 
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.resource.SynchronousResourceReloader;
 import net.wurstclient.zoom.WiZoom;
 
 @Mixin(GameRenderer.class)
-public abstract class GameRendererMixin
-	implements AutoCloseable, SynchronousResourceReloader
+public abstract class GameRendererMixin implements AutoCloseable
 {
 	@Inject(at = @At(value = "RETURN", ordinal = 1),
-		method = {"getFov(Lnet/minecraft/client/render/Camera;FZ)D"},
+		method = "getFov(Lnet/minecraft/client/render/Camera;FZ)D",
 		cancellable = true)
 	private void onGetFov(Camera camera, float tickDelta, boolean changingFov,
 		CallbackInfoReturnable<Double> cir)

diff --git a/src/main/java/net/wurstclient/zoom/mixin/MouseMixin.java b/src/main/java/net/wurstclient/zoom/mixin/MouseMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 - 2020 | Alexander01998 | All rights reserved.
+ * Copyright (c) 2019-2023 Wurst-Imperium and contributors.
  *
  * This source code is subject to the terms of the GNU General Public
  * License, version 3. If a copy of the GPL was not distributed with this
@@ -18,10 +18,10 @@
 @Mixin(Mouse.class)
 public class MouseMixin
 {
-	@Inject(at = {@At("RETURN")}, method = {"onMouseScroll(JDD)V"})
-	private void onOnMouseScroll(long long_1, double double_1, double double_2,
-		CallbackInfo ci)
+	@Inject(at = @At("RETURN"), method = "onMouseScroll(JDD)V")
+	private void onOnMouseScroll(long window, double horizontal,
+		double vertical, CallbackInfo ci)
 	{
-		WiZoom.INSTANCE.onMouseScroll(double_2);
+		WiZoom.INSTANCE.onMouseScroll(vertical);
 	}
 }
diff --git a/src/main/java/net/wurstclient/zoom/mixin/PlayerInventoryMixin.java b/src/main/java/net/wurstclient/zoom/mixin/PlayerInventoryMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 - 2020 | Alexander01998 | All rights reserved.
+ * Copyright (c) 2019-2023 Wurst-Imperium and contributors.
  *
  * This source code is subject to the terms of the GNU General Public
  * License, version 3. If a copy of the GPL was not distributed with this
@@ -18,9 +18,7 @@
 @Mixin(PlayerInventory.class)
 public class PlayerInventoryMixin
 {
-	@Inject(at = {@At("HEAD")},
-		method = {"scrollInHotbar(D)V"},
-		cancellable = true)
+	@Inject(at = @At("HEAD"), method = "scrollInHotbar(D)V", cancellable = true)
 	private void onScrollInHotbar(double scrollAmount, CallbackInfo ci)
 	{
 		if(WiZoom.INSTANCE.getZoomKey().isPressed())

diff --git a/src/main/resources/assets/wi_zoom/lang/az_az.json b/src/main/resources/assets/wi_zoom/lang/az_az.json
@@ -0,0 +1,3 @@
+{
+  "key.wi_zoom.zoom": "Yaxınlaşdırma"
+}
diff --git a/src/main/resources/assets/wi_zoom/lang/de_de.json b/src/main/resources/assets/wi_zoom/lang/de_de.json
@@ -0,0 +1,3 @@
+{
+  "key.wi_zoom.zoom": "Zoom"
+}
diff --git a/src/main/resources/assets/wi_zoom/lang/ku_ku.json b/src/main/resources/assets/wi_zoom/lang/ku_ku.json
@@ -0,0 +1,3 @@
+{
+  "key.wi_zoom.zoom": "Mezinkirin"
+}
diff --git a/src/main/resources/assets/wi_zoom/lang/nl_nl.json b/src/main/resources/assets/wi_zoom/lang/nl_nl.json
@@ -0,0 +1,3 @@
+{
+  "key.wi_zoom.zoom": "Inzoomen"
+}
diff --git a/src/main/resources/assets/wi_zoom/lang/pt_br.json b/src/main/resources/assets/wi_zoom/lang/pt_br.json
@@ -0,0 +1,3 @@
+{
+    "key.wi_zoom.zoom": "Ampliação"
+}
diff --git a/src/main/resources/assets/wi_zoom/lang/tr_tr.json b/src/main/resources/assets/wi_zoom/lang/tr_tr.json
@@ -0,0 +1,3 @@
+{
+  "key.wi_zoom.zoom": "Yakınlaştır"
+}
diff --git a/src/main/resources/assets/wi_zoom/lang/uk_ua.json b/src/main/resources/assets/wi_zoom/lang/uk_ua.json
@@ -0,0 +1,3 @@
+{
+  "key.wi_zoom.zoom": "Збільшити"
+}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -6,17 +6,10 @@
   "name": "WI Zoom",
   "description": "The zoom from the Wurst Client as a standalone mod.",
   "authors": [
-  	{
-      "name": "Alexander01998",
-      "contact": {
-        "homepage": "https://www.wurstimperium.net/",
-        "email": "contact.wurstimperium@gmail.com",
-        "twitter": "https://twitter.com/Wurst_Imperium"
-      }
-    }
+  	"Alexander01998"
   ],
   "contact": {
-    "homepage": "https://www.curseforge.com/minecraft/mc-mods/wi-zoom",
+    "homepage": "https://www.wimods.net/wi-zoom/?utm_source=WI+Zoom&utm_medium=ModMenu&utm_content=WI+Zoom+ModMenu+website+link",
     "sources": "https://github.com/Wurst-Imperium/WI-Zoom",
     "issues": "https://github.com/Wurst-Imperium/WI-Zoom/issues",
     "email": "contact.wurstimperium@gmail.com",
@@ -37,15 +30,24 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.18",
+    "fabricloader": ">=0.14.22",
     "fabric-api": ">=0.76.1",
     "minecraft": "~1.20-alpha.23.12.a",
     "java": ">=17"
   },
   "suggests": {
-    "flamingo": "*"
+    "cameranoclip": "*",
+    "chestesp": "*",
+    "mo_glass": "*"
   },
   "breaks": {
     "wurst": "*"
+  },
+  "custom": {
+    "modmenu": {
+      "links": {
+        "Donate": "https://www.wurstclient.net/donate/?utm_source=WI+Zoom&utm_medium=ModMenu&utm_content=WI+Zoom+ModMenu+donate+link"
+      }
+    }
   }
 }