Skip to content

Commit 2dcfd9d

Browse files
CooStackCooStack
committed
由于之前idea莫名其妙的提示错误问题导致
修改了包名 更改所有barrier相关的名字为Barrage
1 parent 6b40942 commit 2dcfd9d

70 files changed

Lines changed: 624 additions & 484 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: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,88 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
id 'fabric-loom' version '1.10-SNAPSHOT'
5-
id 'maven-publish'
6-
id "org.jetbrains.kotlin.jvm" version "2.1.10"
4+
id 'fabric-loom' version '1.10-SNAPSHOT'
5+
id 'maven-publish'
6+
id "org.jetbrains.kotlin.jvm" version "2.1.20"
77
}
88

99
version = project.mod_version
1010
group = project.maven_group
1111

1212
base {
13-
archivesName = project.archives_base_name
13+
archivesName = project.archives_base_name
1414
}
1515

1616
repositories {
17-
// Add repositories to retrieve artifacts from in here.
18-
// You should only use this when depending on other mods because
19-
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
20-
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
21-
// for more information about repositories.
2217
}
2318

2419
fabricApi {
25-
configureDataGeneration {
26-
client = true
27-
}
20+
configureDataGeneration {
21+
client = true
22+
}
2823
}
2924

3025
dependencies {
31-
// To change the versions see the gradle.properties file
32-
minecraft "net.minecraft:minecraft:${project.minecraft_version}"
33-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
34-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
35-
36-
// Fabric API. This is technically optional, but you probably want it anyway.
37-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
38-
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
26+
// To change the versions see the gradle.properties file
27+
minecraft "net.minecraft:minecraft:${project.minecraft_version}"
28+
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
29+
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
30+
31+
// Fabric API. This is technically optional, but you probably want it anyway.
32+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
33+
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
3934
}
4035

4136
processResources {
42-
inputs.property "version", project.version
37+
inputs.property "version", project.version
4338

44-
filesMatching("fabric.mod.json") {
45-
expand "version": inputs.properties.version
46-
}
39+
filesMatching("fabric.mod.json") {
40+
expand "version": inputs.properties.version
41+
}
4742
}
4843

4944
tasks.withType(JavaCompile).configureEach {
50-
it.options.release = 21
45+
it.options.release = 21
5146
}
5247

5348
tasks.withType(KotlinCompile).configureEach {
54-
kotlinOptions {
55-
jvmTarget = 21
56-
}
49+
kotlinOptions {
50+
jvmTarget = 21
51+
}
5752
}
5853

5954
java {
60-
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
61-
// if it is present.
62-
// If you remove this line, sources will not be generated.
63-
withSourcesJar()
55+
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
56+
// if it is present.
57+
// If you remove this line, sources will not be generated.
58+
withSourcesJar()
6459

65-
sourceCompatibility = JavaVersion.VERSION_21
66-
targetCompatibility = JavaVersion.VERSION_21
60+
sourceCompatibility = JavaVersion.VERSION_21
61+
targetCompatibility = JavaVersion.VERSION_21
6762
}
6863

6964
jar {
70-
inputs.property "archivesName", project.base.archivesName
65+
inputs.property "archivesName", project.base.archivesName
7166

72-
from("LICENSE") {
73-
rename { "${it}_${inputs.properties.archivesName}"}
74-
}
67+
from("LICENSE") {
68+
rename { "${it}_${inputs.properties.archivesName}" }
69+
}
7570
}
7671

7772
// configure the maven publication
7873
publishing {
79-
publications {
80-
create("mavenJava", MavenPublication) {
81-
artifactId = project.archives_base_name
82-
from components.java
83-
}
84-
}
85-
86-
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
87-
repositories {
88-
// Add repositories to publish to here.
89-
// Notice: This block does NOT have the same function as the block in the top level.
90-
// The repositories here will be used for publishing your artifact, not for
91-
// retrieving dependencies.
92-
}
74+
publications {
75+
create("mavenJava", MavenPublication) {
76+
artifactId = project.archives_base_name
77+
from components.java
78+
}
79+
}
80+
81+
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
82+
repositories {
83+
// Add repositories to publish to here.
84+
// Notice: This block does NOT have the same function as the block in the top level.
85+
// The repositories here will be used for publishing your artifact, not for
86+
// retrieving dependencies.
87+
}
9388
}

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ org.gradle.parallel=true
77
minecraft_version=1.21.1
88
yarn_mappings=1.21.1+build.3
99
loader_version=0.16.10
10-
fabric_kotlin_version=1.13.1+kotlin.2.1.10
10+
fabric_kotlin_version=1.13.2+kotlin.2.1.20
1111

