PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

1.16.2 -> 1.16.4

Browse source
This commit is contained in:
Sollace 2020-12-17 20:17:47 +02:00
parent b560e10a72
commit 22c295f1d6
9 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/UEntities.java
View file

@ -13,7 +13,8 @@ import net.minecraft.util.registry.Registry;
public interface UEntities {
EntityType<MagicProjectileEntity> THROWN_ITEM = register("thrown_item", FabricEntityTypeBuilder.<MagicProjectileEntity>create(SpawnGroup.MISC, MagicProjectileEntity::new)
.trackable(100, 2)
.trackRangeBlocks(100)
.trackedUpdateRate(2)
.dimensions(EntityDimensions.fixed(0.25F, 0.25F)));
static <T extends Entity> EntityType<T> register(String name, FabricEntityTypeBuilder<T> builder) {

4
src/main/java/com/minelittlepony/unicopia/ability/ChangelingFeedAbility.java
View file

@ -20,8 +20,8 @@ import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.entity.mob.HostileEntity;
import net.minecraft.entity.passive.AbstractTraderEntity;
import net.minecraft.entity.passive.CowEntity;
import net.minecraft.entity.passive.MerchantEntity;
import net.minecraft.entity.passive.PigEntity;
import net.minecraft.entity.passive.SheepEntity;
import net.minecraft.entity.player.PlayerEntity;
@ -66,7 +66,7 @@ public class ChangelingFeedAbility implements Ability<Hit> {
private boolean canDrain(Entity e) {
return (e instanceof LivingEntity)
&& (e instanceof CowEntity
|| e instanceof AbstractTraderEntity
|| e instanceof MerchantEntity
|| e instanceof PlayerEntity
|| e instanceof SheepEntity
|| e instanceof PigEntity

2
src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java
View file

@ -168,7 +168,7 @@ public class EarthPonyStompAbility implements Ability<Hit> {
}
private static BlockPos getSolidBlockBelow(BlockPos pos, World w) {
while (!World.isHeightInvalid(pos)) {
while (!World.isOutOfBuildLimitVertically(pos)) {
pos = pos.down();
if (Block.isFaceFullSquare(w.getBlockState(pos).getCollisionShape(w, pos, ShapeContext.absent()), Direction.UP)) {

2
src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
View file

@ -323,7 +323,7 @@ public class Disguise implements NbtSerialisable {
return;
}
if (entity.method_30948()) {
if (entity.isCollidable()) {
output.accept(VoxelShapes.cuboid(entity.getBoundingBox()));
} else if (entity instanceof FallingBlockEntity) {
BlockPos pos = entity.getBlockPos();

6
src/main/java/com/minelittlepony/unicopia/entity/behaviour/TraderBehaviour.java
View file

@ -3,12 +3,12 @@ package com.minelittlepony.unicopia.entity.behaviour;
import com.minelittlepony.unicopia.ability.magic.spell.DisguiseSpell;
import com.minelittlepony.unicopia.entity.player.Pony;
import net.minecraft.entity.passive.AbstractTraderEntity;
import net.minecraft.entity.passive.MerchantEntity;
import net.minecraft.sound.SoundEvents;
public class TraderBehaviour extends EntityBehaviour<AbstractTraderEntity> {
public class TraderBehaviour extends EntityBehaviour<MerchantEntity> {
@Override
public void update(Pony pony, AbstractTraderEntity entity, DisguiseSpell spell) {
public void update(Pony pony, MerchantEntity entity, DisguiseSpell spell) {
if (pony.sneakingChanged() && pony.getMaster().isSneaking()) {
entity.setHeadRollingTimeLeft(40);

10
src/main/java/com/minelittlepony/unicopia/item/UItems.java
View file

@ -60,15 +60,15 @@ public interface UItems {
URecipes.bootstrap();
FabricItemGroupBuilder.create(new Identifier("unicopia", "items")).appendItems(list -> {
list.addAll(VanillaOverrides.REGISTRY.stream().map(Item::getStackForRender).collect(Collectors.toList()));
list.addAll(ITEMS.stream().map(Item::getStackForRender).collect(Collectors.toList()));
}).icon(ZAP_APPLE::getStackForRender).build();
list.addAll(VanillaOverrides.REGISTRY.stream().map(Item::getDefaultStack).collect(Collectors.toList()));
list.addAll(ITEMS.stream().map(Item::getDefaultStack).collect(Collectors.toList()));
}).icon(ZAP_APPLE::getDefaultStack).build();
FabricItemGroupBuilder.create(new Identifier("unicopia", "horsefeed")).appendItems(list -> {
list.addAll(Registry.ITEM.stream()
.filter(item -> item instanceof ToxicHolder && ((ToxicHolder)item).getToxic().isPresent())
.map(Item::getStackForRender)
.map(Item::getDefaultStack)
.collect(Collectors.toList()));
}).icon(ZAP_APPLE::getStackForRender).build();
}).icon(ZAP_APPLE::getDefaultStack).build();
}
}

2
src/main/java/com/minelittlepony/unicopia/item/ZapAppleRecipe.java
View file

@ -30,7 +30,7 @@ public class ZapAppleRecipe extends ShapelessRecipe {
throw new JsonParseException("Too many ingredients for shapeless recipe");
}
ItemStack stack = UItems.ZAP_APPLE.getStackForRender();
ItemStack stack = UItems.ZAP_APPLE.getDefaultStack();
stack.getOrCreateTag().putString("appearance", JsonHelper.getString(json, "appearance"));
return new ZapAppleRecipe(identifier, group, stack, ingredients);

2
src/main/java/com/minelittlepony/unicopia/util/PosHelper.java
View file

@ -24,7 +24,7 @@ public interface PosHelper {
}
static BlockPos findSolidGroundAt(World world, BlockPos pos) {
while ((pos.getY() > 0 || !World.isHeightInvalid(pos))
while ((pos.getY() > 0 || !World.isInBuildLimit(pos))
&& (world.isAir(pos) || !world.getBlockState(pos).canPlaceAt(world, pos))) {
pos = pos.down();
}

4
src/main/java/com/minelittlepony/unicopia/util/RayTraceHelper.java
View file

@ -49,7 +49,7 @@ public class RayTraceHelper {
* @return A Trace describing what was found.
*/
public static Trace doTrace(Entity e, double distance, float tickDelta, Predicate<Entity> predicate) {
HitResult tracedBlock = e.rayTrace(distance, tickDelta, false);
HitResult tracedBlock = e.raycast(distance, tickDelta, false);
final Vec3d start = e.getCameraPosVec(tickDelta);
@ -69,7 +69,7 @@ public class RayTraceHelper {
)) {
Box entityAABB = entity.getBoundingBox().expand(entity.getTargetingMargin());
Optional<Vec3d> intercept = entityAABB.rayTrace(start, end);
Optional<Vec3d> intercept = entityAABB.raycast(start, end);
if (entityAABB.contains(start)) {
if (traceDistance <= 0) {