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

Continue

Browse source
This commit is contained in:
Aleksey 2021-04-12 16:41:36 +03:00
parent 33dbfbe633
commit df94a0d12f
13 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/blocks/SilkMothHiveBlock.java
View file

@ -25,7 +25,7 @@ import net.minecraft.world.level.block.Rotation;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;

2
src/main/java/ru/betterend/blocks/SilkMothNestBlock.java
View file

@ -32,7 +32,7 @@ import net.minecraft.world.level.block.Rotation;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShape;

4
src/main/java/ru/betterend/blocks/basis/EndSignBlock.java
View file

@ -5,7 +5,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.world.level.block.AbstractSignBlock; import net.minecraft.world.level.block.SignBlock;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
@ -44,7 +44,7 @@ import ru.betterend.patterns.BlockPatterned;
import ru.betterend.patterns.Patterns; import ru.betterend.patterns.Patterns;
import ru.betterend.util.BlocksHelper; import ru.betterend.util.BlocksHelper;
public class EndSignBlock extends AbstractSignBlock implements BlockPatterned, ISpetialItem { public class EndSignBlock extends SignBlock implements BlockPatterned, ISpetialItem {
public static final IntegerProperty ROTATION = Properties.ROTATION; public static final IntegerProperty ROTATION = Properties.ROTATION;
public static final BooleanProperty FLOOR = BooleanProperty.of("floor"); public static final BooleanProperty FLOOR = BooleanProperty.of("floor");
private static final VoxelShape[] WALL_SHAPES = new VoxelShape[] { private static final VoxelShape[] WALL_SHAPES = new VoxelShape[] {

6
src/main/java/ru/betterend/blocks/entities/render/EndSignBlockEntityRenderer.java
View file

@ -5,7 +5,7 @@ import java.util.List;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.minecraft.world.level.block.AbstractSignBlock; import net.minecraft.world.level.block.SignBlock;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.SignBlock; import net.minecraft.world.level.block.SignBlock;
@ -91,8 +91,8 @@ public class EndSignBlockEntityRenderer extends BlockEntityRenderer<ESignBlockEn
public static SpriteIdentifier getModelTexture(Block block) { public static SpriteIdentifier getModelTexture(Block block) {
SignType signType2; SignType signType2;
if (block instanceof AbstractSignBlock) { if (block instanceof SignBlock) {
signType2 = ((AbstractSignBlock) block).getSignType(); signType2 = ((SignBlock) block).getSignType();
} else { } else {
signType2 = SignType.OAK; signType2 = SignType.OAK;
} }

2
src/main/java/ru/betterend/entity/CubozoaEntity.java
View file

@ -30,7 +30,7 @@ import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvents;
import net.minecraft.tags.FluidTags; import net.minecraft.tags.FluidTags;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.LocalDifficulty; import net.minecraft.world.LocalDifficulty;
import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.ServerLevelAccessor;

2
src/main/java/ru/betterend/entity/EndFishEntity.java
View file

@ -22,7 +22,7 @@ import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvents;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.world.LocalDifficulty; import net.minecraft.world.LocalDifficulty;
import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;

2
src/main/java/ru/betterend/entity/EndSlimeEntity.java
View file

@ -32,7 +32,7 @@ import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.LocalDifficulty; import net.minecraft.world.LocalDifficulty;
import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.ServerLevelAccessor;

2
src/main/java/ru/betterend/entity/ShadowWalkerEntity.java
View file

@ -23,7 +23,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import ru.betterend.registry.EndSounds; import ru.betterend.registry.EndSounds;

2
src/main/java/ru/betterend/entity/SilkMothEntity.java
View file

@ -38,7 +38,7 @@ import net.minecraft.sounds.SoundEvents;
import net.minecraft.state.property.Properties; import net.minecraft.state.property.Properties;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;

2
src/main/java/ru/betterend/integration/byg/features/OldBulbisTreeFeature.java
View file

@ -11,7 +11,7 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.Material;
import com.mojang.math.Vector3f; import com.mojang.math.Vector3f;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.ChunkGenerator;

2
src/main/java/ru/betterend/mixin/common/HostileEntityMixin.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.entity.SpawnReason;
import net.minecraft.world.entity.mob.EndermanEntity; import net.minecraft.world.entity.mob.EndermanEntity;
import net.minecraft.world.entity.mob.HostileEntity; import net.minecraft.world.entity.mob.HostileEntity;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.ServerLevelAccessor;
@Mixin(HostileEntity.class) @Mixin(HostileEntity.class)

4
src/main/java/ru/betterend/util/sdf/SDF.java
View file

@ -15,7 +15,7 @@ import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import ru.betterend.util.BlocksHelper; import ru.betterend.util.BlocksHelper;
import ru.betterend.world.structures.StructureWorld; import ru.betterend.world.structures.StructureWorld;
@ -103,7 +103,7 @@ public abstract class SDF {
} }
} }
public void fillArea(ServerLevelAccessor world, BlockPos center, Box box) { public void fillArea(ServerLevelAccessor world, BlockPos center, AABB box) {
Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap(); Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap();
Map<BlockPos, PosInfo> addInfo = Maps.newHashMap(); Map<BlockPos, PosInfo> addInfo = Maps.newHashMap();

2
src/main/java/ru/betterend/world/features/trees/HelixTreeFeature.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.level.block.state.BlockState;
import com.mojang.math.Vector3f; import com.mojang.math.Vector3f;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos; import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.util.math.Box; import net.minecraft.world.phys.AABB;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.ChunkGenerator;