Skip to content

Commit d716564

Browse files
XenoAmessXenoAmess
committed
version to 0.162.0-SNAPSHOT. update x8l.
1 parent c8b2117 commit d716564

File tree

175 files changed

+236
-203
lines changed

Some content is hidden

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

175 files changed

+236
-203
lines changed

‎pom.xml

+24-12
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<modelVersion>4.0.0</modelVersion>
3030
<groupId>com.xenoamess.cyan_potion</groupId>
3131
<artifactId>cyan_potion</artifactId>
32-
<version>0.161.4</version>
32+
<version>0.162.0-SNAPSHOT</version>
3333
<packaging>pom</packaging>
3434
<name>${project.artifactId}</name>
3535
<description>a 2d game engine.
@@ -89,7 +89,7 @@
8989
<dom4j.version>2.1.1</dom4j.version>
9090
<eclipse-collections.version>10.2.0</eclipse-collections.version>
9191
<guava.version>28.2-jre</guava.version>
92-
<jackson.version>2.10.2</jackson.version>
92+
<jackson.version>2.10.3</jackson.version>
9393
<joml.version>1.9.22</joml.version>
9494
<log4j.version>2.13.1</log4j.version>
9595
<lwjgl.version>3.2.3</lwjgl.version>
@@ -103,8 +103,9 @@
103103
<!--home made libraries versions-->
104104
<commonx.version>0.10.10</commonx.version>
105105
<multi_language.version>0.45.4</multi_language.version>
106-
<x8l.version>0.53.0</x8l.version>
107-
<SDL_GameControllerDB_Util.version>1.2.20200221</SDL_GameControllerDB_Util.version>
106+
<x8l.version>2.1.1</x8l.version>
107+
<SDL_GameControllerDB_Util.version>1.2.20200221
108+
</SDL_GameControllerDB_Util.version>
108109
<!---->
109110
<!---->
110111
<!--maven plugins versions-->
@@ -182,16 +183,22 @@
182183
<goal>clean</goal>
183184
</goals>
184185
<configuration>
185-
<excludeDefaultDirectories>true</excludeDefaultDirectories>
186+
<excludeDefaultDirectories>true
187+
</excludeDefaultDirectories>
186188
<filesets>
187189
<fileset>
188-
<directory>${project.build.directory}/generated-sources/delombok</directory>
189-
<followSymlinks>false</followSymlinks>
190+
<directory>
191+
${project.build.directory}/generated-sources/delombok
192+
</directory>
193+
<followSymlinks>false
194+
</followSymlinks>
190195
</fileset>
191196
<fileset>
192-
<directory>${project.build.directory}/generated-test-sources/delombok
197+
<directory>
198+
${project.build.directory}/generated-test-sources/delombok
193199
</directory>
194-
<followSymlinks>false</followSymlinks>
200+
<followSymlinks>false
201+
</followSymlinks>
195202
</fileset>
196203
</filesets>
197204
<verbose>true</verbose>
@@ -1009,7 +1016,8 @@
10091016
<exclude>target/generated-sources/delombok</exclude>
10101017
</excludes>
10111018
<testExcludes>
1012-
<testExclude>target/generated-test-sources/delombok</testExclude>
1019+
<testExclude>target/generated-test-sources/delombok
1020+
</testExclude>
10131021
</testExcludes>
10141022
</configuration>
10151023
</plugin>
@@ -1049,8 +1057,12 @@
10491057
</executions>
10501058
<configuration>
10511059
<excludes>
1052-
<exclude>${project.build.directory}/generated-sources/delombok</exclude>
1053-
<exclude>${project.build.directory}/generated-test-sources/delombok</exclude>
1060+
<exclude>
1061+
${project.build.directory}/generated-sources/delombok
1062+
</exclude>
1063+
<exclude>
1064+
${project.build.directory}/generated-test-sources/delombok
1065+
</exclude>
10541066
</excludes>
10551067
<includes>
10561068
<include>${project.basedir}/src/main/lombok</include>

‎refresh_keys.cmd

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
gpg --list-keys
2+
gpg --list-keys --keyid-format 0xSHORT
23
gpg --keyserver hkp://pool.sks-keyservers.net --send-keys 4E8A82BDED6064C5
34
gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 4E8A82BDED6064C5
5+
gpg --export-secret-keys >C:/Users/xenoa/.gnupg/secring.gpg
46
pause

