Skip to content

Commit 69eaa2d

Browse files
committed
💎 💢
1 parent d9d5d51 commit 69eaa2d

File tree

160 files changed

+1117
-352
lines changed

Some content is hidden

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

160 files changed

+1117
-352
lines changed

base/common/src/main/java/band/kessoku/lib/api/KessokuLib.java

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1+
/*
2+
* Copyright (c) 2024 KessokuTeaTime
3+
*
4+
* Licensed under the GNU Lesser General Pubic License, Version 3 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.gnu.org/licenses/lgpl-3.0.html
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package band.kessoku.lib.api;
217

3-
import band.kessoku.lib.impl.base.KessokuUtils;
4-
import org.jetbrains.annotations.UnmodifiableView;
5-
618
import java.lang.reflect.Field;
719
import java.lang.reflect.InvocationTargetException;
820
import java.lang.reflect.Method;
@@ -12,6 +24,9 @@
1224
import java.util.Collections;
1325
import java.util.List;
1426

27+
import band.kessoku.lib.impl.base.KessokuUtils;
28+
import org.jetbrains.annotations.UnmodifiableView;
29+
1530
public final class KessokuLib {
1631
private static final List<Class<?>> initializedModules = new ArrayList<>();
1732

base/common/src/main/java/band/kessoku/lib/impl/base/KessokuUtils.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package band.kessoku.lib.impl.base;
1717

18+
import java.lang.reflect.Constructor;
19+
import java.util.*;
20+
1821
import org.jetbrains.annotations.NotNull;
1922
import org.slf4j.Logger;
2023
import org.slf4j.LoggerFactory;
2124

22-
import java.lang.reflect.Constructor;
23-
import java.util.*;
24-
2525
public final class KessokuUtils {
2626
private KessokuUtils() {
2727
}

base/fabric/src/main/java/band/kessoku/lib/impl/base/fabric/KessokuBaseFabric.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import band.kessoku.lib.api.KessokuLib;
1919
import band.kessoku.lib.api.base.KessokuBase;
20+
2021
import net.fabricmc.api.ModInitializer;
2122

2223
public final class KessokuBaseFabric implements ModInitializer {

base/neo/src/main/java/band/kessoku/lib/impl/base/neoforge/KessokuBaseNeoforge.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import band.kessoku.lib.api.KessokuLib;
1919
import band.kessoku.lib.api.base.KessokuBase;
20+
2021
import net.neoforged.fml.common.Mod;
2122

2223
@Mod(KessokuBase.MOD_ID)

buildSrc/src/main/java/band/kessoku/gradle/plugin/KesssokuExtension.java renamed to buildSrc/src/main/java/band/kessoku/gradle/plugin/KessokuExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.List;
1313
import java.util.Map;
1414

15-
public abstract class KesssokuExtension {
15+
public abstract class KessokuExtension {
1616
@Inject
1717
protected abstract Project getProject();
1818

buildSrc/src/main/java/band/kessoku/gradle/plugin/KessokuGradlePlugin.java

+14-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@
1111
import java.util.List;
1212

1313
public final class KessokuGradlePlugin implements Plugin<PluginAware> {
14+
public static final List<String> MODULES = List.of(
15+
"base",
16+
"command",
17+
"config",
18+
"data",
19+
"entity-events",
20+
"entrypoint",
21+
"event-base",
22+
"keybinding",
23+
"lifecycle-events",
24+
"platform",
25+
"registry"
26+
);
1427
private static final List<String> NEO_GROUPS = List.of(
1528
"net.neoforged",
1629
"cpw.mods",
@@ -28,7 +41,7 @@ public void apply(@NotNull PluginAware target) {
2841
settings.getGradle().getPluginManager().apply(KessokuGradlePlugin.class);
2942
}
3043
case Project project -> {
31-
project.getExtensions().create("kessoku", KesssokuExtension.class);
44+
project.getExtensions().create("kessoku", KessokuExtension.class);
3245

3346
additionalRepositories(project.getRepositories());
3447
}

command/common/src/main/java/band/kessoku/lib/api/events/command/CommandRegistryEvent.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
import band.kessoku.lib.event.api.Event;
1919
import com.mojang.brigadier.CommandDispatcher;
20+
import org.jetbrains.annotations.ApiStatus;
21+
2022
import net.minecraft.command.CommandRegistryAccess;
2123
import net.minecraft.server.command.CommandManager;
2224
import net.minecraft.server.command.ServerCommandSource;
23-
import org.jetbrains.annotations.ApiStatus;
2425

2526
@ApiStatus.NonExtendable
2627
public interface CommandRegistryEvent {

command/common/src/test/java/kessoku/testmod/command/KessokuTestCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package kessoku.testmod.command;
1717

18-
import band.kessoku.lib.api.events.command.CommandRegistryEvent;
1918
import band.kessoku.lib.api.entrypoint.entrypoints.KessokuModInitializer;
19+
import band.kessoku.lib.api.events.command.CommandRegistryEvent;
2020

2121
import net.minecraft.server.command.CommandManager;
2222
import net.minecraft.text.Text;

command/fabric/src/main/java/band/kessoku/lib/impl/command/fabric/KessokuCommandFabric.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import band.kessoku.lib.api.KessokuLib;
1919
import band.kessoku.lib.api.command.KessokuCommand;
20+
2021
import net.fabricmc.api.ModInitializer;
2122

2223
public final class KessokuCommandFabric implements ModInitializer {

command/fabric/src/main/java/band/kessoku/lib/impl/command/fabric/KessokuCommandImpl.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package band.kessoku.lib.impl.command.fabric;
1717

1818
import band.kessoku.lib.api.events.command.CommandRegistryEvent;
19+
1920
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
2021

2122
public final class KessokuCommandImpl {

command/neo/src/main/java/band/kessoku/lib/impl/command/neoforge/KessokuCommandImpl.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import band.kessoku.lib.api.events.command.CommandRegistryEvent;
1919
import band.kessoku.lib.event.api.util.neo.NeoEventUtils;
20+
2021
import net.neoforged.bus.api.IEventBus;
2122
import net.neoforged.neoforge.event.RegisterCommandsEvent;
2223

command/neo/src/main/java/band/kessoku/lib/impl/command/neoforge/KessokuCommandNeoforge.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import band.kessoku.lib.api.KessokuLib;
1919
import band.kessoku.lib.api.command.KessokuCommand;
20+
2021
import net.neoforged.fml.common.Mod;
2122
import net.neoforged.neoforge.common.NeoForge;
2223

config/common/src/main/java/band/kessoku/lib/api/config/AbstractConfig.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
*/
1616
package band.kessoku.lib.api.config;
1717

