diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..c61fc2e --- /dev/null +++ b/.classpath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index 64ddbab..779c44f 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -12,6 +17,7 @@ + org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index 960df9a..3757ee7 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= -java.home=/usr/lib/jvm/java-17-openjdk +java.home=/usr/lib/jvm/default jvm.arguments= offline.mode=false override.workspace.settings=true diff --git a/Among-Us-Dumpy-Gif-Maker b/Among-Us-Dumpy-Gif-Maker index 490583f..2f56432 100644 --- 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="3.2.0" +_pkgver="3.2.1" _jar="Among-Us-Dumpy-Gif-Maker-${_pkgver}-all.jar" pkgname="${_pkgname}" diff --git a/PKGBUILD b/PKGBUILD index e053853..7999854 100644 --- 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="3.2.0" +_pkgver="3.2.1" _jar="Among-Us-Dumpy-Gif-Maker-${_pkgver}-all.jar" pkgname="${_pkgname}" diff --git a/README.md b/README.md index bb396c7..eb98b2c 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ ### Please credit this repository when you use this program! -##### Current version: 3.2.0 +##### Current version: 3.2.1 # Instructions @@ -50,13 +50,13 @@ To everyone else: -### Make sure to [download the jar](https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker/releases/download/v3.2.0/Among-Us-Dumpy-Gif-Maker-3.2.0-all.jar)! +### Make sure to [download the jar](https://github.com/ThatOneCalculator/Among-Us-Dumpy-Gif-Maker/releases/download/v3.2.1/Among-Us-Dumpy-Gif-Maker-3.2.1-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-3.2.0-all.jar ` +- `java -jar Among-Us-Dumpy-Gif-Maker-3.2.1-all.jar ` All flags are optional. Flags: ``` @@ -75,5 +75,5 @@ 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-3.2.0-all.jar +java -jar ./build/libs/Among-Us-Dumpy-Gif-Maker-3.2.1-all.jar ``` diff --git a/among-us-dumpy-gif-maker b/among-us-dumpy-gif-maker index 1bb88f4..48ce23d 100755 --- 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-3.2.0-all.jar $@ +/usr/bin/java -jar /usr/lib/Among-Us-Dumpy-Gif-Maker-3.2.1-all.jar $@ diff --git a/bin/main/dumpy/0.png b/bin/main/dumpy/0.png new file mode 100644 index 0000000..37dbc7c Binary files /dev/null and b/bin/main/dumpy/0.png differ diff --git a/bin/main/dumpy/0_twist.png b/bin/main/dumpy/0_twist.png new file mode 100644 index 0000000..38b10cc Binary files /dev/null and b/bin/main/dumpy/0_twist.png differ diff --git a/bin/main/dumpy/1.png b/bin/main/dumpy/1.png new file mode 100644 index 0000000..6843592 Binary files /dev/null and b/bin/main/dumpy/1.png differ diff --git a/bin/main/dumpy/1_twist.png b/bin/main/dumpy/1_twist.png new file mode 100644 index 0000000..5e1f1eb Binary files /dev/null and b/bin/main/dumpy/1_twist.png differ diff --git a/bin/main/dumpy/2.png b/bin/main/dumpy/2.png new file mode 100644 index 0000000..9e5dad4 Binary files /dev/null and b/bin/main/dumpy/2.png differ diff --git a/bin/main/dumpy/2_twist.png b/bin/main/dumpy/2_twist.png new file mode 100644 index 0000000..f8fd04a Binary files /dev/null and b/bin/main/dumpy/2_twist.png differ diff --git a/bin/main/dumpy/3.png b/bin/main/dumpy/3.png new file mode 100644 index 0000000..a38c6c8 Binary files /dev/null and b/bin/main/dumpy/3.png differ diff --git a/bin/main/dumpy/3_twist.png b/bin/main/dumpy/3_twist.png new file mode 100644 index 0000000..7b5bddc Binary files /dev/null and b/bin/main/dumpy/3_twist.png differ diff --git a/bin/main/dumpy/4.png b/bin/main/dumpy/4.png new file mode 100644 index 0000000..fce9648 Binary files /dev/null and b/bin/main/dumpy/4.png differ diff --git a/bin/main/dumpy/4_twist.png b/bin/main/dumpy/4_twist.png new file mode 100644 index 0000000..2a5228c Binary files /dev/null and b/bin/main/dumpy/4_twist.png differ diff --git a/bin/main/dumpy/5.png b/bin/main/dumpy/5.png new file mode 100644 index 0000000..377f5c5 Binary files /dev/null and b/bin/main/dumpy/5.png differ diff --git a/bin/main/dumpy/black.png b/bin/main/dumpy/black.png new file mode 100644 index 0000000..5e88a3a Binary files /dev/null and b/bin/main/dumpy/black.png differ diff --git a/bot.py b/bot.py index f8c9147..5986724 100644 --- a/bot.py +++ b/bot.py @@ -43,7 +43,7 @@ statcordkey = lines[0].strip() upsince = datetime.datetime.now() -version = "3.2.0" +version = "3.2.1" intents = discord.Intents.default() bot = commands.AutoShardedBot(command_prefix=commands.when_mentioned_or("!!"), intents=intents, chunk_guilds_at_startup=False) diff --git a/build.gradle.kts b/build.gradle.kts index bc1b3d1..447c628 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "dev.t1c.amogus" -version = "3.2.0" +version = "3.2.1" repositories { mavenCentral() diff --git a/src/main/java/dev/t1c/dumpy/sus.java b/src/main/java/dev/t1c/dumpy/sus.java index 082a300..cdc1cfd 100644 --- a/src/main/java/dev/t1c/dumpy/sus.java +++ b/src/main/java/dev/t1c/dumpy/sus.java @@ -170,8 +170,8 @@ public static void main(String[] args) throws Exception { double fac = 1.00; int mox = 74; int moy = 63; - BufferedImage[] moguses = new BufferedImage[6]; - for (int it = 0; it < 6; it++) { + BufferedImage[] moguses = new BufferedImage[bufferedImageArraySize]; + for (int it = 0; it < bufferedImageArraySize; it++) { var temp = main.getResource("dumpy/" + it + modestring + ".png"); moguses[it] = ImageIO.read(temp); } diff --git a/src/main/resources/dumpy/black.png~ b/src/main/resources/dumpy/black.png~ deleted file mode 100644 index a075203..0000000 Binary files a/src/main/resources/dumpy/black.png~ and /dev/null differ