0.2.0

LeoMinecraftModding · Dec 9, 2024 · 98db7ba · 98db7ba
1 parent d3fcdff
commit 98db7ba
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false
 }
 
 architectury {

diff --git a/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.21.1	2024-12-07T18:13:58.7388566	Loot Tables
+// 1.21.1	2024-12-08T23:17:54.1310123	Loot Tables
 2b18f4ee4964de853f965809175e41672c73f2a3 data/eternal_starlight/loot_table/blocks/abyssal_fire.json
 188b8614ef4815c81bb45c3a918877795892cf25 data/eternal_starlight/loot_table/blocks/abyssal_geyser.json
 77967e1af1e01fc2bbf8f97dd52c510df8648a4c data/eternal_starlight/loot_table/blocks/abyssal_kelp.json
@@ -576,8 +576,8 @@ f2941c20ed28cc3e2fd901f0a550410a87f80b69 data/eternal_starlight/loot_table/block
 66a535bc690812a6854b5dc925199725d4802ec4 data/eternal_starlight/loot_table/blocks/yellow_yeti_fur.json
 019c8a21885af7e74b31f81187c1fef117ea2d61 data/eternal_starlight/loot_table/blocks/yellow_yeti_fur_carpet.json
 e7a4432f13c78aadaee5cb60b6c6ec9a2131bbf5 data/eternal_starlight/loot_table/bosses/boss_common.json
-813f98ce00e49f0175d7f026a4771d75b7f12d6f data/eternal_starlight/loot_table/bosses/lunar_monstrosity.json
-9b7319ed7a4e7eb97c48bf92bc4132017b5d19ce data/eternal_starlight/loot_table/bosses/starlight_golem.json
+bc2493e565d71ed3e74eba0f15d898e53a8864c3 data/eternal_starlight/loot_table/bosses/lunar_monstrosity.json
+5473339dfc001a271974c32f5b14eae56ca6f613 data/eternal_starlight/loot_table/bosses/starlight_golem.json
 52da11c8fd6b033f3dc6f777959d6b16c137cbb1 data/eternal_starlight/loot_table/bosses/tangled_hatred.json
 5fe4cca36fee9213f0af897597b3911e8d23203c data/eternal_starlight/loot_table/bosses/the_gatekeeper.json
 817f9a82cca0cb3344de3bb32e8bde62c3aae487 data/eternal_starlight/loot_table/chests/cursed_garden.json

diff --git a/...n/src/generated/resources/data/eternal_starlight/loot_table/bosses/lunar_monstrosity.json b/...n/src/generated/resources/data/eternal_starlight/loot_table/bosses/lunar_monstrosity.json
@@ -31,8 +31,8 @@
       ],
       "rolls": {
         "type": "minecraft:uniform",
-        "max": 5.0,
-        "min": 3.0
+        "max": 10.0,
+        "min": 8.0
       }
     },
     {

diff --git a/common/src/generated/resources/data/eternal_starlight/loot_table/bosses/starlight_golem.json b/common/src/generated/resources/data/eternal_starlight/loot_table/bosses/starlight_golem.json
@@ -21,8 +21,8 @@
       ],
       "rolls": {
         "type": "minecraft:uniform",
-        "max": 5.0,
-        "min": 3.0
+        "max": 10.0,
+        "min": 8.0
       }
     },
     {

diff --git a/common/src/main/java/cn/leolezury/eternalstarlight/common/mixin/LivingEntityMixin.java b/common/src/main/java/cn/leolezury/eternalstarlight/common/mixin/LivingEntityMixin.java
@@ -1,10 +1,14 @@
 package cn.leolezury.eternalstarlight.common.mixin;
 
 import cn.leolezury.eternalstarlight.common.item.interfaces.Swingable;
+import cn.leolezury.eternalstarlight.common.network.ParticlePacket;
+import cn.leolezury.eternalstarlight.common.particle.ExplosionShockParticleOptions;
 import cn.leolezury.eternalstarlight.common.particle.GlowParticleOptions;
+import cn.leolezury.eternalstarlight.common.platform.ESPlatform;
 import cn.leolezury.eternalstarlight.common.registry.ESAttributes;
 import cn.leolezury.eternalstarlight.common.registry.ESItems;
 import cn.leolezury.eternalstarlight.common.util.ESTags;
+import cn.leolezury.eternalstarlight.common.vfx.ScreenShakeVfx;
 import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
@@ -19,6 +23,7 @@
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -114,6 +119,12 @@ private void doCrescentSpearDamage() {
 					for (int i = 0; i < 40; i++) {
 						serverLevel.sendParticles(GlowParticleOptions.GLOW, entity.getX() + (entity.getRandom().nextDouble() - 0.5) * entity.getBbWidth() * 2, entity.getRandomY(), entity.getZ() + (entity.getRandom().nextDouble() - 0.5) * entity.getBbWidth() * 2, 3, 0.2, 0.2, 0.2, 0);
 					}
+					for (int i = 0; i < 10; i++) {
+						Vec3 speed = new Vec3((entity.getRandom().nextFloat() - entity.getRandom().nextFloat()) * 0.1F, entity.getRandom().nextFloat() * 0.05F, (entity.getRandom().nextFloat() - entity.getRandom().nextFloat()) * 0.1F).normalize();
+						Vec3 centerPos = entity.position().add(0, entity.getBbHeight() / 2, 0);
+						ESPlatform.INSTANCE.sendToAllClients(serverLevel, new ParticlePacket(ExplosionShockParticleOptions.CRESCENT_SPEAR, centerPos.x + speed.x * 1.5, centerPos.y + speed.y * 1.5, centerPos.z + speed.z * 1.5, speed.x, speed.y, speed.z));
+					}
+					ScreenShakeVfx.createInstance(entity.level().dimension(), entity.position(), 40, 50, 0.12f, 0.24f, 3, 5.5f).send(serverLevel);
 				}
 			}
 		}