1212
# Mod Properties
13-
mod_version=1.42
14-
maven_group=cn.coostack1
13+
mod_version=1.5
14+
maven_group=cn.coostack
1515
archives_base_name=coo-particles-api
1616

1717
# Dependencies

‎src/main/generated/assets/cooparticlesapi/lang/zh_cn.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"item.coo_group": "§b粒子测试分组",
3+
"item.cooparticlesapi.test_barrier_item": "弹幕测试法杖",
4+
"item.cooparticlesapi.test_particle": "测试粒子物品"
5+
}

‎src/main/generated/assets/cooparticlesapi/models/item/test_barrier_item.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "cooparticlesapi:item/test_barrier_item"
5+
}
6+
}

‎src/main/generated/assets/cooparticlesapi/models/item/test_particle.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "cooparticlesapi:item/test_particle"
5+
}
6+
}

src/main/java/cn/coostack/mixin/ParticleManagerMixin.java renamed to src/main/java/cn/coostack/cooparticlesapi/mixin/ParticleManagerMixin.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package cn.coostack.mixin;
1+
package cn.coostack.cooparticlesapi.mixin;
22

33

4-
import cn.coostack.CooParticleAPI;
5-
import cn.coostack.config.APIConfigManager;
4+
import cn.coostack.cooparticlesapi.config.APIConfigManager;
65
import com.google.common.collect.EvictingQueue;
76
import net.minecraft.client.particle.Particle;
87
import net.minecraft.client.particle.ParticleManager;

‎src/main/kotlin/cn/coostack/barriers/BarrierManager.kt‎

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

src/main/kotlin/cn/coostack/CooParticleAPI.kt renamed to src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPI.kt

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
package cn.coostack
1+
package cn.coostack.cooparticlesapi
22

3-
import cn.coostack.barriers.BarrierManager
4-
import cn.coostack.config.APIConfig
5-
import cn.coostack.config.APIConfigManager
6-
import cn.coostack.items.CooItems
7-
import cn.coostack.items.group.CooItemGroup
8-
import cn.coostack.network.packet.PacketParticleGroupS2C
9-
import cn.coostack.network.packet.PacketParticleS2C
10-
import cn.coostack.network.particle.ServerParticleGroup
11-
import cn.coostack.network.particle.ServerParticleGroupManager
12-
import cn.coostack.particles.ControlableParticle
13-
import cn.coostack.particles.control.group.ClientParticleGroupManager
14-
import cn.coostack.particles.control.group.ControlableParticleGroup
15-
import cn.coostack.particles.control.group.ControlableParticleGroupProvider
3+
import cn.coostack.cooparticlesapi.barrages.BarrageManager
4+
import cn.coostack.cooparticlesapi.config.APIConfigManager
5+
import cn.coostack.cooparticlesapi.items.CooItems
6+
import cn.coostack.cooparticlesapi.items.group.CooItemGroup
7+
import cn.coostack.cooparticlesapi.network.packet.PacketParticleGroupS2C
8+
import cn.coostack.cooparticlesapi.network.packet.PacketParticleS2C
9+
import cn.coostack.cooparticlesapi.network.particle.ServerParticleGroupManager
10+
import cn.coostack.cooparticlesapi.network.particle.ServerParticleGroup
11+
import cn.coostack.cooparticlesapi.particles.ControlableParticle
12+
import cn.coostack.cooparticlesapi.particles.control.group.ClientParticleGroupManager
13+
import cn.coostack.cooparticlesapi.particles.control.group.ControlableParticleGroup
14+
import cn.coostack.cooparticlesapi.particles.control.group.ControlableParticleGroupProvider
1615
import net.fabricmc.api.ModInitializer
1716
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
1817
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents
@@ -59,12 +58,12 @@ object CooParticleAPI : ModInitializer {
5958
APIConfigManager.loadConfig()
6059
ServerTickEvents.START_SERVER_TICK.register { _ ->
6160
ServerParticleGroupManager.upgrade()
62-
BarrierManager.doTick()
61+
BarrageManager.doTick()
6362
}
6463
ServerLifecycleEvents.SERVER_STARTED.register { server ->
6564
this.server = server
6665
}
67-
PacketParticleGroupS2C.init()
68-
PacketParticleS2C.init()
66+
PacketParticleGroupS2C.Companion.init()
67+
PacketParticleS2C.Companion.init()
6968
}
7069
}