‎resources/settings/RpgModuleDemoSettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"textFilePath": "resources/text/text.x8l",
1313
"gameWindowClassName": "com.xenoamess.cyan_potion.base.GameWindow",
1414
"titleClassName": "com.xenoamess.cyan_potion.demo.world.WorldForDemo",
15-
"gameVersion": "0.161.4",
15+
"gameVersion": "0.162.0-SNAPSHOT",
1616
"steam_appid": "480",
1717
"language": "english",
1818
"commonSettings": "",

‎resources/settings/RpgModuleDemoSettings.x8l

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<settingFile settingFormatVersion=0.3.0>
22
<commonSettings
33
gameName=CyanPotionRpgModuleDemo
4-
gameVersion=0.161.4
4+
gameVersion=0.162.0-SNAPSHOT
55
titleTextID=0
66
textFilePath=resources/text/text.x8l
77
defaultFontResourceURI=["com.xenoamess.cyan_potion.base.visual.Font","ttfFile","resources/www/fonts/SourceHanSans-Normal.ttc"]

‎resources/settings/RpgModuleDemoSettings.xml

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<settingFile settingFormatVersion="0.3.0">
3-
<commonSettings gameName="CyanPotionRpgModuleDemo" gameVersion="0.161.4" titleTextID="0"
3+
<commonSettings gameName="CyanPotionRpgModuleDemo"
4+
gameVersion="0.162.0-SNAPSHOT" titleTextID="0"
45
textFilePath="resources/text/text.x8l"
56
defaultFontResourceURI="[&quot;com.xenoamess.cyan_potion.base.visual.Font&quot;,&quot;ttfFile&quot;,&quot;resources/www/fonts/SourceHanSans-Normal.ttc&quot;]"
6-
language="english" gameWindowClassName="com.xenoamess.cyan_potion.base.GameWindow"
7-
titleClassName="com.xenoamess.cyan_potion.demo.world.WorldForDemo" steam_appid="480"
8-
runWithSteam="1" maxFPS="-1"/>
9-
<views logicWindowWidth="1280" logicWindowHeight="1024" realWindowWidth="1280" realWindowHeight="1024" scale="2.0"
7+
language="english"
8+
gameWindowClassName="com.xenoamess.cyan_potion.base.GameWindow"
9+
titleClassName="com.xenoamess.cyan_potion.demo.world.WorldForDemo"
10+
steam_appid="480" runWithSteam="1" maxFPS="-1"/>
11+
<views logicWindowWidth="1280" logicWindowHeight="1024"
12+
realWindowWidth="1280" realWindowHeight="1024" scale="2.0"
1013
fullScreen="0" gameWindowResizable="1"/>
1114
<specialSettings/>
1215
<codePlugins>
@@ -41,9 +44,12 @@
4144
<GLFW_KEY_SPACE>XENOAMESS_KEY_SPACE</GLFW_KEY_SPACE>
4245
<GLFW_KEY_LEFT_SHIFT>XENOAMESS_KEY_LEFT_SHIFT</GLFW_KEY_LEFT_SHIFT>
4346
<GLFW_KEY_RIGHT_SHIFT>XENOAMESS_KEY_RIGHT_SHIFT</GLFW_KEY_RIGHT_SHIFT>
44-
<GLFW_MOUSE_BUTTON_LEFT>XENOAMESS_MOUSE_BUTTON_LEFT</GLFW_MOUSE_BUTTON_LEFT>
45-
<GLFW_MOUSE_BUTTON_RIGHT>XENOAMESS_MOUSE_BUTTON_RIGHT</GLFW_MOUSE_BUTTON_RIGHT>
46-
<GLFW_MOUSE_BUTTON_MIDDLE>XENOAMESS_MOUSE_BUTTON_MIDDLE</GLFW_MOUSE_BUTTON_MIDDLE>
47+
<GLFW_MOUSE_BUTTON_LEFT>XENOAMESS_MOUSE_BUTTON_LEFT
48+
</GLFW_MOUSE_BUTTON_LEFT>
49+
<GLFW_MOUSE_BUTTON_RIGHT>XENOAMESS_MOUSE_BUTTON_RIGHT
50+
</GLFW_MOUSE_BUTTON_RIGHT>
51+
<GLFW_MOUSE_BUTTON_MIDDLE>XENOAMESS_MOUSE_BUTTON_MIDDLE
52+
</GLFW_MOUSE_BUTTON_MIDDLE>
4753
<JXINPUT_KEY_UP>XENOAMESS_KEY_UP</JXINPUT_KEY_UP>
4854
<JXINPUT_KEY_LEFT>XENOAMESS_KEY_LEFT</JXINPUT_KEY_LEFT>
4955
<JXINPUT_KEY_DOWN>XENOAMESS_KEY_DOWN</JXINPUT_KEY_DOWN>

