v4.2.0: [[BIG SHOT]]

ThatOneCalculator · Dec 25, 2021 · 31284dd · 31284dd
1 parent 55fe1fe
commit 31284dd
Show file tree

Hide file tree

Showing 21 changed files with 191 additions and 123 deletions.
diff --git a/Among-Us-Dumpy-Gif-Maker b/Among-Us-Dumpy-Gif-Maker
@@ -2,7 +2,7 @@
 # Based off of: https://daveparrish.net/posts/2019-11-16-Better-AppImage-PKGBUILD-template.html
 
 _pkgname="among-us-dumpy-gif-maker"
-_pkgver="4.1.0"
+_pkgver="4.2.0"
 _jar="Among-Us-Dumpy-Gif-Maker-${_pkgver}-all.jar"
 
 pkgname="${_pkgname}"

diff --git a/PKGBUILD b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based off of: https://daveparrish.net/posts/2019-11-16-Better-AppImage-PKGBUILD-template.html
 
 _pkgname="among-us-dumpy-gif-maker"
-_pkgver="4.1.0"
+_pkgver="4.2.0"
 _jar="Among-Us-Dumpy-Gif-Maker-${_pkgver}-all.jar"
 
 pkgname="${_pkgname}"

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 <p align="center">
    <a href="https://voring.me/@thatonecalculator" target="blank"><img src="https://shields.io/badge/follow-@thatonecalculator-3088D4?logo=mastodon&style=for-the-badge" alt="voring.me (mastodon)"/></a>
  <a href="https://twitter.com/pixer415" target="blank"><img src="https://shields.io/badge/follow-@pixer415-1DA1F2?logo=twitter&style=for-the-badge" alt="twitter"/></a>
-<h6 align="center"> With help from <a href="https://twitter.com/twistCMYK">twistCMYK</a>, <a href="https://twitter.com/CocotheMunchkin">Coco</a>, karl-police, and auguwu!<br><br>v4.1.0</h6>
+<h6 align="center"> With help from <a href="https://twitter.com/twistCMYK">twistCMYK</a>, <a href="https://twitter.com/CocotheMunchkin">Coco</a>, <a href="https://twitter.com/AdvosArt">Advos</a>, karl-police, and auguwu!<br><br>v4.2.0</h6>
 <div align="center"> <img src="https://cdn.discordapp.com/icons/849516341933506561/a_d4c89d8bd30a116e8ea3808478f73387.gif" height=100></div>
 </p>
 
@@ -59,13 +59,13 @@
 
 To everyone else:
 
-### Make sure to [download the jar](https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker/releases/download/v4.1.0/Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar)!
+### Make sure to [download the jar](https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker/releases/download/v4.2.0/Among-Us-Dumpy-Gif-Maker-4.2.0-all.jar)!
 
 ### Basic usage:
 Click and open the jar, select the file, and a file called "dumpy.gif" will be made in the same folder as the jar.
 
 ### CLI usage:
-- `java -jar Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar <flags>`
+- `java -jar Among-Us-Dumpy-Gif-Maker-4.2.0-all.jar <flags>`
 All flags are optional.
 Flags:
 ```
@@ -85,7 +85,7 @@ git clone https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker
 cd Among-Us-Dumpy-Gif-Maker
 gradle wrapper
 ./gradlew shadowJar # .\gradelw.bat shadowJar if you're on Windows
-java -jar ./build/libs/Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar
+java -jar ./build/libs/Among-Us-Dumpy-Gif-Maker-4.2.0-all.jar
 ```
 
 Please note that the Discord/Revolt bots are not designed to be self-hosted, and I will not be providing support for self-hosting them.
diff --git a/among-us-dumpy-gif-maker b/among-us-dumpy-gif-maker
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/bin/java -jar /usr/lib/Among-Us-Dumpy-Gif-Maker-4.1.0-all.jar $@
+/usr/bin/java -jar /usr/lib/Among-Us-Dumpy-Gif-Maker-4.2.0-all.jar $@
diff --git a/bots/discord_bot.py b/bots/discord_bot.py
@@ -30,7 +30,7 @@
 statcordkey = dotenv_values(".env")["STATCORD"]
 
 upsince = datetime.datetime.now()
