Skip to content

Commit cabe612

Browse files
KlopingKloping
committed
0.2.9
1 parent f83167b commit cabe612

File tree

12 files changed

+89
-37
lines changed

12 files changed

+89
-37
lines changed

‎Lsys-GameBase/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This module is being written

‎Lsys-GameBase/src/main/java/cn/kloping/lsys/gamebase/WeaponFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public class WeaponFactory {
1616
private WeaponFactory() {
1717
}
1818

19-
public static Weapon newWeapon(Class<? extends Weapon> type, int id) throws IllegalAccessException {
19+
public static <T extends Weapon> T newWeapon(Class<T> type, int id) throws IllegalAccessException {
2020
if (WeaponConf.INSTANCE.getWeaponMap().containsKey(type.getName())) {
21-
Weapon oWeapon = WeaponConf.INSTANCE.getWeaponMap().get(type.getName());
22-
Weapon weapon = io.github.kloping.clasz.ClassUtils.copyAllField(oWeapon);
21+
T oWeapon = (T) WeaponConf.INSTANCE.getWeaponMap().get(type.getName());
22+
T weapon = io.github.kloping.clasz.ClassUtils.copyAllField(oWeapon);
2323
weapon.setId(id);
2424
return weapon;
2525
} else {

‎Lsys-GameBase/src/main/java/cn/kloping/lsys/gamebase/conf/WeaponConf.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
public class WeaponConf {
2626

2727
public static final WeaponConf INSTANCE = new WeaponConf();
28-
private static final String path = "/conf/LSys/game0/weaponConf.json";
28+
private static final String PATH = "/conf/LSys/game0/weaponConf.json";
2929
private static File dataFile = null;
3030

3131
static {
32-
dataFile = new File(Resource.rootPath, path);
32+
dataFile = new File(Resource.rootPath, PATH);
3333
WeaponConf wc = FileInitializeValue.getValue(dataFile.getAbsolutePath(), INSTANCE, true);
3434
wc.weaponJo.forEach((k, v) -> {
3535
try {
@@ -39,11 +39,9 @@ public class WeaponConf {
3939
e.printStackTrace();
4040
}
4141
});
42-
4342
Set<Class<? extends Weapon>> cs = new ConcurrentSet<>();
4443
cs.add(Knife.class);
4544
cs.add(BigKnife.class);
46-
4745
for (Class<? extends Weapon> c : cs) {
4846
INSTANCE.putIfNotExists(c.getName(), ClassUtils.newInstance(c));
4947
}

‎Lsys-GameBase/src/main/java/cn/kloping/lsys/gamebase/entity/BigKnife.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @date 2021/12/28
99
*/
1010
public class BigKnife extends Knife {
11-
private int price = 18;
11+
private int price = 180;
1212
private int att = 30;
1313
private int maxAtt = 30;
1414
private int maxEndurance = 30;

‎Lsys-GameBase/src/main/java/cn/kloping/lsys/gamebase/entity/Knife.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @date 2021/12/28
99
*/
1010
public class Knife implements ColdWeapon {
11-
private int price = 10;
11+
private int price = 100;
1212
private int att = 10;
1313
private int maxAtt = 10;
1414
private int maxEndurance = 10;

‎Lsys-GameBase/src/main/java/cn/kloping/lsys/gamebase/entity/m0/Info.java

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package cn.kloping.lsys.gamebase.entity.m0;
2+
3+
/**
4+
* @author github-kloping
5+
* @version 1.0
6+
* @date 2021/12/31-09
7+
*/
8+
public class Info {
9+
private Integer strength;
10+
}

‎Lsys-GetPic/src/main/java/cn/kloping/lsys/getPic/Loader.java

+29-26
Original file line numberDiff line numberDiff line change
@@ -20,40 +20,43 @@
2020

2121
import static cn.kloping.lsys.utils.MessageUtils.createImageInGroup;
2222

23+
/**
24+
* @author github-kloping
25+
*/
2326
public class Loader {
2427
public static Conf conf = new Conf(0, 12);
2528

26-
public static final String baseUrl = "http://49.232.209.180:20041/api/search/pic?keyword=%s&num=%s&type=%s";
29+
public static final String BASE_URL = "http://49.232.209.180:20041/api/search/pic?keyword=%s&num=%s&type=%s";
2730

28-
public static final InvokeGroup invokeGroup = new InvokeGroup("getPic");
31+
public static final InvokeGroup INVOKE_GROUP = new InvokeGroup("getPic");
2932

3033
public static long cd = 0;
3134

3235
static {
33-
invokeGroup.getInvokes().put("发张.*", "getPicOne");
34-
invokeGroup.getInvokesAfter().put("发张.*", new String[]{"<Image = $1>", "获取失败"});
36+
INVOKE_GROUP.getInvokes().put("发张.*", "getPicOne");
37+
INVOKE_GROUP.getInvokesAfter().put("发张.*", new String[]{"<Image = $1>", "获取失败"});
3538

36-
invokeGroup.getInvokes().put("搜图菜单", "method");
37-
invokeGroup.getInvokesAfter().put("搜图菜单", new String[]{"<At = ?>\n搜图菜单\n发张 xx\n百度搜图 xx\n堆糖搜图 xx"});
39+
INVOKE_GROUP.getInvokes().put("搜图菜单", "method");
40+
INVOKE_GROUP.getInvokesAfter().put("搜图菜单", new String[]{"<At = ?>\n搜图菜单\n发张 xx\n百度搜图 xx\n堆糖搜图 xx"});
3841

39-
invokeGroup.getInvokes().put("百度搜图.*", "getBaidPics");
40-
invokeGroup.getInvokesAfter().put("百度搜图.*", new String[]{"搜索到了$1个结果", "获取失败"});
42+
INVOKE_GROUP.getInvokes().put("百度搜图.*", "getBaidPics");
43+
INVOKE_GROUP.getInvokesAfter().put("百度搜图.*", new String[]{"搜索到了$1个结果", "获取失败"});
4144

42-
invokeGroup.getInvokes().put("堆糖搜图.*", "getDuitPics");
43-
invokeGroup.getInvokesAfter().put("堆糖搜图.*", new String[]{"搜索到了$1个结果", "获取失败"});
45+
INVOKE_GROUP.getInvokes().put("堆糖搜图.*", "getDuitPics");
46+
INVOKE_GROUP.getInvokesAfter().put("堆糖搜图.*", new String[]{"搜索到了$1个结果", "获取失败"});
4447

4548
conf = FileInitializeValue.getValue(Resource.rootPath + "/conf/Lsys/lsys-getPic.json", conf, true);
4649
}
4750

48-
public static final Function2<User, Request, Result> fun2 = (user, request) -> {
51+
public static final Function2<User, Request, Result> FUN2 = (user, request) -> {
4952
try {
5053
if (cd > 0) {
5154
System.err.println("冷却中...");
5255
return null;
5356
}
5457
String name = request.getStr().substring(request.getOStr().indexOf("."));
5558
String names = URLEncoder.encode(name, "utf-8");
56-
JSONObject jo = JSON.parseObject(UrlUtils.getStringFromHttpUrl(String.format(baseUrl, names, conf.getNum(), "baidu")));
59+
JSONObject jo = JSON.parseObject(UrlUtils.getStringFromHttpUrl(String.format(BASE_URL, names, conf.getNum(), "baidu")));
5760
startCd();
5861
ForwardMessageBuilder builder = new ForwardMessageBuilder(request.getEvent().getSubject());
5962
long id = request.getEvent().getBot().getId();
@@ -92,15 +95,15 @@ private static void startCd() {
9295
});
9396
}
9497

95-
public static final Function2<User, Request, Result> fun1 = (user, request) -> {
98+
public static final Function2<User, Request, Result> FUN1 = (user, request) -> {
9699
try {
97100
if (cd > 0) {
98101
System.err.println("冷却中...");
99102
return null;
100103
}
101104
String name = request.getStr().substring(request.getOStr().indexOf("."));
102105
String names = URLEncoder.encode(name, "utf-8");
103-
JSONObject jo = JSON.parseObject(UrlUtils.getStringFromHttpUrl(String.format(baseUrl, names, "1", "duit")));
106+
JSONObject jo = JSON.parseObject(UrlUtils.getStringFromHttpUrl(String.format(BASE_URL, names, "1", "duit")));
104107
String picUrl = jo.getJSONArray("data").getString(0);
105108
startCd();
106109
return new Result(new Object[]{picUrl}, 0);
@@ -110,15 +113,15 @@ private static void startCd() {
110113
return new Result(new Object[]{}, 1);
111114
};
112115

113-
public static final Function2<User, Request, Result> fun3 = (user, request) -> {
116+
public static final Function2<User, Request, Result> FUN3 = (user, request) -> {
114117
try {
115118
if (cd > 0) {
116119
System.err.println("冷却中...");
117120
return null;
118121
}
119-
String name = request.getStr().substring(request.getOStr().indexOf("."));
122+
String name = request.getStr().substring(request.getOStr().indexOf(".")).trim();
120123
String names = URLEncoder.encode(name, "utf-8");
121-
JSONObject jo = JSON.parseObject(UrlUtils.getStringFromHttpUrl(String.format(baseUrl, names, conf.getNum(), "duit")));
124+
JSONObject jo = JSON.parseObject(UrlUtils.getStringFromHttpUrl(String.format(BASE_URL, names, conf.getNum(), "duit")));
122125
startCd();
123126
ForwardMessageBuilder builder = new ForwardMessageBuilder(request.getEvent().getSubject());
124127
long id = request.getEvent().getBot().getId();
@@ -164,11 +167,6 @@ private static void startCd() {
164167
// }
165168
// }
166169

167-
public static final Runnable runnable = () -> {
168-
if (!Resource.conf.getInvokeGroups().containsKey("getPic"))
169-
Resource.conf.getInvokeGroups().put("getPic", invokeGroup);
170-
};
171-
172170
public static void loadConf() {
173171
conf = FileInitializeValue.getValue(Resource.rootPath + "/conf/Lsys/lsys-getPic.json", conf, true);
174172
}
@@ -177,12 +175,17 @@ public static void applyConf() {
177175
FileInitializeValue.putValues(Resource.rootPath + "/conf/Lsys/lsys-getPic.json", conf, true);
178176
}
179177

178+
public static final Runnable RUNNABLE = () -> {
179+
if (!Resource.conf.getInvokeGroups().containsKey("getPic"))
180+
Resource.conf.getInvokeGroups().put("getPic", INVOKE_GROUP);
181+
};
182+
180183
public static void load() {
181-
Resource.loadConfAfter.add(runnable);
184+
Resource.loadConfAfter.add(RUNNABLE);
182185

183-
Methods.invokes.put("getPicOne", fun1);
184-
Methods.invokes.put("getBaidPics", fun2);
185-
Methods.invokes.put("getDuitPics", fun3);
186+
Methods.invokes.put("getPicOne", FUN1);
187+
Methods.invokes.put("getBaidPics", FUN2);
188+
Methods.invokes.put("getDuitPics", FUN3);
186189

187190
Resource.i1();
188191
}

‎Lsys-Score2/src/main/java/cn/kloping/lsys/sc2/PluginMain.java

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescriptionBuilder;
88

99

10+
/**
11+
* @author github-kloping
12+
*/
1013
public class PluginMain extends JavaPlugin {
1114
public static final PluginMain INSTANCE = new PluginMain();
1215

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<properties>
2424
<maven.compiler.source>8</maven.compiler.source>
2525
<maven.compiler.target>8</maven.compiler.target>
26-
<kotlin.version>1.6.0-RC</kotlin.version>
26+
<kotlin.version>1.6.0</kotlin.version>
2727
<mirai-version>2.9.1</mirai-version>
2828
</properties>
2929

‎src/main/java/cn/kloping/lsys/PluginMain.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import kotlin.coroutines.CoroutineContext
2020
class PluginMain : KotlinPlugin {
2121

2222
constructor() : super(
23-
JvmPluginDescriptionBuilder("cn.kloping.Lsys", "0.2.8-M1")
23+
JvmPluginDescriptionBuilder("cn.kloping.Lsys", "0.2.9")
2424
.name("p_0-Author-HRS-LSys-Loaded")
2525
.info("Lsys-main")
2626
.author("HRS")

‎src/main/java/cn/kloping/lsys/Worker.kt

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import cn.kloping.lsys.Resource.conf
44
import cn.kloping.lsys.entitys.Request
55
import cn.kloping.lsys.savers.PutGetter
66
import cn.kloping.lsys.utils.MessageUtils.createImageInGroup
7+
import cn.kloping.lsys.workers.Methods.execute0
78
import cn.kloping.lsys.workers.Methods.invokes
89
import kotlinx.coroutines.runBlocking
910
import net.mamoe.mirai.contact.Contact
@@ -95,6 +96,7 @@ suspend fun run(str: String, event: MessageEvent) {
9596
}
9697

9798
val eReg = Regex(",\\s+");
99+
98100
suspend fun parseType(resText: String, contact: Contact, id: Long): Message? {
99101
if (resText.startsWith("<") && resText.endsWith(">")) {
100102
val content = resText.substring(1, resText.length - 1)
@@ -114,6 +116,9 @@ suspend fun parseType(resText: String, contact: Contact, id: Long): Message? {
114116
type == "Image" -> {
115117
return createImageInGroup(contact, args[0])
116118
}
119+
type == "Face" -> {
120+
return Face(Integer.parseInt(args[0]))
121+
}
117122
}
118123
} catch (e: Exception) {
119124
e.printStackTrace()

‎src/main/java/cn/kloping/lsys/workers/Methods.kt

+32
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ import cn.kloping.lsys.Resource.conf
55
import cn.kloping.lsys.entitys.Request
66
import cn.kloping.lsys.entitys.Result
77
import cn.kloping.lsys.entitys.User
8+
import cn.kloping.lsys.parseType
9+
import cn.kloping.lsys.toLink
810
import io.github.kloping.number.NumberUtils
11+
import kotlinx.coroutines.runBlocking
12+
import net.mamoe.mirai.contact.Contact
13+
import net.mamoe.mirai.event.events.MessageEvent
14+
import net.mamoe.mirai.message.code.MiraiCode
15+
import net.mamoe.mirai.message.data.MessageChainBuilder
916
import java.util.concurrent.ConcurrentHashMap
1017

1118
object Methods {
@@ -172,4 +179,29 @@ object Methods {
172179
}
173180
Result(arrayOf(sb.toString()), 0)
174181
}
182+
183+
@JvmStatic
184+
public fun execute0(vararg args: Any, oText: String, contact: Contact, id: Long) {
185+
var resText = oText
186+
if (resText.trim().startsWith("[") && resText.trim().endsWith("]")) {
187+
val codeStr = resText.substring(1, resText.length - 1)
188+
val me = MiraiCode.deserializeMiraiCode(codeStr)
189+
runBlocking { contact.sendMessage(me) }
190+
return
191+
}
192+
args.let {
193+
var i = 1;
194+
for (e in it) {
195+
val tp1 = "$" + i++;
196+
resText = resText.replace(tp1, e.toString());
197+
}
198+
}
199+
val mb = MessageChainBuilder()
200+
for (e in toLink(resText)) {
201+
runBlocking { parseType(e.toString(), contact, id)?.let { it1 -> mb.append(it1) } }
202+
}
203+
if (!mb.isEmpty()) {
204+
runBlocking { contact.sendMessage(mb.build()) }
205+
}
206+
}
175207
}

0 commit comments

Comments
 (0)