From f0266b6a0a74e68ae8ef14b7bd9abac0ed60eb63 Mon Sep 17 00:00:00 2001 From: nitro_dynamite18 Date: Wed, 8 Nov 2023 11:27:42 -0500 Subject: [PATCH 1/3] Sculk Jaw and Sculk Leech drain XP again. Only four points, can be adjusted. --- .../deeperdarker/content/blocks/SculkJawBlock.java | 5 ++--- .../kyanite/deeperdarker/content/entities/SculkLeech.java | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kyanite/deeperdarker/content/blocks/SculkJawBlock.java b/src/main/java/com/kyanite/deeperdarker/content/blocks/SculkJawBlock.java index f19db85bb..11421610b 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/blocks/SculkJawBlock.java +++ b/src/main/java/com/kyanite/deeperdarker/content/blocks/SculkJawBlock.java @@ -35,15 +35,14 @@ public void stepOn(Level pLevel, BlockPos pPos, BlockState pState, Entity pEntit if(pState.getValue(CAN_BITE) && pEntity instanceof LivingEntity entity) { pLevel.setBlock(pPos, pState.setValue(BITING, true), 3); entity.hurt(DDDamageTypes.source(pLevel, DDDamageTypes.JAW, entity, null), 3); + if (pEntity instanceof Player player) player.giveExperiencePoints(-4); pLevel.scheduleTick(pPos, this, 35); } } @Override public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSource pRandom) { - if(pState.getValue(BITING)) { - pLevel.setBlock(pPos, pState.setValue(BITING, false), 3); - } + if(pState.getValue(BITING)) pLevel.setBlock(pPos, pState.setValue(BITING, false), 3); } @Override diff --git a/src/main/java/com/kyanite/deeperdarker/content/entities/SculkLeech.java b/src/main/java/com/kyanite/deeperdarker/content/entities/SculkLeech.java index db1edfa2a..eb047f9d2 100644 --- a/src/main/java/com/kyanite/deeperdarker/content/entities/SculkLeech.java +++ b/src/main/java/com/kyanite/deeperdarker/content/entities/SculkLeech.java @@ -50,6 +50,7 @@ public MobType getMobType() { @Override public boolean doHurtTarget(Entity pEntity) { this.level().broadcastEntityEvent(this, (byte) 4); + if (pEntity instanceof Player player) player.giveExperiencePoints(-4); return super.doHurtTarget(pEntity); } @@ -60,10 +61,7 @@ public void tick() { @Override public void handleEntityEvent(byte pId) { - if(pId == 4) { - this.attackState.start(this.tickCount); - } else { - super.handleEntityEvent(pId); - } + if(pId == 4) this.attackState.start(this.tickCount); + else super.handleEntityEvent(pId); } } From 3030c31d6963b8e398aa40cadad7ae74fa16991d Mon Sep 17 00:00:00 2001 From: nitro_dynamite18 Date: Wed, 8 Nov 2023 11:32:19 -0500 Subject: [PATCH 2/3] Jaw damage type uses its old localization again. --- .../resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 ++-- src/generated/resources/assets/deeperdarker/lang/en_us.json | 2 +- .../deeperdarker/datagen/assets/ENLanguageProvider.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 79a64e596..8b2fbc14a 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2023-11-07T21:37:03.1844117 Languages: en_us -2b01eee16b8bfdae935bede62bf088252e69002f assets/deeperdarker/lang/en_us.json +// 1.20.1 2023-11-08T11:30:36.0106317 Languages: en_us +8e288ae0521b94c76ee68b22e673a257f33497ba assets/deeperdarker/lang/en_us.json diff --git a/src/generated/resources/assets/deeperdarker/lang/en_us.json b/src/generated/resources/assets/deeperdarker/lang/en_us.json index 8a7610751..dcecae9f2 100644 --- a/src/generated/resources/assets/deeperdarker/lang/en_us.json +++ b/src/generated/resources/assets/deeperdarker/lang/en_us.json @@ -146,7 +146,7 @@ "block.deeperdarker.stripped_echo_log": "Stripped Echo Log", "block.deeperdarker.stripped_echo_wood": "Stripped Echo Wood", "block.deeperdarker.unlinked": "Unlinked transmitter", - "death.attack.jaw": "%1$s was trapped by a jaw", + "death.attack.jaw": "%1$s was devoured by a Sculk Jaw", "death.attack.ring": "%1$s heard the ring of %2$s", "effect.deeperdarker.sculk_affinity": "Sculk Affinity", "enchantment.deeperdarker.catalysis": "Catalysis", diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java index 2501dde9f..5aa4cb664 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java @@ -70,7 +70,7 @@ protected void addTranslations() { add("biome." + DeeperDarker.MOD_ID + "." + OthersideBiomes.ECHOING_FOREST.location().getPath(), convertToName(OthersideBiomes.ECHOING_FOREST.location().getPath())); add("biome." + DeeperDarker.MOD_ID + "." + OthersideBiomes.BLOOMING_CAVERNS.location().getPath(), convertToName(OthersideBiomes.BLOOMING_CAVERNS.location().getPath())); add("biome." + DeeperDarker.MOD_ID + "." + OthersideBiomes.OVERCAST_COLUMNS.location().getPath(), convertToName(OthersideBiomes.OVERCAST_COLUMNS.location().getPath())); - add("death.attack.jaw", "%1$s was trapped by a jaw"); + add("death.attack.jaw", "%1$s was devoured by a Sculk Jaw"); add("death.attack.ring", "%1$s heard the ring of %2$s"); add("enchantment." + DeeperDarker.MOD_ID + "." + DDEnchantments.CATALYSIS.getId().getPath() + ".desc", "Spreads sculk when mobs are killed."); add("enchantment." + DeeperDarker.MOD_ID + "." + DDEnchantments.SCULK_SMITE.getId().getPath() + ".desc", "Increases damage against sculk mobs such as Shattered and the Warden."); From cc01ccf56ddec5e9ba6dc346555cecc02b599a27 Mon Sep 17 00:00:00 2001 From: nitro_dynamite18 Date: Wed, 8 Nov 2023 13:11:05 -0500 Subject: [PATCH 3/3] Changed Jaw damage localization again. --- .../resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 ++-- src/generated/resources/assets/deeperdarker/lang/en_us.json | 2 +- .../deeperdarker/datagen/assets/ENLanguageProvider.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 8b2fbc14a..75038db41 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2023-11-08T11:30:36.0106317 Languages: en_us -8e288ae0521b94c76ee68b22e673a257f33497ba assets/deeperdarker/lang/en_us.json +// 1.20.1 2023-11-08T13:02:07.2296776 Languages: en_us +6c2a4764d8e886809f19b9371c056b516eb437ec assets/deeperdarker/lang/en_us.json diff --git a/src/generated/resources/assets/deeperdarker/lang/en_us.json b/src/generated/resources/assets/deeperdarker/lang/en_us.json index dcecae9f2..adc3ce48b 100644 --- a/src/generated/resources/assets/deeperdarker/lang/en_us.json +++ b/src/generated/resources/assets/deeperdarker/lang/en_us.json @@ -146,7 +146,7 @@ "block.deeperdarker.stripped_echo_log": "Stripped Echo Log", "block.deeperdarker.stripped_echo_wood": "Stripped Echo Wood", "block.deeperdarker.unlinked": "Unlinked transmitter", - "death.attack.jaw": "%1$s was devoured by a Sculk Jaw", + "death.attack.jaw": "%1$s was devoured", "death.attack.ring": "%1$s heard the ring of %2$s", "effect.deeperdarker.sculk_affinity": "Sculk Affinity", "enchantment.deeperdarker.catalysis": "Catalysis", diff --git a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java index 5aa4cb664..7247ed6a0 100644 --- a/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java +++ b/src/main/java/com/kyanite/deeperdarker/datagen/assets/ENLanguageProvider.java @@ -70,7 +70,7 @@ protected void addTranslations() { add("biome." + DeeperDarker.MOD_ID + "." + OthersideBiomes.ECHOING_FOREST.location().getPath(), convertToName(OthersideBiomes.ECHOING_FOREST.location().getPath())); add("biome." + DeeperDarker.MOD_ID + "." + OthersideBiomes.BLOOMING_CAVERNS.location().getPath(), convertToName(OthersideBiomes.BLOOMING_CAVERNS.location().getPath())); add("biome." + DeeperDarker.MOD_ID + "." + OthersideBiomes.OVERCAST_COLUMNS.location().getPath(), convertToName(OthersideBiomes.OVERCAST_COLUMNS.location().getPath())); - add("death.attack.jaw", "%1$s was devoured by a Sculk Jaw"); + add("death.attack.jaw", "%1$s was devoured"); add("death.attack.ring", "%1$s heard the ring of %2$s"); add("enchantment." + DeeperDarker.MOD_ID + "." + DDEnchantments.CATALYSIS.getId().getPath() + ".desc", "Spreads sculk when mobs are killed."); add("enchantment." + DeeperDarker.MOD_ID + "." + DDEnchantments.SCULK_SMITE.getId().getPath() + ".desc", "Increases damage against sculk mobs such as Shattered and the Warden.");