-version = "4.1.0"
+version = "4.2.0"
 
 intents = disnake.Intents.default()
 bot = commands.AutoShardedBot(
@@ -136,9 +136,18 @@ async def asyncrun(cmd):
 	if stderr:
 		print(f"[stderr]\n{stderr.decode()}")
 
-def draw_text(text: str, sussy: bool, filename: str):
+def draw_text(text: str, sussy: bool, filename: str, mode: str):
+	if mode  == "transparent":
+		background = (0, 0, 0, 0)
+		foreground = (255, 255, 255, 255)
+	elif mode  == "dark":
+		background = (0, 0, 0, 255)
+		foreground = (255, 255, 255, 255)
+	elif mode == "light":
+		background = (255, 255, 255, 255)
+		foreground = (0, 0, 0, 255)
 	font = ImageFont.truetype(f"fonts/{'amongsus' if sussy else 'amongus'}.ttf", 100)
-	image = Image.new(mode="RGB", size=font.getsize(text), color="white")
+	image = Image.new(mode="RGBA", size=font.getsize(text), color="white")
 	draw = ImageDraw.Draw(image)
 	draw.text((0, 0), text, font=font, fill=(0, 0, 0))
 	image.save(filename)
@@ -251,14 +260,18 @@ async def eject(inter: disnake.ApplicationCommandInteraction, person: disnake.Me
 
 @commands.cooldown(1, 5, commands.BucketType.user)
 @bot.slash_command(description="Writes something out, but sus.")
-async def text(inter: disnake.ApplicationCommandInteraction, text: str, sussy: bool = True):
+async def text(
+	inter: disnake.ApplicationCommandInteraction, 
+	text: str, 
+	sussy: bool = True,
+	mode: str = commands.Param(default="dark", choices=["dark", "light", "transparent"])):
 	if cannot_be_run(inter.guild.id, inter.channel.id, inter.author.id):
 		return
 	loop = asyncio.get_running_loop()
 	await inter.response.defer()
 	default_guild_preferences(inter.guild.id)
 	text = text.upper()
-	file = await loop.run_in_executor(None, draw_text, text, sussy, f"text{inter.id}.png")
+	file = await loop.run_in_executor(None, draw_text, text, sussy, f"text{inter.id}.png", mode)
 	await inter.edit_original_message(
 		content="Please leave a star on the GitHub and vote on top.gg, it's free and helps out a lot!",
 		file=file,
@@ -340,7 +353,8 @@ async def background(inter: disnake.ApplicationCommandInteraction, bg_choice: st
 async def dumpy(
 		inter: disnake.ApplicationCommandInteraction,
 		mode: str = commands.Param(
-			choices=["default", "furry", "sans", "isaac", "bounce"]),
+			default="default"
+			choices=["default", "furry", "sans", "spamton" "isaac", "bounce"]),
 		lines: int = commands.Param(default=10, ge=1, le=40),
 		person: disnake.Member = None,
 		image_url: str = None):
@@ -569,7 +583,7 @@ async def info(inter: disnake.ApplicationCommandInteraction):
 	)
 	embed.add_field(
 		name="<:kill:923424476614516766> Creators",
-		value=f"ThatOneCalculator#0001 and pixer415#8145.",
+		value=f"ThatOneCalculator#0001 and pixer415#8145.\nGuest artists: [twistCMYK](https://twitter.com/twistCMYK) for the `furry` mode, [Coco](https://twitter.com/CocotheMunchkin) for the `sans` mode, and [Advos](https://twitter.com/AdvosArt) for the `spamton` mode.",
 		inline=False
 	)
 	embed.add_field(

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.t1c.amogus"
-version = "4.1.0"
+version = "4.2.0"
 
 repositories {
    mavenCentral()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists