mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-01 14:12:59 +00:00
Code Issues Releases Wiki Activity

Update to latest Fabric

Browse Source 
- Use Fabric FakePlayer class
 - Remove redundant explosion accessor
This commit is contained in:
Jonathan Coates
2023-05-04 18:47:22 +01:00
parent 34928257c6
commit 232c051526
6 changed files with 7 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
projects/common/src/main/java/dan200/computercraft/mixin/ExplosionAccessor.java
View File

@@ -1,19 +0,0 @@
// SPDX-FileCopyrightText: 2022 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.mixin;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.Explosion;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import javax.annotation.Nullable;
@Mixin(Explosion.class)
public interface ExplosionAccessor {
@Nullable
@Accessor("source")
Entity computercraft$getExploder();
}

3
projects/common/src/main/java/dan200/computercraft/shared/turtle/blocks/TurtleBlock.java
View File

@@ -6,7 +6,6 @@ package dan200.computercraft.shared.turtle.blocks;
import dan200.computercraft.annotations.ForgeOverride;
import dan200.computercraft.api.turtle.TurtleSide;
import dan200.computercraft.mixin.ExplosionAccessor;
import dan200.computercraft.shared.computer.blocks.AbstractComputerBlock;
import dan200.computercraft.shared.computer.blocks.AbstractComputerBlockEntity;
import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -148,7 +147,7 @@ public class TurtleBlock extends AbstractComputerBlock<TurtleBlockEntity> implem
@ForgeOverride
public float getExplosionResistance(BlockState state, BlockGetter world, BlockPos pos, Explosion explosion) {
var exploder = ((ExplosionAccessor) explosion).computercraft$getExploder();
var exploder = explosion.getDirectSourceEntity();
if (getFamily() == ComputerFamily.ADVANCED || exploder instanceof LivingEntity || exploder instanceof AbstractHurtingProjectile) {
return 2000;
}

3
projects/common/src/main/resources/computercraft.mixins.json
View File

@@ -7,8 +7,7 @@
"defaultRequire": 1
},
"mixins": [
"CacheUpdaterMixin",
"ExplosionAccessor"
"CacheUpdaterMixin"
],
"refmap": "computercraft.refmap.json"
}