‎src/base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<parent>
3131
<artifactId>cyan_potion</artifactId>
3232
<groupId>com.xenoamess.cyan_potion</groupId>
33-
<version>0.161.4</version>
33+
<version>0.162.0-SNAPSHOT</version>
3434
</parent>
3535
<artifactId>cyan_potion_base</artifactId>
3636
<version>${project.parent.version}</version>

‎src/base/src/main/java/com/xenoamess/cyan_potion/base/GameEntrance.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* <p>GameEntrance class.</p>
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public class GameEntrance {
3434
/**

‎src/base/src/main/java/com/xenoamess/cyan_potion/base/modified_sources/code_pieces/ArtemisHD/ImageParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
*
6262
* @author ArtemisHD
6363
* @author XenoAmess
64-
* @version 0.161.4
64+
* @version 0.162.0-SNAPSHOT
6565
*/
6666
public class ImageParser implements Closeable {
6767
@JsonIgnore

‎src/base/src/main/java/com/xenoamess/cyan_potion/base/steam/SteamImage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* But right now let's just use this class here.
3939
*
4040
* @author XenoAmess
41-
* @version 0.161.4
41+
* @version 0.162.0-SNAPSHOT
4242
*/
4343
public class SteamImage {
4444
private final int imageHandle;

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/CallbackManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* <p>Callbacks class.</p>
4848
*
4949
* @author XenoAmess
50-
* @version 0.161.4
50+
* @version 0.162.0-SNAPSHOT
5151
*/
5252
@EqualsAndHashCode(callSuper = true)
5353
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/DataCenter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* <p>DataCenter class.</p>
4040
*
4141
* @author XenoAmess
42-
* @version 0.161.4
42+
* @version 0.162.0-SNAPSHOT
4343
*/
4444
@EqualsAndHashCode(callSuper = true)
4545
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/GameManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
* <p>GameManager class.</p>
7878
*
7979
* @author XenoAmess
80-
* @version 0.161.4
80+
* @version 0.162.0-SNAPSHOT
8181
*/
8282
@EqualsAndHashCode
8383
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/GameManagerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* <p>GameManagerConfig class.</p>
3737
*
3838
* @author XenoAmess
39-
* @version 0.161.4
39+
* @version 0.162.0-SNAPSHOT
4040
*/
4141
@EqualsAndHashCode
4242
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/GameWindow.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
* I'm considering about rename it to GameWindowManager.
7676
*
7777
* @author XenoAmess
78-
* @version 0.161.4
78+
* @version 0.162.0-SNAPSHOT
7979
*/
8080
@EqualsAndHashCode(callSuper = true)
8181
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/SubManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* some of them are not named this way, due to historical or other reasons.
4343
*
4444
* @author XenoAmess
45-
* @version 0.161.4
45+
* @version 0.162.0-SNAPSHOT
4646
*/
4747
@EqualsAndHashCode
4848
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/AbstractArea.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* you can see implementations of this class for more details.
3434
*
3535
* @author XenoAmess
36-
* @version 0.161.4
36+
* @version 0.162.0-SNAPSHOT
3737
*/
3838
public interface AbstractArea {
3939
/**

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/AbstractImmutableArea.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Immutable Area
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public interface AbstractImmutableArea extends AbstractArea {
3434

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/AbstractImmutablePoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* <p>AbstractImmutablePoint interface.</p>
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public interface AbstractImmutablePoint extends AbstractPoint {
3434

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/AbstractMutableArea.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Mutable Area
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public interface AbstractMutableArea extends AbstractArea {
3434

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/AbstractMutablePoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* <p>AbstractMutablePoint interface.</p>
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public interface AbstractMutablePoint extends AbstractPoint {
3434

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/AbstractPoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* <p>AbstractPoint interface.</p>
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public interface AbstractPoint {
3434
/**

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/Areas.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Utility class for Area.
2929
*
3030
* @author XenoAmess
31-
* @version 0.161.4
31+
* @version 0.162.0-SNAPSHOT
3232
*/
3333
public class Areas {
3434
private Areas() {

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/SimpleImmutableArea.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* must create it from Areas.
3232
*
3333
* @author XenoAmess
34-
* @version 0.161.4
34+
* @version 0.162.0-SNAPSHOT
3535
* @see Areas#generateImmutableAreaFromArea(AbstractArea)
3636
* @see Areas#generateImmutableAreaFromLeftTop(float, float, float, float)
3737
* @see Areas#generateImmutableAreaFromArea(float, float, float, float)

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/SimpleImmutablePoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <p>SimpleImmutablePoint class.</p>
3131
*
3232
* @author XenoAmess
33-
* @version 0.161.4
33+
* @version 0.162.0-SNAPSHOT
3434
*/
3535
@Data
3636
public final class SimpleImmutablePoint implements AbstractImmutablePoint {

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/SimpleMutableArea.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* must create it from Areas.
3232
*
3333
* @author XenoAmess
34-
* @version 0.161.4
34+
* @version 0.162.0-SNAPSHOT
3535
* @see Areas#generateMutableAreaFromArea(AbstractArea)
3636
* @see Areas#generateMutableAreaFromLeftTop(float, float, float, float)
3737
* @see Areas#generateMutableAreaFromArea(float, float, float, float)

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/areas/SimpleMutablePoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <p>SimpleMutablePoint class.</p>
3131
*
3232
* @author XenoAmess
33-
* @version 0.161.4
33+
* @version 0.162.0-SNAPSHOT
3434
*/
3535
@Data
3636
public final class SimpleMutablePoint implements AbstractMutablePoint {

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/audio/AudioManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* Audios Manager is manager class of some SE audio.
5151
*
5252
* @author XenoAmess
53-
* @version 0.161.4
53+
* @version 0.162.0-SNAPSHOT
5454
* @see #useSource()
5555
* @see #useSource(WaveData)
5656
*/

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/audio/PlayAudioEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* if this.waveData==null, then will use source.getCurrentWaveData() as waveData
4646
*
4747
* @author XenoAmess
48-
* @version 0.161.4
48+
* @version 0.162.0-SNAPSHOT
4949
*/
5050
@Data
5151
public class PlayAudioEvent implements MainThreadEvent {

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/audio/Source.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* <p>Source class.</p>
4242
*
4343
* @author XenoAmess
44-
* @version 0.161.4
44+
* @version 0.162.0-SNAPSHOT
4545
*/
4646
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
4747
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/audio/WaveData.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
* <p>WaveData class.</p>
5757
*
5858
* @author XenoAmess
59-
* @version 0.161.4
59+
* @version 0.162.0-SNAPSHOT
6060
*/
6161
@EqualsAndHashCode(callSuper = true)
6262
@ToString

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/console/Console.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* <p>Console class.</p>
3737
*
3838
* @author XenoAmess
39-
* @version 0.161.4
39+
* @version 0.162.0-SNAPSHOT
4040
*/
4141
public class Console implements Runnable {
4242
private final AtomicBoolean alive = new AtomicBoolean(true);

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/console/ConsoleEvent.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* <p>ConsoleEvent class.</p>
4040
*
4141
* @author XenoAmess
42-
* @version 0.161.4
42+
* @version 0.162.0-SNAPSHOT
4343
*/
4444
@Data
4545
public class ConsoleEvent implements Event {

‎src/base/src/main/lombok/com/xenoamess/cyan_potion/base/console/ConsoleTalkThreadManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
* the thread.
5959
*
6060
* @author XenoAmess
61-
* @version 0.161.4
61+
* @version 0.162.0-SNAPSHOT
6262
* @see Console
6363
* @see GameManager
6464
* @see com.xenoamess.cyan_potion.base.GameManagerConfig

0 commit comments

Comments
 (0)