From 43b321c02bf108b3290da63b162beeaece82c7a9 Mon Sep 17 00:00:00 2001 From: Walker Date: Thu, 17 Feb 2022 11:44:02 -0800 Subject: [PATCH 1/4] Fix Enchant Capitalization Bug Fixed an issue where the enchants for /ig where lowercase on the first press of tab, requiring an extra input. If the extra input was not required, the command would fail server-side. --- .../basemod/utilities/DataUtilities.java | 9 +++++++ .../basemod/utilities/EnumUtilities.java | 24 +++++++++++++++++++ .../tabsupport/ImmortalGiveTabSupport.java | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timmi6790/basemod/utilities/DataUtilities.java b/src/main/java/de/timmi6790/basemod/utilities/DataUtilities.java index 8bfb5cd..1517dec 100644 --- a/src/main/java/de/timmi6790/basemod/utilities/DataUtilities.java +++ b/src/main/java/de/timmi6790/basemod/utilities/DataUtilities.java @@ -117,4 +117,13 @@ public List collectionToLowerCase(final Collection values) { return newValues; } + + public List collectionToUpperCase(final Collection values) { + final List newValues = new ArrayList<>(); + for (final String value : values) { + newValues.add(value.toUpperCase()); + } + + return newValues; + } } diff --git a/src/main/java/de/timmi6790/basemod/utilities/EnumUtilities.java b/src/main/java/de/timmi6790/basemod/utilities/EnumUtilities.java index 1fc335f..fd4d7f8 100644 --- a/src/main/java/de/timmi6790/basemod/utilities/EnumUtilities.java +++ b/src/main/java/de/timmi6790/basemod/utilities/EnumUtilities.java @@ -44,6 +44,30 @@ public String getPrettyName(@NonNull final Enum enumValue) { return prettyName.toString(); } + /** + * Converts all enum value into Strings + * + * @param enumValue the enum value + * @return the names + */ + public List getNamesAsString(@NonNull final Enum[] enumValue) { + return Arrays.stream(enumValue) + .map(EnumUtilities::getNameAsString) + .collect(Collectors.toList()); + } + + /** + * Converts a enum value into text. + * TEST_Value -> TEST_Value + * + * @param enumValue the enum value + * @return the name + */ + + public String getNameAsString(@NonNull final Enum enumValue) { + return enumValue.name(); + } + /** * Searches for the search string against the given enum values. All enum values are checked with their pretty name * {@link #getPrettyName(Enum)}}. diff --git a/src/main/java/de/timmi6790/rmmod/modules/community/tabsupport/ImmortalGiveTabSupport.java b/src/main/java/de/timmi6790/rmmod/modules/community/tabsupport/ImmortalGiveTabSupport.java index 4761faf..822cd69 100644 --- a/src/main/java/de/timmi6790/rmmod/modules/community/tabsupport/ImmortalGiveTabSupport.java +++ b/src/main/java/de/timmi6790/rmmod/modules/community/tabsupport/ImmortalGiveTabSupport.java @@ -132,7 +132,7 @@ private void handleEnchantOptions(final String lastArg, final TabSupportData tab final String[] enchantParts = lastArg.split(","); final String[] lastEnchantPart = enchantParts[enchantParts.length - 1].split(":"); - final Set enchantments = new HashSet<>(DataUtilities.collectionToLowerCase(EnumUtilities.getPrettyNames(BukkitEnchantments.values()))); + final Set enchantments = new HashSet<>(DataUtilities.collectionToUpperCase(EnumUtilities.getNamesAsString(BukkitEnchantments.values()))); for (final String part : enchantParts) { final String[] split = part.split(":"); if (split.length == 2) { From 230f37655f25967c11b7d3e533e20ac634e2727b Mon Sep 17 00:00:00 2001 From: Walker Date: Thu, 17 Feb 2022 11:44:48 -0800 Subject: [PATCH 2/4] Update Gradle Update Gradle to work amidst ForgeGradle deprecation --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ffbcd3c..afb7c54 100644 --- a/build.gradle +++ b/build.gradle @@ -2,15 +2,15 @@ buildscript { repositories { jcenter() mavenCentral() - maven { url = 'https://files.minecraftforge.net/maven' } + maven { url = 'https://maven.minecraftforge.net/' } maven { url = 'https://repo.spongepowered.org/maven' } maven { url = 'https://jitpack.io' } } dependencies { classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4' - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' - classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' + classpath 'com.github.asbyth:ForgeGradle:6f53277' + classpath 'com.github.xcfrg:MixinGradle:0.6-SNAPSHOT' } } @@ -27,7 +27,7 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'org.spongepowered.mixin' -version = '1.0.2' +version = '1.0.3' group = 'de.timmi6790.basemod' archivesBaseName = 'RandomMineplexMod' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 290541c..ce46d36 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +org.gradle.jvmargs=-Xms512M -Xmx4G \ No newline at end of file From 98e706150a49974f20c6bb90f5735cb98dfc4710 Mon Sep 17 00:00:00 2001 From: Walker Date: Thu, 17 Feb 2022 11:44:59 -0800 Subject: [PATCH 3/4] Bump version to 1.0.3 --- src/main/java/de/timmi6790/basemod/Reference.java | 2 +- src/main/resources/mcmod.info | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timmi6790/basemod/Reference.java b/src/main/java/de/timmi6790/basemod/Reference.java index 8f82251..e3e83e9 100644 --- a/src/main/java/de/timmi6790/basemod/Reference.java +++ b/src/main/java/de/timmi6790/basemod/Reference.java @@ -3,7 +3,7 @@ public class Reference { public static final String MODID = "RMM"; public static final String NAME = "RandomMineplexMod"; - public static final String VERSION = "1.0.2"; + public static final String VERSION = "1.0.3"; public static final String VERSION_URL = "https://gist.githubusercontent.com/Timmi6790/2ead90ef6f97baeb689d076094e88c09/raw/RandomMineplexMod-Version"; public static final String DOWNLOAD_URL = "https://github.com/Timmi6790/RandomMineplexMod/releases"; } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index b7e1ba3..5b7b868 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -9,6 +9,7 @@ "updateUrl": "", "authorList": [ "Timmi6790" + "whalker" ], "logoFile": "", "screenshots": [], From 89b5f675050d7683e82197a5348c0c3b2116331d Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Thu, 17 Feb 2022 13:50:53 -0600 Subject: [PATCH 4/4] Update gradle-wrapper.properties Remove unnecessary gradle property --- gradle/wrapper/gradle-wrapper.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ce46d36..8cf6eb5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,3 @@ distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -org.gradle.jvmargs=-Xms512M -Xmx4G \ No newline at end of file