Sulkta-Coop/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strip dependencies on Apache Commons Codec

Browse source
This commit is contained in:
Mike Primm 2021-12-19 15:23:40 -06:00
parent a7ee1213c9
commit 2d2fe02a81
9 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/DynmapPlugin.java
View file

@ -5,8 +5,10 @@ import java.io.InputStream;
import java.lang.reflect.Field;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@ -76,8 +78,6 @@ import net.minecraftforge.fml.loading.LoadingModList;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import org.apache.commons.codec.Charsets;
import org.apache.commons.codec.binary.Base64;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.maven.artifact.versioning.ArtifactVersion;
@ -1127,7 +1127,7 @@ public class DynmapPlugin
if (textureProperty != null) {
TexturesPayload result = null;
try {
String json = new String(Base64.decodeBase64(textureProperty.getValue()), Charsets.UTF_8);
String json = new String(Base64.getDecoder().decode(textureProperty.getValue()), StandardCharsets.UTF_8);
result = gson.fromJson(json, TexturesPayload.class);
} catch (JsonParseException e) {
}