Skip to content

Commit 6d45acd

Browse files
LadyCailinLadyCailin
committed
Fix more deprecation warnings
1 parent 760d39c commit 6d45acd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1154
-949
lines changed

‎deprecation.txt‎

Whitespace-only changes.

‎src/main/java/com/laytonsmith/abstraction/MCCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.laytonsmith.abstraction;
22

3+
import com.laytonsmith.core.environments.Environment;
34
import java.util.List;
45

56
public interface MCCommand extends AbstractionObject {
@@ -52,7 +53,7 @@ public interface MCCommand extends AbstractionObject {
5253

5354
List<String> tabComplete(MCCommandSender sender, String alias, String[] args);
5455

55-
List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args);
56+
List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args, Environment env);
5657

5758
boolean handleCustomCommand(MCCommandSender sender, String label, String[] args);
5859
}

‎src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCommand.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.laytonsmith.core.constructs.CString;
1414
import com.laytonsmith.core.constructs.Target;
1515
import com.laytonsmith.core.environments.CommandHelperEnvironment;
16+
import com.laytonsmith.core.environments.Environment;
1617
import com.laytonsmith.core.events.Driver;
1718
import com.laytonsmith.core.events.EventUtils;
1819
import com.laytonsmith.core.exceptions.CRE.CREPluginInternalException;
@@ -208,7 +209,7 @@ public String toString() {
208209
}
209210

