Skip to content

Commit 503a251

Browse files
committed
Call preInit() and then init(), fix a typo in README, switch to Version Code 4
1 parent a0fd97a commit 503a251

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

ClassiCubeJavaLoaderBridge/src/main/java/ru/deewend/ccjlbridge/ClassiCubeJavaLoaderBridge.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class ClassiCubeJavaLoaderBridge {
66
public static boolean DEBUG = false;
7-
public static final int VERSION_CODE = 3;
7+
public static final int VERSION_CODE = 4;
88

99
public static final String LOG_FORMAT = "[HH:mm:ss dd.MM.yyyy] ";
1010
public static final String LOG_FILENAME_FORMAT = "dd-MM-yyyy-logs.txt";
@@ -37,7 +37,9 @@ public boolean run() {
3737
System.out.println();
3838
PluginManager.getInstance().loadPlugins();
3939
int loaded = PluginManager.getInstance().getPluginCount();
40-
Chat.add("Initialized " + loaded + " Java plugin" + (loaded != 1 ? "s" : ""));
40+
Chat.add("Loaded " + loaded + " Java plugin" + (loaded != 1 ? "s" : ""));
41+
42+
PluginManager.getInstance().call("init");
4143

4244
return true;
4345
}

ClassiCubeJavaLoaderBridge/src/main/java/ru/deewend/ccjlbridge/PluginManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void loadPlugins() {
177177
}
178178
Plugin plugin = (Plugin) pluginInstanceObj;
179179
try {
180-
plugin.init();
180+
plugin.preInit();
181181
} catch (Throwable t) {
182182
Log.s("Failed to pre-initialize the plugin \"" + name + "\":", t);
183183
Log.s("The game will be terminated");

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Notes:
1818
8. Select Build -> Build Solution, you should find the binary under `src/x64/Debug/` folder;
1919
9. Navigate to `ClassiCubeJavaLoaderBridge` directory, run `gradlew.bat build` command, the jarfile should be appear in `ClassiCubeJavaLoaderBridge/build/libs` folder (TODO document ability to write custom Java bridge by implementing `ccjl.Interface` class and changing `JLMOD` macro in `ClassiCubeJavaLoader.c`);
2020
10. Navigate to `ClassiCubeJavaLoaderBridgePlugin` directory, perform the same actions;
21-
11. Make sure your gamefolder is designed in the following way:<br><br>
21+
11. Make sure your game folder is designed in the following way:<br><br>
2222
ClassiCube/<br>
2323
├─ javaplugins/<br>
2424
│ ├─ ClassiCubeJavaLoaderBridgePlugin.jar<br>

0 commit comments

Comments
 (0)