diff --git a/...ain/java/cn/leolezury/eternalstarlight/common/particle/ExplosionShockParticleOptions.java b/...ain/java/cn/leolezury/eternalstarlight/common/particle/ExplosionShockParticleOptions.java
@@ -13,6 +13,7 @@
 
 public record ExplosionShockParticleOptions(Vector3f fromColor, Vector3f toColor) implements ParticleOptions {
 	public static final ExplosionShockParticleOptions AETHERSENT = new ExplosionShockParticleOptions(new Vector3f(255, 255, 255), new Vector3f(233, 173, 237));
+	public static final ExplosionShockParticleOptions CRESCENT_SPEAR = new ExplosionShockParticleOptions(new Vector3f(161, 223, 255), new Vector3f(124, 164, 213));
 
 	public static final MapCodec<ExplosionShockParticleOptions> CODEC = RecordCodecBuilder.mapCodec((instance) -> instance.group(
 		ExtraCodecs.VECTOR3F.fieldOf("from_color").forGetter(ExplosionShockParticleOptions::fromColor),

diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx4G
 loom.ignoreDependencyLoomVersionValidation=true
-minecraft_version=1.21.3
+minecraft_version=1.21.4
 enabled_platforms=fabric,neoforge
 archives_base_name=eternalstarlight
-mod_version=0.1.18
+mod_version=0.2.0
 maven_group=cn.leolezury
 fabric_loader_version=0.16.9
-fabric_api_version=0.109.0+1.21.3
-neoforge_version=21.3.35-beta
+fabric_api_version=0.111.0+1.21.4
+neoforge_version=21.4.12-beta
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...a/cn/leolezury/eternalstarlight/neoforge/datagen/provider/loot/ESBossLootSubProvider.java b/...a/cn/leolezury/eternalstarlight/neoforge/datagen/provider/loot/ESBossLootSubProvider.java
@@ -71,7 +71,7 @@ public void generate(BiConsumer<ResourceKey<LootTable>, LootTable.Builder> consu
 				.withPool(LootPool.lootPool()
 					.add(NestedLootTable.lootTableReference(ESLootTables.BOSS_COMMON)))
 				.withPool(LootPool.lootPool()
-					.setRolls(UniformGenerator.between(3, 5))
+					.setRolls(UniformGenerator.between(8, 10))
 					.add(LootItem.lootTableItem(ESItems.OXIDIZED_GOLEM_STEEL_INGOT.get())))
 				.withPool(LootPool.lootPool()
 					.setRolls(ConstantValue.exactly(1))
@@ -99,7 +99,7 @@ public void generate(BiConsumer<ResourceKey<LootTable>, LootTable.Builder> consu
 					.setRolls(ConstantValue.exactly(1))
 					.add(LootItem.lootTableItem(ESItems.MOONRING_BOW.get())))
 				.withPool(LootPool.lootPool()
-					.setRolls(UniformGenerator.between(3, 5))
+					.setRolls(UniformGenerator.between(8, 10))
 					.add(LootItem.lootTableItem(ESItems.TENACIOUS_PETAL.get())))
 				.withPool(LootPool.lootPool()
 					.setRolls(UniformGenerator.between(1, 2))