Merge pull request #12 from chrrs/next

2.0.0
chrrs · Jan 31, 2024 · d0c8617 · d0c8617
2 parents c8b1702 + 464485e
commit d0c8617
Show file tree

Hide file tree

Showing 194 changed files with 1,500 additions and 934 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,4 @@ bin/
 *.jar
 .vscode
 *.ps1
-*.lnk
-*.py
+*.lnk
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Algid
+Copyright (c) 2022 chrrs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -21,20 +21,3 @@ For setup instructions please see the [fabric wiki page](https://fabricmc.net/wi
 ## Usage
 
 Simply type the emote into chat using the format you would in a Twitch chat E.G. `HACKERMANS` and `modCheck`.
-
-## Adding emotes
-
-To add emotes, you'll probably first want to setup the mod to load emotes from your local environment.
-The easiest way to do this is to change the emote repository URL in the `pegs-emotes.json` config file to a file url,
-for example `file:///D:\Dev\Java\PegsEmotes\content\`. It should point to the `content` directory in this repository.
-
-After this, add new lines to the `content/emotes.json` file to add new emotes. Most emotes are stored in either the
-`static` or `animated` subdirectories in the `content` folder.
-
-Adding animated emotes is a bit different:
-
-1. Use [this site](https://sheeptester.github.io/words-go-here/misc/animated-painting-maker.html) to convert a gif into
-   an image with all the frames.
-2. Get the frame time from [this site](https://ezgif.com/maker) by multiplying the delay by 10
-   (e.g. peepoLeave: delay = 2, frame_time = 20)
-3. Add an entry to `emotes.json` pointing to the above image and including the calculated frame time.
diff --git a/add_bttv_emote.py b/add_bttv_emote.py
@@ -0,0 +1,40 @@
+import datetime
+import hashlib
+import json
+import requests
+import sys
+
+file = "content/v2/emotes.json"
+
+emotes = {}
+with open(file) as f:
+    emotes = json.load(f)
+
+if "emotes" not in emotes:
+    emotes["emotes"] = []
+
+for id in sys.argv[1:]:
+    res = requests.get(f"https://api.betterttv.net/3/emotes/{id}").json()
+
+    if "message" in res:
+        print(f"could not add {id}: " + res["message"])
+        continue
+
+    url = f"https://cdn.betterttv.net/emote/{res['id']}/2x.{res['imageType']}"
+    image_res = requests.get(url)
+    sha1 = hashlib.sha1(image_res.content).digest().hex()
+
+    emotes["emotes"].append({
+        "name": res["code"],
+        "format": res["imageType"],
+        "url": url,
+        "sha1": sha1,
+    })
+
+    print(f"added {res['code']} ({id}, {res['imageType']})")
+
+emotes["emotes"].sort(key=lambda emote: emote["name"].lower())
+
+with open(file, "w") as f:
+    emotes["lastUpdated"] = datetime.datetime.now().isoformat()
+    json.dump(emotes, f, indent=4)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,6 +18,8 @@ dependencies {
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
     modImplementation("com.terraformersmc:modmenu:${property("mod_menu_version")}")
+
+    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.2.2")!!)!!)
 }
 
 tasks {
@@ -37,3 +39,7 @@ java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
+
+loom {
+    accessWidenerPath.set(file("src/main/resources/pegsemotes.accesswidener"))
+}
diff --git a/content/animated/AINTNOWAY.png b/content/animated/AINTNOWAY.png
diff --git a/content/animated/AYOOO.png b/content/animated/AYOOO.png
diff --git a/content/animated/Aware.png b/content/animated/Aware.png
diff --git a/content/animated/Awkward.png b/content/animated/Awkward.png
diff --git a/content/animated/BONK.png b/content/animated/BONK.png
diff --git a/content/animated/BlanketJam.png b/content/animated/BlanketJam.png
diff --git a/content/animated/BoneZone.png b/content/animated/BoneZone.png
diff --git a/content/animated/COPIUM.png b/content/animated/COPIUM.png
diff --git a/content/animated/Chatting.png b/content/animated/Chatting.png
diff --git a/content/animated/Clap.png b/content/animated/Clap.png
diff --git a/content/animated/CuteDog.png b/content/animated/CuteDog.png
diff --git a/content/animated/DinkDonk.png b/content/animated/DinkDonk.png
diff --git a/content/animated/DonoWall.png b/content/animated/DonoWall.png
diff --git a/content/animated/Drake.png b/content/animated/Drake.png
diff --git a/content/animated/Ermm.png b/content/animated/Ermm.png
diff --git a/content/animated/FLUSHED.png b/content/animated/FLUSHED.png
diff --git a/content/animated/FeelsLagMan.png b/content/animated/FeelsLagMan.png
diff --git a/content/animated/FeelsWeakMan.png b/content/animated/FeelsWeakMan.png
diff --git a/content/animated/GIGACHAD.png b/content/animated/GIGACHAD.png
diff --git a/content/animated/GuitarTime.png b/content/animated/GuitarTime.png
diff --git a/content/animated/HACKERMANS.png b/content/animated/HACKERMANS.png
diff --git a/content/animated/HYPERCLAP.png b/content/animated/HYPERCLAP.png
diff --git a/content/animated/HYPERS.png b/content/animated/HYPERS.png
diff --git a/content/animated/HYPERpeepoSitti.png b/content/animated/HYPERpeepoSitti.png
diff --git a/content/animated/Haiii.png b/content/animated/Haiii.png
diff --git a/content/animated/Happi.png b/content/animated/Happi.png
diff --git a/content/animated/LETSGO.png b/content/animated/LETSGO.png
diff --git a/content/animated/MEGALUL.png b/content/animated/MEGALUL.png
diff --git a/content/animated/MEOW.png b/content/animated/MEOW.png
diff --git a/content/animated/MmmHmm.png b/content/animated/MmmHmm.png
diff --git a/content/animated/NODDERS.png b/content/animated/NODDERS.png
diff --git a/content/animated/NOOO.png b/content/animated/NOOO.png
diff --git a/content/animated/NOPERS.png b/content/animated/NOPERS.png
diff --git a/content/animated/NOTED.png b/content/animated/NOTED.png
diff --git a/content/animated/PeepoGiggles.png b/content/animated/PeepoGiggles.png
diff --git a/content/animated/PeepoYeet.png b/content/animated/PeepoYeet.png
diff --git a/content/animated/PepeLaugh.png b/content/animated/PepeLaugh.png
diff --git a/content/animated/RAGEY.png b/content/animated/RAGEY.png
diff --git a/content/animated/RIPBOZO.png b/content/animated/RIPBOZO.png
diff --git a/content/animated/SMHing.png b/content/animated/SMHing.png
diff --git a/content/animated/SNIFFA.png b/content/animated/SNIFFA.png
diff --git a/content/animated/SourPls.png b/content/animated/SourPls.png
diff --git a/content/animated/TeaTime.png b/content/animated/TeaTime.png
diff --git a/content/animated/ThisIsFine.png b/content/animated/ThisIsFine.png
diff --git a/content/animated/TriSad.png b/content/animated/TriSad.png
diff --git a/content/animated/VIBE.png b/content/animated/VIBE.png
diff --git a/content/animated/WAYTOODANK.png b/content/animated/WAYTOODANK.png
diff --git a/content/animated/YEOP.png b/content/animated/YEOP.png
diff --git a/content/animated/YIPPEE.png b/content/animated/YIPPEE.png
diff --git a/content/animated/YesYes.png b/content/animated/YesYes.png
diff --git a/content/animated/catJAM.png b/content/animated/catJAM.png
diff --git a/content/animated/catJAMJAM.png b/content/animated/catJAMJAM.png
diff --git a/content/animated/catKISS.png b/content/animated/catKISS.png
diff --git a/content/animated/catNOM.png b/content/animated/catNOM.png
diff --git a/content/animated/catPUNCH.png b/content/animated/catPUNCH.png
diff --git a/content/animated/flutedCrawl.png b/content/animated/flutedCrawl.png
diff --git a/content/animated/hypeE.png b/content/animated/hypeE.png
diff --git a/content/animated/modCheck.png b/content/animated/modCheck.png
diff --git a/content/animated/monkaGIGAftRobertDowneyJr.png b/content/animated/monkaGIGAftRobertDowneyJr.png
diff --git a/content/animated/nikoPls.png b/content/animated/nikoPls.png
diff --git a/content/animated/nikoQuake.png b/content/animated/nikoQuake.png
diff --git a/content/animated/peepoArrive.png b/content/animated/peepoArrive.png
diff --git a/content/animated/peepoBye.png b/content/animated/peepoBye.png
diff --git a/content/animated/peepoComfy.png b/content/animated/peepoComfy.png
diff --git a/content/animated/peepoHey.png b/content/animated/peepoHey.png
diff --git a/content/animated/peepoRiot.png b/content/animated/peepoRiot.png
diff --git a/content/animated/peepoRun.png b/content/animated/peepoRun.png
diff --git a/content/animated/peepoShy.png b/content/animated/peepoShy.png
diff --git a/content/animated/peepoTalk.png b/content/animated/peepoTalk.png
diff --git a/content/animated/peepoTrip.png b/content/animated/peepoTrip.png
diff --git a/content/animated/peepoWow.png b/content/animated/peepoWow.png
diff --git a/content/animated/peepoleave.png b/content/animated/peepoleave.png
diff --git a/content/animated/pepeBASS.png b/content/animated/pepeBASS.png
diff --git a/content/animated/pepeMeltdown.png b/content/animated/pepeMeltdown.png
diff --git a/content/animated/pepeSadJam.png b/content/animated/pepeSadJam.png
diff --git a/content/animated/plinK.png b/content/animated/plinK.png
diff --git a/content/animated/plonK.png b/content/animated/plonK.png
diff --git a/content/animated/ppOverheat.png b/content/animated/ppOverheat.png
diff --git a/content/animated/ppPoof.png b/content/animated/ppPoof.png
diff --git a/content/animated/ranbooLMAOO.png b/content/animated/ranbooLMAOO.png
diff --git a/content/animated/trevorHug.png b/content/animated/trevorHug.png
diff --git a/content/animated/tubboSpin.png b/content/animated/tubboSpin.png
diff --git a/content/animated/wilburPls.png b/content/animated/wilburPls.png
diff --git a/content/animated/wormPls.png b/content/animated/wormPls.png
diff --git a/content/emotes.json b/content/emotes.json
diff --git a/content/static/5Head.png b/content/static/5Head.png
diff --git a/content/static/Bedge.png b/content/static/Bedge.png
diff --git a/content/static/CatPat.png b/content/static/CatPat.png
diff --git a/content/static/Clueless.png b/content/static/Clueless.png
diff --git a/content/static/DColon.png b/content/static/DColon.png
diff --git a/content/static/Danki.png b/content/static/Danki.png
diff --git a/content/static/EZ.png b/content/static/EZ.png
diff --git a/content/static/FeelsDankMan.png b/content/static/FeelsDankMan.png
diff --git a/content/static/FeelsOkayMan.png b/content/static/FeelsOkayMan.png
diff --git a/content/static/Gayge.png b/content/static/Gayge.png
diff --git a/content/static/HOLD.png b/content/static/HOLD.png
diff --git a/content/static/HUHH.png b/content/static/HUHH.png
diff --git a/content/static/HYPERS.png b/content/static/HYPERS.png
diff --git a/content/static/Hmm.png b/content/static/Hmm.png
diff --git a/content/static/KEKW.png b/content/static/KEKW.png
diff --git a/content/static/KKona.png b/content/static/KKona.png
diff --git a/content/static/Kapp.png b/content/static/Kapp.png
diff --git a/content/static/LETHIMCOOK.png b/content/static/LETHIMCOOK.png
diff --git a/content/static/Madge.png b/content/static/Madge.png
diff --git a/content/static/NotLikeThis.png b/content/static/NotLikeThis.png
diff --git a/content/static/OMEGALUL.png b/content/static/OMEGALUL.png
diff --git a/content/static/OMEGALUL_Admir.png b/content/static/OMEGALUL_Admir.png
diff --git a/content/static/Okayge.png b/content/static/Okayge.png
diff --git a/content/static/PAUSERS.png b/content/static/PAUSERS.png
diff --git a/content/static/PHIDDIES.png b/content/static/PHIDDIES.png
diff --git a/content/static/POGGIES.png b/content/static/POGGIES.png
diff --git a/content/static/PauseChamp.png b/content/static/PauseChamp.png
diff --git a/content/static/Peepi.png b/content/static/Peepi.png
diff --git a/content/static/PeepoFlowerGUN.png b/content/static/PeepoFlowerGUN.png
diff --git a/content/static/PepeHands.png b/content/static/PepeHands.png
diff --git a/content/static/PogU.png b/content/static/PogU.png
diff --git a/content/static/Prayge.png b/content/static/Prayge.png
diff --git a/content/static/Sadge.png b/content/static/Sadge.png
diff --git a/content/static/SealTheDeal.png b/content/static/SealTheDeal.png
diff --git a/content/static/Shruge.png b/content/static/Shruge.png
diff --git a/content/static/Stare.png b/content/static/Stare.png
diff --git a/content/static/Susge.png b/content/static/Susge.png
diff --git a/content/static/TrollDespair.png b/content/static/TrollDespair.png
diff --git a/content/static/TrollDespairPoba.png b/content/static/TrollDespairPoba.png
diff --git a/content/static/TrollFace.png b/content/static/TrollFace.png
diff --git a/content/static/WHOLETHIMCOOK.png b/content/static/WHOLETHIMCOOK.png
diff --git a/content/static/WICKED.png b/content/static/WICKED.png
diff --git a/content/static/Wokege.png b/content/static/Wokege.png
diff --git a/content/static/YEP.png b/content/static/YEP.png
diff --git a/content/static/catLurk.png b/content/static/catLurk.png
diff --git a/content/static/chrrzSit.png b/content/static/chrrzSit.png
diff --git a/content/static/miccThicc.png b/content/static/miccThicc.png
diff --git a/content/static/mivvArson.png b/content/static/mivvArson.png
diff --git a/content/static/monkaHmm.png b/content/static/monkaHmm.png
diff --git a/content/static/monkaS.png b/content/static/monkaS.png
diff --git a/content/static/monkaW.png b/content/static/monkaW.png
diff --git a/content/static/peepoChrist.png b/content/static/peepoChrist.png
diff --git a/content/static/peepoFlower.png b/content/static/peepoFlower.png
diff --git a/content/static/peepoHappy.png b/content/static/peepoHappy.png
diff --git a/content/static/peepoKiss.png b/content/static/peepoKiss.png
diff --git a/content/static/peepoNoMoney.png b/content/static/peepoNoMoney.png
diff --git a/content/static/peepoShi.png b/content/static/peepoShi.png
diff --git a/content/static/peepoSit.png b/content/static/peepoSit.png
diff --git a/content/static/peepoSitti.png b/content/static/peepoSitti.png
diff --git a/content/static/peepoSmile.png b/content/static/peepoSmile.png
diff --git a/content/static/peepoSmileStare.png b/content/static/peepoSmileStare.png
diff --git a/content/static/pepeW.png b/content/static/pepeW.png
diff --git a/content/static/ppL.png b/content/static/ppL.png
diff --git a/content/static/ppLDespair.png b/content/static/ppLDespair.png
diff --git a/content/static/seal.png b/content/static/seal.png
diff --git a/content/static/skull.png b/content/static/skull.png
diff --git a/content/static/sob.png b/content/static/sob.png
diff --git a/content/static/standing_person.png b/content/static/standing_person.png
diff --git a/content/static/widepeepoHappy.png b/content/static/widepeepoHappy.png
diff --git a/content/v2/emotes.json b/content/v2/emotes.json
@@ -0,0 +1,89 @@
+{
+    "lastUpdated": "2024-01-23T17:30:42.687594",
+    "emotes": [
+        {
+            "name": "catJAM",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/5f1b0186cf6d2144653d2970/2x.gif",
+            "sha1": "ae77a087be038664058745bd61b937c67462fe7b"
+        },
+        {
+            "name": "Clap",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/55b6f480e66682f576dd94f5/2x.gif",
+            "sha1": "2cc907cdb3c0a328170958d9b51ac5530180a3ef"
+        },
+        {
+            "name": "HYPERCLAP",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/5b35ca08392c604c5fd81874/2x.gif",
+            "sha1": "c65c85eefcfb72b13d1e99af78b03d9a1d1a4fde"
+        },
+        {
+            "name": "KEKW",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/5e9c6c187e090362f8b0b9e8/2x.png",
+            "sha1": "808948e0d8c5c63e2e52aab10616a46b2ac5e054"
+        },
+        {
+            "name": "modCheck",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/5d7eefb7c0652668c9e4d394/2x.gif",
+            "sha1": "4c2ab908c67bb56144ab30f08b10202a38b25058"
+        },
+        {
+            "name": "monkaS",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/56e9f494fff3cc5c35e5287e/2x.png",
+            "sha1": "ceeb99991635e7def03e481de3e85cb69429b241"
+        },
+        {
+            "name": "OMEGALUL",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/583089f4737a8e61abb0186b/2x.png",
+            "sha1": "92ef18d037dac4f4d7193f741d44e82dffcbd2db"
+        },
+        {
+            "name": "PepeLaugh",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/5c548025009a2e73916b3a37/2x.gif",
+            "sha1": "a358ec49f0580b0c4046e6a646f26459140e83a0"
+        },
+        {
+            "name": "plinK",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/63b37945d3c04b5c451257e4/2x.gif",
+            "sha1": "4bcc95b74ff23b85e39aa90691bf7581108921ca"
+        },
+        {
+            "name": "plonK",
+            "format": "gif",
+            "url": "https://cdn.betterttv.net/emote/63dd8467dc781fe9bd168d4c/2x.gif",
+            "sha1": "36a0101577a99005bd2c6f20806382d49910ae04"
+        },
+        {
+            "name": "Sadge",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/5e0fa9d40550d42106b8a489/2x.png",
+            "sha1": "b5d5ecaba72b61363b37590ab90211b91667ac9e"
+        },
+        {
+            "name": "widepeepoHappy",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/634efdf93c8b9c0ff60b3571/2x.png",
+            "sha1": "757263e5d55931d18ad6c3763182b3a34b75e358"
+        },
+        {
+            "name": "widepeepoPhilza",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/6351c366141a1a2048b5545a/2x.png",
+            "sha1": "66d1920676772c9d468917d6f8f2bc35d09a9450"
+        },
+        {
+            "name": "YEP",
+            "format": "png",
+            "url": "https://cdn.betterttv.net/emote/5e978e20d023b362f638339d/2x.png",
+            "sha1": "1daf354f4d98bed24c0d578ad8f75c512aa75709"
+        }
+    ]
+}
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.9
 loader_version=0.14.21
 
-mod_version=1.6.2
+mod_version=2.0.0
 maven_group=me.chrr.pegsemotes
 archives_base_name=pegs-emotes
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/main/java/me/chrr/pegsemotes/Config.java b/src/main/java/me/chrr/pegsemotes/Config.java
@@ -0,0 +1,43 @@
+package me.chrr.pegsemotes;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class Config {
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+
+    public int version = 1;
+    public String[] repositories = new String[]{};
+
+    public static Config load(Path configPath) throws IOException {
+        Config config;
+
+        if (configPath.toFile().isFile()) {
+            String source = Files.readString(configPath);
+            config = GSON.fromJson(source, Config.class);
+        } else {
+            config = new Config();
+        }
+
+        upgrade(config);
+        config.save(configPath);
+
+        return config;
+    }
+
+    private static void upgrade(Config config) {
+        if (config.version == 1) {
+            config.version = 2;
+            config.repositories = new String[]{"https://chrrs.github.io/pegs-emotes/v2/"};
+        }
+    }
+
+    public void save(Path configPath) throws IOException {
+        String json = GSON.toJson(this);
+        Files.writeString(configPath, json);
+    }
+}