src/main/kotlin/cn/coostack/CooParticleAPIClient.kt renamed to src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPIClient.kt

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package cn.coostack
1+
package cn.coostack.cooparticlesapi
22

3-
import cn.coostack.network.packet.PacketParticleGroupS2C
4-
import cn.coostack.network.packet.PacketParticleS2C
5-
import cn.coostack.network.packet.client.listener.ClientParticleGroupPacketHandler
6-
import cn.coostack.network.packet.client.listener.ClientParticlePacketHandler
7-
import cn.coostack.particles.ModParticles
8-
import cn.coostack.particles.control.group.ClientParticleGroupManager
9-
import cn.coostack.particles.impl.TestEndRodParticle
10-
import cn.coostack.test.particle.client.ScaleCircleGroupClient
11-
import cn.coostack.test.particle.client.TestGroupClient
12-
import cn.coostack.test.particle.client.BarrierSwordGroupClient
3+
import cn.coostack.cooparticlesapi.network.packet.PacketParticleGroupS2C
4+
import cn.coostack.cooparticlesapi.network.packet.PacketParticleS2C
5+
import cn.coostack.cooparticlesapi.network.packet.client.listener.ClientParticleGroupPacketHandler
6+
import cn.coostack.cooparticlesapi.network.packet.client.listener.ClientParticlePacketHandler
7+
import cn.coostack.cooparticlesapi.particles.ModParticles
8+
import cn.coostack.cooparticlesapi.particles.control.group.ClientParticleGroupManager
9+
import cn.coostack.cooparticlesapi.particles.impl.TestEndRodParticle
10+
import cn.coostack.cooparticlesapi.test.particle.client.BarrierSwordGroupClient
11+
import cn.coostack.cooparticlesapi.test.particle.client.ScaleCircleGroupClient
12+
import cn.coostack.cooparticlesapi.test.particle.client.TestGroupClient
1313
import net.fabricmc.api.ClientModInitializer
1414
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
1515
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientWorldEvents
@@ -44,8 +44,11 @@ object CooParticleAPIClient : ClientModInitializer {
4444

4545

4646
private fun particleGroupPacketListener() {
47-
ClientPlayNetworking.registerGlobalReceiver(PacketParticleGroupS2C.payloadID, ClientParticleGroupPacketHandler)
48-
ClientPlayNetworking.registerGlobalReceiver(PacketParticleS2C.payloadID, ClientParticlePacketHandler)
47+
ClientPlayNetworking.registerGlobalReceiver(
48+
PacketParticleGroupS2C.Companion.payloadID,
49+
ClientParticleGroupPacketHandler
50+
)
51+
ClientPlayNetworking.registerGlobalReceiver(PacketParticleS2C.Companion.payloadID, ClientParticlePacketHandler)
4952
}
5053

5154

src/main/kotlin/cn/coostack/CooParticleAPIDataGenerator.kt renamed to src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPIDataGenerator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package cn.coostack
1+
package cn.coostack.cooparticlesapi
22

3-
import cn.coostack.datagen.LanguageProvider
4-
import cn.coostack.datagen.ItemModelProvider
3+
import cn.coostack.cooparticlesapi.datagen.ItemModelProvider
4+
import cn.coostack.cooparticlesapi.datagen.LanguageProvider
55
import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint
66
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator
77

0 commit comments

Comments
 (0)