Merge pull request #202 from MalekiRe/1.17
Rift remover works now, tnt creates rifts
This commit is contained in:
MalekiRe
GitHub
commit
cdc627d55d
4 changed files with 190 additions and 1 deletions
|
|
@ -99,7 +99,7 @@ public final class ModConfig implements ConfigData {
|
|||
public static class General {
|
||||
@Tooltip public double teleportOffset = 0.5;
|
||||
@Tooltip public boolean riftBoundingBoxInCreative;
|
||||
@Tooltip public double riftCloseSpeed = 0.005;
|
||||
@Tooltip public double riftCloseSpeed = 0.01;
|
||||
@Tooltip public double riftGrowthSpeed = 1;
|
||||
@Tooltip public int depthSpreadFactor = 20;
|
||||
@Tooltip public double endermanSpawnChance = 0.001;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@ package org.dimdev.dimdoors.block.door;
|
|||
|
||||
import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.world.explosion.Explosion;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.dimdev.dimdoors.DimensionalDoorsInitializer;
|
||||
import org.dimdev.dimdoors.api.util.math.MathUtil;
|
||||
import org.dimdev.dimdoors.api.util.math.TransformationMatrix3d;
|
||||
|
|
@ -93,6 +95,40 @@ public class DimensionalDoorBlock extends WaterLoggableDoorBlock implements Rift
|
|||
return new EntranceRiftBlockEntity(pos, state);
|
||||
}
|
||||
|
||||
public void createDetachedRift(World world, BlockPos pos) {
|
||||
createDetachedRift(world, pos, world.getBlockState(pos));
|
||||
}
|
||||
|
||||
public void createDetachedRift(World world, BlockPos pos, BlockState state) {
|
||||
DoubleBlockHalf doubleBlockHalf = state.get(HALF);
|
||||
BlockPos blockPos = pos;
|
||||
BlockState blockState = world.getBlockState(pos);
|
||||
BlockEntity blockEntity = world.getBlockEntity(pos);
|
||||
if (doubleBlockHalf == DoubleBlockHalf.UPPER) {
|
||||
blockPos = pos.down();
|
||||
blockState = world.getBlockState(blockPos);
|
||||
blockEntity = world.getBlockEntity(blockPos);
|
||||
}
|
||||
if (blockEntity instanceof EntranceRiftBlockEntity
|
||||
&& blockState.get(HALF) == DoubleBlockHalf.LOWER) {
|
||||
world.setBlockState(blockPos, ModBlocks.DETACHED_RIFT.getDefaultState());
|
||||
((DetachedRiftBlockEntity) world.getBlockEntity(blockPos)).setData(((EntranceRiftBlockEntity) blockEntity).getData());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) {
|
||||
if(world.getBlockState(pos).isAir()) {
|
||||
//LOGGER.log(Level.ERROR, "IS AIR");
|
||||
return;
|
||||
}
|
||||
if(world.isClient()) {
|
||||
return;
|
||||
}
|
||||
//LOGGER.log(Level.ERROR, "WAS DESTROYED BY EXPLOSION");
|
||||
BlockState state = world.getBlockState(pos);
|
||||
super.onDestroyedByExplosion(world, pos, explosion);
|
||||
}
|
||||
@Override
|
||||
public EntranceRiftBlockEntity getRift(World world, BlockPos pos, BlockState state) {
|
||||
BlockEntity bottomEntity;
|
||||
|
|
|
|||
152
src/main/java/org/dimdev/dimdoors/mixin/ExplosionMixin.java
Normal file
152
src/main/java/org/dimdev/dimdoors/mixin/ExplosionMixin.java
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
package org.dimdev.dimdoors.mixin;
|
||||
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectListIterator;
|
||||
import net.minecraft.block.AbstractFireBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.context.LootContext;
|
||||
import net.minecraft.loot.context.LootContextParameters;
|
||||
import net.minecraft.particle.ParticleTypes;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.sound.SoundCategory;
|
||||
import net.minecraft.sound.SoundEvents;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.explosion.Explosion;
|
||||
import net.minecraft.world.explosion.ExplosionBehavior;
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.dimdev.dimdoors.block.RiftProvider;
|
||||
import org.dimdev.dimdoors.block.door.DimensionalDoorBlock;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import static org.dimdev.dimdoors.block.ModBlocks.DETACHED_RIFT;
|
||||
|
||||
@Mixin(Explosion.class)
|
||||
public class ExplosionMixin {
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
@Shadow
|
||||
private static final int field_30960 = 16;
|
||||
@Shadow
|
||||
private boolean createFire;
|
||||
@Shadow
|
||||
private Explosion.DestructionType destructionType;
|
||||
@Shadow
|
||||
private Random random;
|
||||
@Shadow
|
||||
private World world;
|
||||
@Shadow
|
||||
private double x;
|
||||
@Shadow
|
||||
private double y;
|
||||
@Shadow
|
||||
private double z;
|
||||
@Shadow
|
||||
@Nullable
|
||||
private Entity entity;
|
||||
@Shadow
|
||||
private float power;
|
||||
@Shadow
|
||||
private DamageSource damageSource;
|
||||
@Shadow
|
||||
private ExplosionBehavior behavior;
|
||||
@Shadow
|
||||
private List<BlockPos> affectedBlocks;
|
||||
@Shadow
|
||||
private Map<PlayerEntity, Vec3d> affectedPlayers;
|
||||
|
||||
@Shadow
|
||||
private static void tryMergeStack(ObjectArrayList<Pair<ItemStack, BlockPos>> stacks, ItemStack stack, BlockPos pos) {
|
||||
|
||||
}
|
||||
/**
|
||||
* @author - MalekiRe
|
||||
*/
|
||||
@Overwrite
|
||||
public void affectWorld(boolean particles) {
|
||||
if (this.world.isClient) {
|
||||
this.world.playSound(this.x, this.y, this.z, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, (1.0F + (this.world.random.nextFloat() - this.world.random.nextFloat()) * 0.2F) * 0.7F, false);
|
||||
}
|
||||
|
||||
boolean bl = this.destructionType != Explosion.DestructionType.NONE;
|
||||
if (particles) {
|
||||
if (!(this.power < 2.0F) && bl) {
|
||||
this.world.addParticle(ParticleTypes.EXPLOSION_EMITTER, this.x, this.y, this.z, 1.0D, 0.0D, 0.0D);
|
||||
} else {
|
||||
this.world.addParticle(ParticleTypes.EXPLOSION, this.x, this.y, this.z, 1.0D, 0.0D, 0.0D);
|
||||
}
|
||||
}
|
||||
|
||||
if (bl) {
|
||||
ObjectArrayList<Pair<ItemStack, BlockPos>> objectArrayList = new ObjectArrayList();
|
||||
Collections.shuffle(this.affectedBlocks, this.world.random);
|
||||
|
||||
for (BlockPos blockPos : this.affectedBlocks) {
|
||||
BlockState blockState = this.world.getBlockState(blockPos);
|
||||
Block block = blockState.getBlock();
|
||||
if (!blockState.isAir()) {
|
||||
BlockPos blockPos2 = blockPos.toImmutable();
|
||||
this.world.getProfiler().push("explosion_blocks");
|
||||
if (block.shouldDropItemsOnExplosion((Explosion) (Object) this) && this.world instanceof ServerWorld) {
|
||||
//TODO: Change this to work with trapdoors as well, when we implement trapdoors.
|
||||
if (block instanceof DimensionalDoorBlock) {
|
||||
LOGGER.log(Level.INFO, "Creating Detached Rift From Explosion of Door");
|
||||
((DimensionalDoorBlock) block).createDetachedRift(this.world, blockPos2);
|
||||
continue;
|
||||
}
|
||||
else if(world.getBlockState(blockPos2).getBlock() == DETACHED_RIFT) {
|
||||
continue;
|
||||
}
|
||||
BlockEntity blockEntity = blockState.hasBlockEntity() ? this.world.getBlockEntity(blockPos) : null;
|
||||
LootContext.Builder builder = (new LootContext.Builder((ServerWorld) this.world)).random(this.world.random).parameter(LootContextParameters.ORIGIN, Vec3d.ofCenter(blockPos)).parameter(LootContextParameters.TOOL, ItemStack.EMPTY).optionalParameter(LootContextParameters.BLOCK_ENTITY, blockEntity).optionalParameter(LootContextParameters.THIS_ENTITY, this.entity);
|
||||
if (this.destructionType == Explosion.DestructionType.DESTROY) {
|
||||
builder.parameter(LootContextParameters.EXPLOSION_RADIUS, this.power);
|
||||
}
|
||||
|
||||
blockState.getDroppedStacks(builder).forEach((stack) -> {
|
||||
tryMergeStack(objectArrayList, stack, blockPos2);
|
||||
});
|
||||
}
|
||||
|
||||
this.world.setBlockState(blockPos, Blocks.AIR.getDefaultState(), 3);
|
||||
block.onDestroyedByExplosion(this.world, blockPos, (Explosion) (Object) this);
|
||||
this.world.getProfiler().pop();
|
||||
}
|
||||
}
|
||||
|
||||
ObjectListIterator var12 = objectArrayList.iterator();
|
||||
|
||||
while(var12.hasNext()) {
|
||||
Pair<ItemStack, BlockPos> pair = (Pair)var12.next();
|
||||
Block.dropStack(this.world, (BlockPos)pair.getSecond(), (ItemStack)pair.getFirst());
|
||||
}
|
||||
}
|
||||
|
||||
if (this.createFire) {
|
||||
Iterator var11 = this.affectedBlocks.iterator();
|
||||
|
||||
while(var11.hasNext()) {
|
||||
BlockPos blockPos3 = (BlockPos)var11.next();
|
||||
if (this.random.nextInt(3) == 0 && this.world.getBlockState(blockPos3).isAir() && this.world.getBlockState(blockPos3.down()).isOpaqueFullCube(this.world, blockPos3.down())) {
|
||||
this.world.setBlockState(blockPos3, AbstractFireBlock.getState(this.world, blockPos3));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@
|
|||
"BlockBoxMixin",
|
||||
"BlockMixin",
|
||||
"DefaultBiomeFeaturesMixin",
|
||||
"ExplosionMixin",
|
||||
"ExtendedServerPlayNetworkhandlerMixin",
|
||||
"ItemMixin",
|
||||
"ItemMixin$SettingsMixin",
|
||||
|
|
|
|||
Loading…
Reference in a new issue