From 9d4c8a2f567f9cded9838ee57e1fe63d36ac8c8d Mon Sep 17 00:00:00 2001
From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>
Date: Mon, 3 May 2021 22:26:11 -0400
Subject: Use apache Base64 instead of Sun Oracle internal package

---
 .../roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java
index 356f60d1..763f72c9 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java
@@ -18,7 +18,6 @@
 
 package kr.syeyoung.dungeonsguide.roomprocessor.bombdefuse;
 
-import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet;
 import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
@@ -53,6 +52,7 @@ import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.fml.common.gameevent.InputEvent;
+import org.apache.commons.codec.binary.Base64;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -165,7 +165,7 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor {
             CompressedStreamTools.writeCompressed(compound, w);
             w.flush();
             byte[] bytes = baos.toByteArray();
-            String str = Base64.encode(bytes);
+            String str = Base64.encodeBase64String(bytes);
             Minecraft.getMinecraft().thePlayer.sendChatMessage("/pc $DG-BD " +str);
 
             for (ChamberSet ch:chambers) {
@@ -195,7 +195,7 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor {
             try {
                 String data = component.getFormattedText().substring(component.getFormattedText().indexOf("$DG-BD"));
                 String actual = TextUtils.stripColor(data).trim().split(" ")[1];
-                byte[] data2 = Base64.decode(actual);
+                byte[] data2 = Base64.decodeBase64(actual);
                 NBTTagCompound compound = CompressedStreamTools.readCompressed(new ByteArrayInputStream(data2));
 
                 for (ChamberSet ch:chambers) {
-- 
cgit