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

Buckets & entity enhancements, cleanup

Browse source
This commit is contained in:
paulevsGitch 2021-04-19 21:22:11 +03:00
parent 00fd2b6199
commit 3ec2edd6d5
234 changed files with 1988 additions and 1643 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package ru.betterend.entity;
import java.util.List;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
@ -30,7 +31,6 @@ import net.minecraft.world.entity.animal.AbstractSchoolingFish;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.phys.AABB;
@ -49,7 +49,13 @@ public class CubozoaEntity extends AbstractSchoolingFish {
@Override
public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, SpawnGroupData entityData, CompoundTag entityTag) {
SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag);
if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
if (entityTag != null) {
if (entityTag.contains("variant"))
this.entityData.set(VARIANT, entityTag.getByte("variant"));
if (entityTag.contains("scale"))
this.entityData.set(SCALE, entityTag.getByte("scale"));
}
else if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
this.entityData.set(VARIANT, (byte) 1);
}
this.refreshDimensions();
@ -67,7 +73,7 @@ public class CubozoaEntity extends AbstractSchoolingFish {
public void addAdditionalSaveData(CompoundTag tag) {
super.addAdditionalSaveData(tag);
tag.putByte("Variant", (byte) getVariant());
tag.putByte("Scale", (byte) getScale());
tag.putByte("Scale", getByteScale());
}
@Override
@ -80,6 +86,15 @@ public class CubozoaEntity extends AbstractSchoolingFish {
this.entityData.set(SCALE, tag.getByte("Scale"));
}
}
@Override
protected ItemStack getBucketItemStack() {
ItemStack bucket = EndItems.BUCKET_CUBOZOA.getDefaultInstance();
CompoundTag tag = bucket.getOrCreateTag();
tag.putByte("variant", entityData.get(VARIANT));
tag.putByte("scale", entityData.get(SCALE));
return bucket;
}
public static AttributeSupplier.Builder createMobAttributes() {
return LivingEntity.createLivingAttributes()
@ -91,9 +106,13 @@ public class CubozoaEntity extends AbstractSchoolingFish {
public int getVariant() {
return (int) this.entityData.get(VARIANT);
}
public byte getByteScale() {
return this.entityData.get(SCALE);
}
public float getScale() {
return this.entityData.get(SCALE) / 32F + 0.75F;
return getByteScale() / 32F + 0.75F;
}
public static boolean canSpawn(EntityType<CubozoaEntity> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
@ -117,11 +136,6 @@ public class CubozoaEntity extends AbstractSchoolingFish {
}
}
@Override
protected ItemStack getBucketItemStack() {
return new ItemStack(Items.WATER_BUCKET);
}
@Override
protected SoundEvent getFlopSound() {
return SoundEvents.SALMON_FLOP;

3
src/main/java/ru/betterend/entity/DragonflyEntity.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity;
import java.util.EnumSet;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
@ -31,8 +32,6 @@ import net.minecraft.world.level.levelgen.Heightmap.Types;
import net.minecraft.world.level.pathfinder.BlockPathTypes;
import net.minecraft.world.level.pathfinder.Path;
import net.minecraft.world.phys.Vec3;
import ru.betterend.entity.DragonflyEntity.DragonflyLookControl;
import ru.betterend.entity.DragonflyEntity.WanderAroundGoal;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndSounds;
import ru.betterend.util.BlocksHelper;

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

@ -2,6 +2,7 @@ package ru.betterend.entity;
import java.util.List;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
@ -42,7 +43,13 @@ public class EndFishEntity extends AbstractSchoolingFish {
@Override
public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, SpawnGroupData entityData, CompoundTag entityTag) {
SpawnGroupData data = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag);
if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
if (entityTag != null) {
if (entityTag.contains("variant"))
this.entityData.set(VARIANT, entityTag.getByte("variant"));
if (entityTag.contains("scale"))
this.entityData.set(SCALE, entityTag.getByte("scale"));
}
else if (EndBiomes.getFromBiome(world.getBiome(blockPosition())) == EndBiomes.SULPHUR_SPRINGS) {
this.entityData.set(VARIANT, (byte) (random.nextInt(VARIANTS_SULPHUR) + VARIANTS_NORMAL));
}
this.refreshDimensions();
@ -60,7 +67,7 @@ public class EndFishEntity extends AbstractSchoolingFish {
public void addAdditionalSaveData(CompoundTag tag) {
super.addAdditionalSaveData(tag);
tag.putByte("Variant", (byte) getVariant());
tag.putByte("Scale", (byte) getScale());
tag.putByte("Scale", getByteScale());
}
@Override
@ -76,7 +83,11 @@ public class EndFishEntity extends AbstractSchoolingFish {
@Override
protected ItemStack getBucketItemStack() {
return new ItemStack(EndItems.BUCKET_END_FISH);
ItemStack bucket = EndItems.BUCKET_END_FISH.getDefaultInstance();
CompoundTag tag = bucket.getOrCreateTag();
tag.putByte("variant", entityData.get(VARIANT));
tag.putByte("scale", entityData.get(SCALE));
return bucket;
}
@Override
@ -121,8 +132,12 @@ public class EndFishEntity extends AbstractSchoolingFish {
return (int) this.entityData.get(VARIANT);
}
public byte getByteScale() {
return this.entityData.get(SCALE);
}
public float getScale() {
return this.entityData.get(SCALE) / 32F + 0.75F;
return getByteScale() / 32F + 0.75F;
}
public static boolean canSpawn(EntityType<EndFishEntity> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {

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

@ -3,6 +3,7 @@ package ru.betterend.entity;
import java.util.EnumSet;
import java.util.List;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.particles.ParticleOptions;
@ -37,11 +38,6 @@ import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.AABB;
import ru.betterend.entity.EndSlimeEntity.EndSlimeMoveControl;
import ru.betterend.entity.EndSlimeEntity.FaceTowardTargetGoal;
import ru.betterend.entity.EndSlimeEntity.MoveGoal;
import ru.betterend.entity.EndSlimeEntity.RandomLookGoal;
import ru.betterend.entity.EndSlimeEntity.SwimmingGoal;
import ru.betterend.interfaces.ISlime;
import ru.betterend.registry.EndBiomes;
import ru.betterend.util.BlocksHelper;

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

@ -2,6 +2,7 @@ package ru.betterend.entity;
import java.util.List;
import java.util.Random;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.sounds.SoundEvent;

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

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Random;
import org.jetbrains.annotations.Nullable;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Registry;
import net.minecraft.nbt.CompoundTag;
@ -46,9 +47,6 @@ import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import ru.betterend.BetterEnd;
import ru.betterend.blocks.BlockProperties;
import ru.betterend.entity.SilkMothEntity.MothLookControl;
import ru.betterend.entity.SilkMothEntity.ReturnToHiveGoal;
import ru.betterend.entity.SilkMothEntity.WanderAroundGoal;
import ru.betterend.registry.EndBlocks;
import ru.betterend.registry.EndEntities;
import ru.betterend.registry.EndItems;

1
src/main/java/ru/betterend/entity/model/BlockBenchModel.java
View file

@ -1,6 +1,7 @@
package ru.betterend.entity.model;
import java.util.function.Function;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.RenderType;

1
src/main/java/ru/betterend/entity/model/CubozoaEntityModel.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.model;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.Mth;

1
src/main/java/ru/betterend/entity/model/DragonflyEntityModel.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.model;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.RenderType;
import ru.betterend.entity.DragonflyEntity;

1
src/main/java/ru/betterend/entity/model/EndFishEntityModel.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.model;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.RenderType;
import ru.betterend.entity.EndFishEntity;

1
src/main/java/ru/betterend/entity/model/EndSlimeEntityModel.java
View file

@ -3,6 +3,7 @@ package ru.betterend.entity.model;
import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.model.ListModel;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.RenderType;

1
src/main/java/ru/betterend/entity/model/SilkMothEntityModel.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.model;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.Mth;

1
src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.render;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;

1
src/main/java/ru/betterend/entity/render/RendererEntityEndFish.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.render;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;

1
src/main/java/ru/betterend/entity/render/RendererEntityEndSlime.java
View file

@ -2,6 +2,7 @@ package ru.betterend.entity.render;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;