MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Menger sponge fix & cleanup

Browse source
This commit is contained in:
paulevsGitch 2021-03-29 12:30:31 +03:00
parent 5e1b661905
commit 9d5957aec6
8 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/ru/betterend/blocks/MengerSpongeWetBlock.java
View file

@ -7,16 +7,18 @@ import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemStack;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.GameRules;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import ru.betterend.blocks.basis.BlockBaseNotFull;
import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable;
@ -79,16 +81,17 @@ public class MengerSpongeWetBlock extends BlockBaseNotFull implements IRenderTyp
}
}
}
/*@Override
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
world.breakBlock(pos, !player.isCreative());
BlocksHelper.setWithUpdate(world, pos, Blocks.AIR);
}*/
@Override
public void onBroken(WorldAccess world, BlockPos pos, BlockState state) {
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
BlocksHelper.setWithUpdate(world, pos, Blocks.AIR);
if (!world.isClient()) {
world.syncWorldEvent(2001, pos, getRawIdFromState(state));
}
if (world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS) && (player == null || !player.isCreative())) {
ItemEntity drop = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, new ItemStack(this));
world.spawnEntity(drop);
}
}
@Override

1
src/main/java/ru/betterend/blocks/entities/EternalPedestalEntity.java
View file

@ -1,6 +1,5 @@
package ru.betterend.blocks.entities;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

2
src/main/java/ru/betterend/blocks/entities/InfusionPedestalEntity.java
View file

@ -1,7 +1,5 @@
package ru.betterend.blocks.entities;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

1
src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java
View file

@ -8,7 +8,6 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.util.Tickable;
import ru.betterend.blocks.basis.PedestalBlock;
import ru.betterend.registry.EndBlockEntities;

3
src/main/java/ru/betterend/mixin/client/ClientPlayNetworkHandlerMixin.java
View file

@ -1,7 +1,5 @@
package ru.betterend.mixin.client;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.util.math.BlockPos;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@ -14,7 +12,6 @@ import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.network.NetworkThreadUtils;
import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
import net.minecraft.util.thread.ThreadExecutor;
import ru.betterend.blocks.entities.ESignBlockEntity;
import ru.betterend.client.gui.BlockSignEditScreen;

1
src/main/java/ru/betterend/registry/EndPortals.java
View file

@ -8,7 +8,6 @@ import com.google.gson.JsonObject;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
import ru.betterend.BetterEnd;
import ru.betterend.config.ConfigWriter;

2
src/main/java/ru/betterend/registry/EndStructures.java
View file

@ -14,8 +14,8 @@ import ru.betterend.world.structures.EndStructureFeature;
import ru.betterend.world.structures.features.EternalPortalStructure;
import ru.betterend.world.structures.features.GiantIceStarStructure;
import ru.betterend.world.structures.features.GiantMossyGlowshroomStructure;
import ru.betterend.world.structures.features.MegaLakeStructure;
import ru.betterend.world.structures.features.MegaLakeSmallStructure;
import ru.betterend.world.structures.features.MegaLakeStructure;
import ru.betterend.world.structures.features.MountainStructure;
import ru.betterend.world.structures.features.PaintedMountainStructure;
import ru.betterend.world.structures.piece.CavePiece;

3
src/main/java/ru/betterend/rituals/EternalRitual.java
View file

@ -5,6 +5,8 @@ import java.util.Objects;
import java.util.Random;
import java.util.Set;
import org.jetbrains.annotations.Nullable;
import com.google.common.collect.Sets;
import net.minecraft.block.Block;
@ -30,7 +32,6 @@ import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.gen.feature.ConfiguredFeatures;
import org.jetbrains.annotations.Nullable;
import ru.betterend.blocks.BlockProperties;
import ru.betterend.blocks.EndPortalBlock;
import ru.betterend.blocks.RunedFlavolite;