* update

Author: MarcusSlover

build.gradle

@@ -30,7 +30,7 @@ plugins {
 }
 
 group 'me.marcusslover'
-version 'dev'
+version 'b1.3'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -49,9 +49,6 @@ repositories {
 dependencies {
     compileOnly 'org.jetbrains:annotations:22.0.0'
 
-    // https://mvnrepository.com/artifact/ws.schild/jave-all-deps
-    implementation 'ws.schild:jave-all-deps:3.2.0'
-
     // https://mvnrepository.com/artifact/commons-cli/commons-cli
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'commons-cli:commons-cli:1.4'

src/main/java/me/marcusslover/resourcepacker/api/ITexture.java

@@ -29,6 +29,7 @@
 
 public interface ITexture extends IFile {
     BufferedImage buffer();
+
     boolean bitMap();
 
     default int height() {

src/main/java/me/marcusslover/resourcepacker/core/element/sound/RPSound.java

@@ -29,7 +29,6 @@
 import me.marcusslover.resourcepacker.api.ISound;
 import me.marcusslover.resourcepacker.core.resource.RPResource;
 import me.marcusslover.resourcepacker.core.resource.ResourcesCache;
-import me.marcusslover.resourcepacker.util.AudioUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -73,7 +72,7 @@ public File copyFile(File dir) {
                 return copy.toFile();
             } else {
                 if (file.exists()) file.createNewFile();
-                AudioUtil.convertToOgg(sound, file);
+                //AudioUtil.convertToOgg(sound, file); removed since its unnecessary
                 return file;
             }
         } catch (IOException e) {
@@ -113,7 +112,7 @@ public RPSound create() {
             String name = file.getName();
 
             /*Validate the format*/
-            if (!name.endsWith(".ogg") && !name.endsWith(".mp3")) throw new InvalidSoundException(file);
+            if (!name.endsWith(".ogg") /*&& !name.endsWith(".mp3")*/) throw new InvalidSoundException(file);
 
             return ResourcesCache.string().get(name, () -> new RPSound(file), RPSound.class);
         }

src/main/java/me/marcusslover/resourcepacker/core/generator/PackGenerator.java

@@ -55,7 +55,7 @@ public static File createMeta(File d, List<String> l) {
         File meta = safeFile(d, "pack.mcmeta");
 
         JsonObject pack = new JsonObject();
-        pack.addProperty("pack_format", 7); // 1.17+
+        pack.addProperty("pack_format", 8); // 1.18+
 
         StringBuilder builder = new StringBuilder();
         for (String s : l) builder.append(s).append("\n");

src/main/java/me/marcusslover/resourcepacker/core/packer/RPPacker.java

@@ -65,7 +65,7 @@ public class RPPacker implements IPacker {
         logo = null;
         prefix = "packer";
         description = new ArrayList<>();
-        description.add("Created with ResourcePacker by MarcusSlover");
+        description.add("Created with ResourcePacker");
 
         blockRegistry = new RPBlockRegistry();
         itemRegistry = new RPItemRegistry();

src/main/java/me/marcusslover/resourcepacker/core/resource/ResourceHelper.java

@@ -78,7 +78,7 @@ public RPResource get(String dir, String child) {
         if (child.endsWith(".png")) {
             type = RPResource.Type.IMAGE;
         }
-        if (child.endsWith(".ogg") || child.endsWith(".mp3")) { //mp3 is acceptable because it will be converted to .ogg
+        if (child.endsWith(".ogg") /*|| child.endsWith(".mp3")*/) { // the mp3 is no longer a thing
             type = RPResource.Type.SOUND;
         }
         if (child.endsWith(".json")) {

src/main/java/me/marcusslover/resourcepacker/util/AudioUtil.java

@@ -26,25 +26,23 @@
 package me.marcusslover.resourcepacker.util;
 
 import org.jetbrains.annotations.NotNull;
-import ws.schild.jave.Encoder;
-import ws.schild.jave.MultimediaObject;
-import ws.schild.jave.encode.AudioAttributes;
-import ws.schild.jave.encode.EncodingAttributes;
 
 import java.io.File;
 
+@Deprecated
 public class AudioUtil {
-    private AudioUtil() {
-    }
-
     private static final Integer BITRATE = 256000;
     private static final Integer CHANNELS = 2; // Stereo
     private static final Integer RATE = 44100;
 
+    private AudioUtil() {
+    }
+
 
+    @Deprecated
     public static void convertToOgg(@NotNull File source, @NotNull File target) {
+        /*
         try {
-
             // Attributes.
             AudioAttributes audio = new AudioAttributes();
             audio.setCodec("libvorbis");
@@ -67,5 +65,6 @@ public static void convertToOgg(@NotNull File source, @NotNull File target) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+         */
     }
 }

src/main/java/me/marcusslover/resourcepacker/util/UnicodeUtil.java

@@ -36,7 +36,7 @@ public class UnicodeUtil {
         CHARS = new String[dif];
         for (int i = 0; i < dif; i++) {
             String hexadecimal = Integer.toHexString(MIN + i);
-            CHARS[i] = "\\u"+hexadecimal;
+            CHARS[i] = "\\u" + hexadecimal;
         }
     }
 }