Skip to content

Commit 08266c8

Browse files
committed
Bump gradle version
1 parent 6379e20 commit 08266c8

File tree

7 files changed

+17
-24
lines changed

7 files changed

+17
-24
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
2-
id "com.github.johnrengelman.shadow" version "5.2.0"
2+
id "com.github.johnrengelman.shadow" version "6.0.0"
33
}
44

55
apply plugin: 'java-library'
66

77
group 'fr.flowarg'
8-
version '1.0.0'
8+
version '1.0.2'
99

1010
repositories {
1111
jcenter()

gradle/wrapper/gradle-wrapper.jar

293 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fi
130130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
133+
134134
JAVACMD=`cygpath --unix "$JAVACMD"`
135135

136136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

8772

8873
@rem Execute Gradle
89-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
9075

9176
:end
9277
@rem End local scope for the variables with windows NT shell

src/main/java/fr/flowarg/recafrpcplugin/RPCPlugin.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import me.coley.recaf.ui.controls.view.ClassViewport;
1414
import me.coley.recaf.ui.controls.view.ClassViewport.ClassMode;
1515
import me.coley.recaf.ui.controls.view.EditorViewport;
16+
import me.coley.recaf.util.LangUtil;
17+
import me.coley.recaf.util.Resource;
1618
import org.plugface.core.annotations.Plugin;
1719

1820
@Plugin(name = "RPC")
@@ -117,7 +119,7 @@ private ObjectsStorage<ClassMode, EditorViewport> getEditorType(GuiController co
117119
{
118120
final EditorViewport editor = (EditorViewport)tab.getContent();
119121
if(editor instanceof ClassViewport)
120-
return new ObjectsStorage<>(((ClassViewport)editor).getClassMode(), (ClassViewport)editor);
122+
return new ObjectsStorage<>(((ClassViewport)editor).getClassMode(), editor);
121123
else return new ObjectsStorage<>(null, editor);
122124
}
123125
}
@@ -127,7 +129,7 @@ private ObjectsStorage<ClassMode, EditorViewport> getEditorType(GuiController co
127129
@Override
128130
public String getVersion()
129131
{
130-
return "1.1.2";
132+
return "1.0.1";
131133
}
132134

133135
@Override
@@ -141,4 +143,10 @@ public String getConfigTabTitle()
141143
{
142144
return "RPC configuration";
143145
}
146+
147+
@Override
148+
public void onLoad()
149+
{
150+
LangUtil.load(Resource.external("translations/rpc-en.json"));
151+
}
144152
}

0 commit comments

Comments
 (0)