Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Address a few TODO 1.18's

Browse Source 
(cherry picked from commit 0b77932b6e46c825d78b8c7ccae2a68ad890564e)
This commit is contained in:
NotMyFault 2021-12-21 19:00:59 +01:00 committed by dordsor21
parent 28f3bc61ea
commit 94b392dd39
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java
View File

@ -305,8 +305,7 @@ public class Fawe {
br.close(); br.close();
this.version = FaweVersion.tryParse(versionString, commitString, dateString); this.version = FaweVersion.tryParse(versionString, commitString, dateString);
Settings.IMP.DATE = new Date(100 + version.year, version.month, version.day).toString(); Settings.IMP.DATE = new Date(100 + version.year, version.month, version.day).toString();
//TODO 1.18 revisit Settings.IMP.BUILD = "https://ci.athion.net/job/FastAsyncWorldEdit/" + version.build;
Settings.IMP.BUILD = "https://ci.athion.net/job/FastAsyncWorldEdit-1.17/" + version.build;
Settings.IMP.COMMIT = "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/" + Integer.toHexString(version.hash); Settings.IMP.COMMIT = "https://github.com/IntellectualSites/FastAsyncWorldEdit/commit/" + Integer.toHexString(version.hash);
} catch (Throwable ignored) { } catch (Throwable ignored) {
} }

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/TextureUtil.java
View File

@ -33,7 +33,6 @@ import java.io.InputStreamReader;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.AccessControlException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -370,8 +369,7 @@ public class TextureUtil implements TextureHolder {
"folder with a `.minecraft/versions` jar in it."); "folder with a `.minecraft/versions` jar in it.");
LOGGER.error("If the file exists, please make sure the server has read access to the directory."); LOGGER.error("If the file exists, please make sure the server has read access to the directory.");
} }
//TODO 1.18 AccessControlException is deprecated and scheduled for removal as of Java 17. Exchange on sight to be prepared for future releases } catch (SecurityException e) {
} catch (AccessControlException e) {
LOGGER.error( LOGGER.error(
"Could not download asset jar. It's likely your file permission are setup improperly and do not allow fetching data from the Mojang servers."); "Could not download asset jar. It's likely your file permission are setup improperly and do not allow fetching data from the Mojang servers.");
LOGGER.error( LOGGER.error(