update (#13)

AntiCope · Nov 20, 2022 · 60823f7 · 60823f7
1 parent 3a7e492
commit 60823f7
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 29 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric (https://fabricmc.net/versions.html)
-minecraft_version=1.19
-yarn_mappings=1.19+build.1
-loader_version=0.14.7
+minecraft_version=1.19.2
+yarn_mappings=1.19.2+build.4
+loader_version=0.14.9
 
 # Mod Properties
 mod_version=0.1
-maven_group=dummy.package
+maven_group=anticope
 archives_base_name=e621-addon
 
-# Dependency Versions
+# Dependency Versions.
 
 # Meteor (https://maven.meteordev.org/)
-meteor_version=0.5.0-SNAPSHOT
+meteor_version=0.5.1-SNAPSHOT
diff --git a/src/main/java/anticope/esixtwoone/E621Hud.java b/src/main/java/anticope/esixtwoone/E621Hud.java
@@ -45,6 +45,5 @@ public String getCommit() {
             .getCustomValue("github:sha")
             .getAsString();
         return commit.isEmpty() ? null : commit.trim();
-
     }
 }
diff --git a/src/main/java/anticope/esixtwoone/ImageHUD.java b/src/main/java/anticope/esixtwoone/ImageHUD.java
@@ -1,5 +1,6 @@
 package anticope.esixtwoone;
 
+import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.renderer.Renderer2D;
 import meteordevelopment.meteorclient.renderer.GL;
@@ -20,7 +21,6 @@
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.util.Identifier;
 
-import anticope.esixtwoone.sources.ESixTwoOne;
 import anticope.esixtwoone.sources.Source;
 import anticope.esixtwoone.sources.Source.Size;
 import anticope.esixtwoone.sources.Source.SourceType;
@@ -34,7 +34,7 @@ public class ImageHUD extends HudElement {
     private boolean locked = false;
     private boolean empty = true;
     private int ticks = 0;
-    private Source source = new ESixTwoOne();
+    private Source source;
 
     private static final Identifier TEXID = new Identifier("e621", "tex");
 
@@ -46,6 +46,7 @@ public class ImageHUD extends HudElement {
         .defaultValue(100)
         .min(10)
         .sliderRange(70, 1000)
+        .onChanged(o -> updateSize())
         .build()
     );
 
@@ -55,40 +56,31 @@ public class ImageHUD extends HudElement {
         .defaultValue(100)
         .min(10)
         .sliderRange(70, 1000)
+        .onChanged(o -> updateSize())
         .build()
     );
 
     private final Setting<String> tags = sgGeneral.add(new StringSetting.Builder()
         .name("tags")
         .description("Tags")
         .defaultValue("femboy")
-        .onChanged((v) -> {
-            source.reset();
-            empty = true;
-        })
+        .onChanged((v) -> updateSource())
         .build()
     );
 
     private final Setting<Size> size = sgGeneral.add(new EnumSetting.Builder<Size>()
         .name("size")
         .description("Size mode.")
         .defaultValue(Size.preview)
-        .onChanged((v) -> {
-            source.reset();
-            empty = true;
-        })
+        .onChanged((v) -> updateSource())
         .build()
     );
 
     private final Setting<SourceType> sourceType = sgGeneral.add(new EnumSetting.Builder<SourceType>()
         .name("source")
         .description("Source Type.")
         .defaultValue(SourceType.e621)
-        .onChanged((v) -> {
-            source = Source.getSource(v);
-            source.reset();
-            empty = true;
-        })
+        .onChanged(v -> updateSource())
         .build()
     );
 
@@ -98,11 +90,20 @@ public class ImageHUD extends HudElement {
         .defaultValue(1200)
         .max(3000)
         .min(20)
+        .sliderRange(20, 3000)
         .build()
     );
 
     public ImageHUD() {
         super(INFO);
+        updateSource();
+        MeteorClient.EVENT_BUS.subscribe(this);
+    }
+
+    @Override
+    public void remove() {
+        super.remove();
+        MeteorClient.EVENT_BUS.unsubscribe(this);
     }
 
     private static ImageHUD create() {
@@ -111,7 +112,6 @@ private static ImageHUD create() {
 
     @EventHandler
     public void onTick(TickEvent.Post event) {
-        if (mc.world == null) return;
         ticks ++;
         if (ticks >= refreshRate.get()) {
             ticks = 0;
@@ -132,6 +132,16 @@ public void render(HudRenderer renderer) {
         Renderer2D.TEXTURE.render(null);
     }
 
+    private void updateSize() {
+        setSize(imgWidth.get(), imgHeight.get());
+    }
+
+    private void updateSource() {
+        source = Source.getSource(sourceType.get());
+        source.reset();
+        empty = true;
+    }
+
     private void loadImage() {
         if (locked || source == null)
             return;
@@ -152,6 +162,6 @@ private void loadImage() {
             }
             locked = false;
         }).start();
-        setSize(imgWidth.get(), imgHeight.get());
+        updateSize();
     }
 }
diff --git a/src/main/java/anticope/esixtwoone/sources/ESixTwoOne.java b/src/main/java/anticope/esixtwoone/sources/ESixTwoOne.java
@@ -30,5 +30,4 @@ public String randomImage(String filter, Size size) {
         }
         return null;
     }
-
 }
diff --git a/src/main/java/anticope/esixtwoone/sources/GelBooru.java b/src/main/java/anticope/esixtwoone/sources/GelBooru.java
@@ -25,13 +25,13 @@ public String randomImage(String filter, Size size) {
         JsonElement result = Http.get(query).sendJson(JsonElement.class);
         if (result == null) return null;
         if (result instanceof JsonArray array) {
-            if (array.get(random.nextInt(0, 11)) instanceof JsonObject post) {
+            if (array.get(random.nextInt(0, Math.min(11, array.size()))) instanceof JsonObject post) {
                 var url = post.get(size.toString()+"_url").getAsString();
                 return url;
             }
         } else if (result instanceof JsonObject object) {
             if (object.get("post") instanceof JsonArray array) {
-                if (array.get(random.nextInt(0, 11)) instanceof JsonObject post) {
+                if (array.get(random.nextInt(0, Math.min(11, array.size()))) instanceof JsonObject post) {
                     var url = post.get(size.toString()+"_url").getAsString();
                     return url;
                 }
@@ -40,5 +40,4 @@ public String randomImage(String filter, Size size) {
 
         return null;
     }
-
 }
diff --git a/src/main/java/anticope/esixtwoone/sources/Source.java b/src/main/java/anticope/esixtwoone/sources/Source.java
@@ -1,6 +1,7 @@
 package anticope.esixtwoone.sources;
 
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Random;
 
 import anticope.esixtwoone.E621Hud;
@@ -26,7 +27,7 @@ public enum SourceType {
 
     public String getRandomImage(String filter, Size size) {
         try {
-            return randomImage(URLEncoder.encode(filter, "UTF-8"), size);
+            return randomImage(URLEncoder.encode(filter, StandardCharsets.UTF_8), size);
         } catch (Exception ex) {
             E621Hud.LOG.error("Failed to fetch an image.", ex);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,4 @@ public String randomImage(String filter, Size size) { @@
             }
             return null;
         }
     }