Skip to content

Commit 32393d8

Browse files
committed
1.20.4
1 parent 7aef39e commit 32393d8

File tree

5 files changed

+6
-21
lines changed

5 files changed

+6
-21
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
include "com.github.Fallen-Breath:conditional-mixin:v0.3.2"
4444

4545
// mods
46-
modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
46+
modImplementation "carpet:fabric-carpet:1.20.3-${project.carpet_core_version}"
4747

4848
// runtime mods
4949
modRuntimeOnly "com.github.Fallen-Breath:lazydfu:a7cfc44c0c" // faster startup

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=1.20.2
7-
yarn_mappings=1.20.2+build.1
6+
minecraft_version=1.20.4
7+
yarn_mappings=1.20.4+build.1
88
loader_version=0.14.9
99
# check available versions on maven for the given minecraft version you are using
1010
# https://masa.dy.fi/maven/carpet/fabric-carpet/
11-
carpet_core_version=1.4.118+v230921
11+
carpet_core_version=1.4.128+v231205
1212

1313
# Mod Properties
1414
mod_version = 2.2.2

src/main/java/me/ivan/ivancarpetaddition/mixins/rule/endLightningRod/EndRodBlockMixin.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import net.minecraft.block.BlockState;
55
import net.minecraft.block.EndRodBlock;
66
import net.minecraft.block.FacingBlock;
7-
import net.minecraft.enchantment.EnchantmentHelper;
87
import net.minecraft.entity.EntityType;
98
import net.minecraft.entity.LightningEntity;
109
import net.minecraft.entity.projectile.ProjectileEntity;
@@ -16,16 +15,15 @@
1615
import org.spongepowered.asm.mixin.Mixin;
1716

1817
@Mixin(EndRodBlock.class)
19-
public class EndRodBlockMixin extends FacingBlock {
18+
public abstract class EndRodBlockMixin extends FacingBlock {
2019
protected EndRodBlockMixin(Settings settings) {
2120
super(settings);
2221
}
2322

2423
@Override
2524
public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) {
2625
if (!IvanCarpetAdditionSettings.endLightningRod) return;
27-
boolean hasChanneling = EnchantmentHelper.hasChanneling(((TridentEntityAccessor) projectile).getTridentStack());
28-
if (world.isThundering() && projectile instanceof TridentEntity && hasChanneling) {
26+
if (world.isThundering() && projectile instanceof TridentEntity && ((TridentEntity) projectile).hasChanneling()) {
2927
BlockPos blockPos = hit.getBlockPos();
3028
if (world.isSkyVisible(blockPos)) {
3129
LightningEntity lightningEntity = EntityType.LIGHTNING_BOLT.create(world);

src/main/java/me/ivan/ivancarpetaddition/mixins/rule/endLightningRod/TridentEntityAccessor.java

-12
This file was deleted.

src/main/resources/ivan-carpet-addition.mixins.json

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"rule.customVersion.ServerMetadataMixin",
2828
"rule.dispensersNotAffectPlayers.ArmorItemMixin",
2929
"rule.endLightningRod.EndRodBlockMixin",
30-
"rule.endLightningRod.TridentEntityAccessor",
3130
"rule.fakePlayerNameRestriction.PlayerCommandMixin",
3231
"rule.fakePlayerNameSuggestions.PlayerCommandMixin",
3332
"rule.flippinCactusSound.BlockRotatorMixin",

0 commit comments

Comments
 (0)