210211
@Override
211-
public List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args) {
212+
public List<String> handleTabComplete(MCCommandSender sender, String alias, String[] args, Environment env) {
212213
if(Commands.onTabComplete.containsKey(cmd.getName().toLowerCase())) {
213214
Target t = Target.UNKNOWN;
214215
CArray cargs = new CArray(t);
@@ -221,7 +222,7 @@ public List<String> handleTabComplete(MCCommandSender sender, String alias, Stri
221222
Mixed fret = closure.executeCallable(null, t, new CString(alias, t), new CString(sender.getName(), t), cargs,
222223
new CArray(t) // reserved for an obgen style command array
223224
);
224-
if(fret.isInstanceOf(CArray.TYPE)) {
225+
if(fret.isInstanceOf(CArray.TYPE, null, env)) {
225226
List<String> ret = new ArrayList<>();
226227
if(((CArray) fret).inAssociativeMode()) {
227228
for(Mixed key : ((CArray) fret).keySet()) {
@@ -262,7 +263,7 @@ public boolean handleCustomCommand(MCCommandSender sender, String label, String[
262263
Mixed fret = closure.executeCallable(null, t, new CString(label, t), new CString(sender.getName(), t), cargs,
263264
new CArray(t) // reserved for an obgen style command array
264265
);
265-
if(fret.isInstanceOf(CBoolean.TYPE)) {
266+
if(fret instanceof CBoolean) {
266267
return ((CBoolean) fret).getBoolean();
267268
}
268269
} catch (ConfigRuntimeException cre) {

‎src/main/java/com/laytonsmith/abstraction/enums/MCTagType.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.laytonsmith.core.constructs.CInt;
1010
import com.laytonsmith.core.constructs.CString;
1111
import com.laytonsmith.core.constructs.Target;
12+
import com.laytonsmith.core.environments.Environment;
1213
import com.laytonsmith.core.exceptions.CRE.CRECastException;
1314
import com.laytonsmith.core.exceptions.CRE.CREFormatException;
1415
import com.laytonsmith.core.natives.interfaces.Mixed;
@@ -123,16 +124,23 @@ <T extends Mixed, Z> MCTagType(Function<T, Z> conversion, Function<Z, T> constru
123124
this.construction = construction;
124125
}
125126

127+
/** @deprecated Use {@link #convert(MCTagContainer, Mixed, Environment)} instead. */
128+
@Deprecated
129+
public Object convert(MCTagContainer container, Mixed value) {
130+
return convert(container, value, null);
131+
}
132+
126133
/**
127134
* Returns a Java object from a MethodScript construct.
128135
* Throws a ConfigRuntimeException if the value is not valid for this tag type.
129136
* @param container the tag container context
130137
* @param value MethodScript construct
138+
* @param env
131139
* @return a Java object
132140
*/
133-
public Object convert(MCTagContainer container, Mixed value) {
141+
public Object convert(MCTagContainer container, Mixed value, Environment env) {
134142
if(this == TAG_CONTAINER) {
135-
if(!value.isInstanceOf(CArray.TYPE)) {
143+
if(!value.isInstanceOf(CArray.TYPE, null, env)) {
136144
throw new CREFormatException("Expected tag container to be an array.", value.getTarget());
137145
}
138146
CArray containerArray = (CArray) value;
@@ -141,7 +149,7 @@ public Object convert(MCTagContainer container, Mixed value) {
141149
}
142150
for(String key : containerArray.stringKeySet()) {
143151
Mixed possibleArray = containerArray.get(key, value.getTarget());
144-
if(!possibleArray.isInstanceOf(CArray.TYPE)) {
152+
if(!possibleArray.isInstanceOf(CArray.TYPE, null, env)) {
145153
throw new CREFormatException("Expected tag entry to be an array.", possibleArray.getTarget());
146154
}
147155
CArray entryArray = (CArray) possibleArray;
@@ -158,11 +166,11 @@ public Object convert(MCTagContainer container, Mixed value) {
158166
}
159167
Object tagValue;
160168
if(tagType == MCTagType.TAG_CONTAINER) {
161-
tagValue = tagType.convert(container.newContainer(), entryValue);
169+
tagValue = tagType.convert(container.newContainer(), entryValue, env);
162170
} else if(tagType == TAG_CONTAINER_ARRAY) {
163-
tagValue = tagType.convert(container, entryValue);
171+
tagValue = tagType.convert(container, entryValue, env);
164172
} else {
165-
tagValue = tagType.convert(container, entryValue);
173+
tagValue = tagType.convert(container, entryValue, env);
166174
}
167175
try {
168176
container.set(StaticLayer.GetConvertor().GetNamespacedKey(key), tagType, tagValue);
@@ -174,7 +182,7 @@ public Object convert(MCTagContainer container, Mixed value) {
174182
}
175183
return container;
176184
} else if(this == TAG_CONTAINER_ARRAY) {
177-
if(!value.isInstanceOf(CArray.TYPE)) {
185+
if(!value.isInstanceOf(CArray.TYPE, null, env)) {
178186
throw new CREFormatException("Expected tag container to be an array.", value.getTarget());
179187
}
180188
CArray array = (CArray) value;
@@ -184,7 +192,7 @@ public Object convert(MCTagContainer container, Mixed value) {
184192
MCTagContainer[] containers = new MCTagContainer[(int) array.size()];
185193
int i = 0;
186194
for(Mixed possibleContainer : array) {
187-
containers[i++] = (MCTagContainer) TAG_CONTAINER.convert(container.newContainer(), possibleContainer);
195+
containers[i++] = (MCTagContainer) TAG_CONTAINER.convert(container.newContainer(), possibleContainer, env);
188196
}
189197
return containers;
190198
}

‎src/main/java/com/laytonsmith/commandhelper/CommandHelperPlugin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,8 @@ public void registerEventsDynamic(Listener listener) {
536536
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
537537
MCCommandSender mcsender = BukkitConvertor.BukkitGetCorrectSender(sender);
538538
MCCommand cmd = new BukkitMCCommand(command);
539-
return cmd.handleTabComplete(mcsender, alias, args);
539+
// TODO: Figure out how to get an env here
540+
return cmd.handleTabComplete(mcsender, alias, args, null);
540541
}
541542

542543
/**

‎src/main/java/com/laytonsmith/core/ArgumentValidation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static CArray getArray(Mixed construct, Target t) {
9191
* @return
9292
*/
9393
public static CArray getArray(Mixed construct, Target t, Environment env) {
94-
if(construct.isInstanceOf(CArray.TYPE)) {
94+
if(construct.isInstanceOf(CArray.TYPE, null, env)) {
9595
return ((CArray) construct);
9696
} else {
9797
throw new CRECastException("Expecting array, but received " + construct.val(), t);
@@ -294,9 +294,9 @@ public static long getInt(Mixed c, Target t, Environment env) {
294294
if(c == null || c instanceof CNull) {
295295
return 0;
296296
}
297-
if(c.isInstanceOf(CInt.TYPE)) {
297+
if(c.isInstanceOf(CInt.TYPE, null, env)) {
298298
i = getObject(c, t, CInt.class).getInt();
299-
} else if(c.isInstanceOf(CBoolean.TYPE)) {
299+
} else if(c instanceof CBoolean) {
300300
if(getObject(c, t, CBoolean.class).getBoolean()) {
301301
i = 1;
302302
} else {
@@ -717,7 +717,7 @@ public static <T extends Enum<T>> Set<T> getEnumSet(Mixed c, Class<T> enumClass,
717717
if(c instanceof CNull) {
718718
return EnumSet.noneOf(enumClass);
719719
}
720-
if(!c.isInstanceOf(CArray.TYPE)) {
720+
if(!c.isInstanceOf(CArray.TYPE, null, env)) {
721721
Mixed val = c;
722722
c = new CArray(t);
723723
((CArray) c).push(val, t);

‎src/main/java/com/laytonsmith/core/FullyQualifiedClassName.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static FullyQualifiedClassName forNativeEnum(Class<? extends Enum> clazz)
8888
String fqcn = m.value();
8989
FullyQualifiedClassName f = new FullyQualifiedClassName(fqcn);
9090
try {
91-
f.nativeClass = NativeTypeList.getNativeEnumType(f).typeof().getNativeType();
91+
f.nativeClass = NativeTypeList.getNativeEnumType(f).typeof(null).getNativeType();
9292
} catch (ClassNotFoundException ex) {
9393
// This can't happen, it would have already been the above error.
9494
throw new Error(ex);

0 commit comments

Comments
 (0)