Skip to content

Commit ca24458

Browse files
Luna5amaLuna5ama
authored
[refactor] Source set and packages (#1902)
* Moved all kotlin classes to src/kotlin * Moved installer to new package * Moved KamiMod and Mixin classes to new package * Moved command to new package * Moved events to new package * Moved managers to new package * Moved gui to new package * Moved utils to new package * Moved settings to new package * Moved modules to new package * Fixed utils import * Fixed strings
1 parent 4f3c836 commit ca24458

482 files changed

Lines changed: 2801 additions & 2815 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ minecraft {
7777
client {
7878
workingDirectory project.file('run')
7979

80-
property 'fml.coreMods.load', 'me.zeroeightsix.kami.mixin.MixinLoaderForge'
80+
property 'fml.coreMods.load', 'org.kamiblue.client.mixin.MixinLoaderForge'
8181
property 'mixin.env.disableRefMap', 'true' // Disable refmap so we don't get trolled by Baritone
8282

8383
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
@@ -187,9 +187,9 @@ jar {
187187
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
188188
'TweakOrder': 0,
189189
'FMLCorePluginContainsFMLMod': 'true',
190-
'FMLCorePlugin': 'me.zeroeightsix.kami.mixin.MixinLoaderForge',
190+
'FMLCorePlugin': 'org.kamiblue.client.mixin.MixinLoaderForge',
191191
'ForceLoadAsMod': 'true',
192-
'Main-Class': 'me.zeroeightsix.installer.Installer'
192+
'Main-Class': 'org.kamiblue.client.installer.Installer'
193193
)
194194

195195
// Copy needed libs to jar

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.jvmargs=-Xmx3G
2-
modGroup=me.zeroeightsix
2+
modGroup=org.kamiblue
33
modVersion=2.02.xx-dev
44
kotlin_version=1.4.21
55
kotlinx_coroutines_version=1.4.1

‎scripts/buildJarSafe.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mv "$__named" "$__bad_named" # rename it to include release
4444
# Build release jar with the name without -release
4545
export JAVA_HOME="$JDK_11_HOME"
4646
sudo archlinux-java set java-11-openjdk || exit $?
47-
java -jar "$__d/jar-shrink/jar-shrink.jar" "$__bad_named" -out "$__named" -n -keep "me.zeroeightsix" -keep "baritone" -keep "org.kamiblue" -keep "org.spongepowered"
47+
java -jar "$__d/jar-shrink/jar-shrink.jar" "$__bad_named" -out "$__named" -n -keep "org.kamiblue" -keep "baritone" -keep "org.spongepowered"
4848

4949
rm "$__bad_named" # remove the un-shrunk jar with -release
5050

‎scripts/bumpMajor.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ VERSION="$CUR_R$CUR_M.01"
1818
VERSION_DEV="$CUR_R$CUR_M.xx-dev"
1919

2020
sed -i "s/modVersion=.*/modVersion=$VERSION_DEV/" gradle.properties
21-
sed -i "s/VERSION = \".*\";/VERSION = \"$VERSION_DEV\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
22-
sed -i "s/VERSION_SIMPLE = \".*\";/VERSION_SIMPLE = \"$VERSION_DEV\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
23-
sed -i "s/VERSION_MAJOR = \".*\";/VERSION_MAJOR = \"$VERSION\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
21+
sed -i "s/VERSION = \".*\";/VERSION = \"$VERSION_DEV\";/" src/main/java/org/kamiblue/client/KamiMod.java
22+
sed -i "s/VERSION_SIMPLE = \".*\";/VERSION_SIMPLE = \"$VERSION_DEV\";/" src/main/java/org/kamiblue/client/KamiMod.java
23+
sed -i "s/VERSION_MAJOR = \".*\";/VERSION_MAJOR = \"$VERSION\";/" src/main/java/org/kamiblue/client/KamiMod.java
2424
git commit -am "[bump] Release Major $VERSION"
2525

2626
echo "[bumpMajor] Created commit for version '$VERSION', remember to push!"

‎scripts/bumpVersion.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fi
2929

3030
# Set above information
3131
sed -i "s/modVersion=.*/modVersion=$VERSION/" gradle.properties
32-
sed -i "s/VERSION = \".*\";/VERSION = \"$VERSION\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
33-
sed -i "s/VERSION_SIMPLE = \".*\";/VERSION_SIMPLE = \"$VERSION_SIMPLE\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
34-
sed -i "s/VERSION_MAJOR = \".*\";/VERSION_MAJOR = \"$VERSION_MAJOR\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
35-
sed -i "s/BUILD_NUMBER = .*;/BUILD_NUMBER = $BUILD_NUMBER;/" src/main/java/me/zeroeightsix/kami/KamiMod.java
32+
sed -i "s/VERSION = \".*\";/VERSION = \"$VERSION\";/" src/main/java/org/kamiblue/client/KamiMod.java
33+
sed -i "s/VERSION_SIMPLE = \".*\";/VERSION_SIMPLE = \"$VERSION_SIMPLE\";/" src/main/java/org/kamiblue/client/KamiMod.java
34+
sed -i "s/VERSION_MAJOR = \".*\";/VERSION_MAJOR = \"$VERSION_MAJOR\";/" src/main/java/org/kamiblue/client/KamiMod.java
35+
sed -i "s/BUILD_NUMBER = .*;/BUILD_NUMBER = $BUILD_NUMBER;/" src/main/java/org/kamiblue/client/KamiMod.java

‎src/main/java/me/zeroeightsix/kami/event/events/BaritoneCommandEvent.kt‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/main/java/me/zeroeightsix/kami/event/events/BaritoneSettingsInitEvent.kt‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/main/java/me/zeroeightsix/kami/event/events/PlayerAttackEvent.kt‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/main/java/me/zeroeightsix/kami/event/events/PlayerTravelEvent.kt‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/main/java/me/zeroeightsix/kami/event/events/RenderEvent.kt‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)