18-
import band.kessoku.lib.impl.base.KessokuUtils;
19-
import band.kessoku.lib.api.config.annotations.Comment;
20-
import band.kessoku.lib.api.config.annotations.Comments;
21-
import band.kessoku.lib.api.config.annotations.Name;
22-
import com.google.common.collect.ImmutableList;
23-
import com.google.common.collect.ImmutableMap;
24-
import org.apache.commons.io.FileUtils;
25-
import org.apache.commons.io.FilenameUtils;
26-
import org.apache.logging.log4j.core.util.ReflectionUtil;
27-
2818
import java.io.File;
2919
import java.io.FileWriter;
3020
import java.io.IOException;
@@ -36,6 +26,16 @@
3626
import java.util.function.BiConsumer;
3727
import java.util.function.Consumer;
3828

29+
import band.kessoku.lib.api.config.annotations.Comment;
30+
import band.kessoku.lib.api.config.annotations.Comments;
31+
import band.kessoku.lib.api.config.annotations.Name;
32+
import band.kessoku.lib.impl.base.KessokuUtils;
33+
import com.google.common.collect.ImmutableList;
34+
import com.google.common.collect.ImmutableMap;
35+
import org.apache.commons.io.FileUtils;
36+
import org.apache.commons.io.FilenameUtils;
37+
import org.apache.logging.log4j.core.util.ReflectionUtil;
38+
3939
@SuppressWarnings({"rawtypes", "unused"})
4040
public abstract class AbstractConfig {
4141
private final List<Consumer<AbstractConfig>> preSave = new ArrayList<>();

config/common/src/main/java/band/kessoku/lib/api/config/KessokuConfig.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
*/
1616
package band.kessoku.lib.api.config;
1717

18+
import java.io.IOException;
19+
import java.util.HashMap;
20+
import java.util.Map;
21+
import java.util.Objects;
22+
1823
import org.apache.commons.io.FileUtils;
1924
import org.jetbrains.annotations.Contract;
2025
import org.jetbrains.annotations.NotNull;
2126
import org.jetbrains.annotations.Nullable;
2227
import org.slf4j.Marker;
2328
import org.slf4j.MarkerFactory;
2429

25-
import java.io.IOException;
26-
import java.util.HashMap;
27-
import java.util.Map;
28-
import java.util.Objects;
29-
3030
public final class KessokuConfig {
3131
private static final Map<AbstractConfig, Class<ConfigSerializer>> configs = new HashMap<>();
3232
private static final Map<Class<? extends ConfigSerializer>, ConfigSerializer> serializerCache = new HashMap<>();

config/common/src/main/java/band/kessoku/lib/api/config/serializers/Json5Serializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package band.kessoku.lib.api.config.serializers;
1717

18+
import java.util.Map;
19+
1820
import band.kessoku.lib.api.config.AbstractConfig;
1921
import band.kessoku.lib.api.config.ConfigSerializer;
2022
import club.someoneice.json.JSON;
2123
import club.someoneice.json.node.JsonNode;
2224
import club.someoneice.json.processor.Json5Builder;
2325

24-
import java.util.Map;
25-
2626
// TODO
2727
public class Json5Serializer implements ConfigSerializer {
2828
@Override

config/common/src/main/java/band/kessoku/lib/api/config/serializers/JsonSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package band.kessoku.lib.api.config.serializers;
1717

18+
import java.util.Map;
19+
1820
import band.kessoku.lib.api.config.AbstractConfig;
1921
import band.kessoku.lib.api.config.ConfigSerializer;
2022
import club.someoneice.json.JSON;
@@ -23,8 +25,6 @@
2325
import club.someoneice.json.node.MapNode;
2426
import club.someoneice.json.processor.JsonBuilder;
2527

26-
import java.util.Map;
27-
2828
public class JsonSerializer implements ConfigSerializer {
2929
@Override
3030
public String serialize(Map<String, AbstractConfig.ValueWithComment> value) {

config/common/src/main/java/band/kessoku/lib/api/config/serializers/TomlSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package band.kessoku.lib.api.config.serializers;
1717

18+
import java.util.Map;
19+
1820
import band.kessoku.lib.api.config.AbstractConfig;
1921
import band.kessoku.lib.api.config.ConfigSerializer;
2022
import com.electronwill.nightconfig.core.CommentedConfig;
2123

22-
import java.util.Map;
23-
2424
//todo
2525
public class TomlSerializer implements ConfigSerializer {
2626
@Override

config/common/src/main/java/band/kessoku/lib/api/config/values/BooleanValue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18+
import java.util.function.Supplier;
19+
1820
import org.jetbrains.annotations.Contract;
1921
import org.jetbrains.annotations.NotNull;
2022

21-
import java.util.function.Supplier;
22-
2323
public final class BooleanValue extends DefaultConfigValue<Boolean> {
2424
private BooleanValue(Supplier<Boolean> defaultValue) {
2525
super(defaultValue);

config/common/src/main/java/band/kessoku/lib/api/config/values/DefaultConfigValue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18-
import band.kessoku.lib.api.config.ConfigValue;
19-
2018
import java.util.function.Supplier;
2119

20+
import band.kessoku.lib.api.config.ConfigValue;
21+
2222
sealed abstract class DefaultConfigValue<T> implements ConfigValue<T, T> permits BooleanValue, DoubleValue, FloatValue, IntegerValue, ListValue, LongValue, MapValue, StringValue {
2323
public final Supplier<T> defaultValue;
2424
public T value;

config/common/src/main/java/band/kessoku/lib/api/config/values/DoubleValue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18+
import java.util.function.Supplier;
19+
1820
import org.jetbrains.annotations.Contract;
1921
import org.jetbrains.annotations.NotNull;
2022

21-
import java.util.function.Supplier;
22-
2323
public final class DoubleValue extends DefaultConfigValue<Double> {
2424
private DoubleValue(Supplier<Double> defaultValue) {
2525
super(defaultValue);

config/common/src/main/java/band/kessoku/lib/api/config/values/FloatValue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18+
import java.util.function.Supplier;
19+
1820
import org.jetbrains.annotations.Contract;
1921
import org.jetbrains.annotations.NotNull;
2022

21-
import java.util.function.Supplier;
22-
2323
public final class FloatValue extends DefaultConfigValue<Float> {
2424
private FloatValue(Supplier<Float> defaultValue) {
2525
super(defaultValue);

config/common/src/main/java/band/kessoku/lib/api/config/values/IntegerValue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18+
import java.util.function.Supplier;
19+
1820
import org.jetbrains.annotations.Contract;
1921
import org.jetbrains.annotations.NotNull;
2022

21-
import java.util.function.Supplier;
22-
2323
public final class IntegerValue extends DefaultConfigValue<Integer> {
2424
private IntegerValue(Supplier<Integer> defaultValue) {
2525
super(defaultValue);

config/common/src/main/java/band/kessoku/lib/api/config/values/ListValue.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18+
import java.util.*;
19+
import java.util.function.Supplier;
20+
1821
import com.google.common.collect.ImmutableList;
1922
import org.jetbrains.annotations.Contract;
2023
import org.jetbrains.annotations.NotNull;
2124
import org.jetbrains.annotations.Unmodifiable;
2225

23-
import java.util.*;
24-
import java.util.function.Supplier;
25-
2626
@SuppressWarnings({"rawtypes"})
2727
public final class ListValue<T> extends DefaultConfigValue<List<T>> implements List<T> {
2828
private ListValue(Supplier<List<T>> defaultValue) {

config/common/src/main/java/band/kessoku/lib/api/config/values/LongValue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18+
import java.util.function.Supplier;
19+
1820
import org.jetbrains.annotations.Contract;
1921
import org.jetbrains.annotations.NotNull;
2022

21-
import java.util.function.Supplier;
22-
2323
public final class LongValue extends DefaultConfigValue<Long> {
2424
private LongValue(Supplier<Long> defaultValue) {
2525
super(defaultValue);

config/common/src/main/java/band/kessoku/lib/api/config/values/MapValue.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
*/
1616
package band.kessoku.lib.api.config.values;
1717

18-
import com.google.common.collect.ImmutableMap;
19-
import org.jetbrains.annotations.Contract;
20-
import org.jetbrains.annotations.NotNull;
21-
import org.jetbrains.annotations.Nullable;
22-
import org.jetbrains.annotations.Unmodifiable;
23-
2418
import java.util.Collection;
2519
import java.util.HashMap;
2620
import java.util.Map;
2721
import java.util.Set;
2822
import java.util.function.Supplier;
2923

24+
import com.google.common.collect.ImmutableMap;
25+
import org.jetbrains.annotations.Contract;
26+
import org.jetbrains.annotations.NotNull;
27+
import org.jetbrains.annotations.Nullable;
28+
import org.jetbrains.annotations.Unmodifiable;
29+
3030
public final class MapValue<K, V> extends DefaultConfigValue<Map<K, V>> implements Map<K, V> {
3131
private MapValue(Supplier<Map<K, V>> defaultValue) {
3232
super(defaultValue);

0 commit comments

Comments
 (0)