PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-04-03 09:45:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Sollace:1.20.1' into 1.20.1

Browse source
This commit is contained in:
LingVarr 2024-03-29 04:08:11 +11:00 • committed by GitHub
commit 55cc580778
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 714 additions and 419 deletions

2
BlockusAddon

@ -1 +1 @@
Subproject commit 7170edad67426756e2383bd9464a8615e9bb4b3a
Subproject commit 2e285380cfa55da1b858c38833f05a56666c219f

23
build.gradle
View file

@ -28,18 +28,13 @@ archivesBaseName = project.name
loom {
mixin.defaultRefmapName = 'unicopia.mixin.refmap.json'
accessWidenerPath = file('src/main/resources/unicopia.aw')
runs {
datagen {
server()
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.modid=unicopia"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
runDir "build/datagen"
}
}
fabricApi {
configureDataGeneration {
modId = 'unicopia'
}
}
//assemble.dependsOn(runDatagen)
reckon {
scopeFromProp()
@ -108,14 +103,6 @@ dependencies {
}
}
sourceSets {
main {
resources {
srcDirs += [ "src/main/generated" ]
}
}
}
processResources {
inputs.property "version", project.version.toString()

11
src/main/java/com/minelittlepony/unicopia/EquineContext.java
View file

@ -25,11 +25,16 @@ public interface EquineContext {
return getCompositeRace().canInteractWithClouds();
}
default boolean hasFeatherTouch() {
return false;
}
static EquineContext of(ShapeContext context) {
if (context == ShapeContext.absent()) {
return Unicopia.SIDE.getPony().map(EquineContext.class::cast).orElse(ABSENT);
}
return context instanceof EquineContext c ? c : ABSENT;
EquineContext result = context instanceof Container c ? c.get() : ABSENT;
return result == null ? ABSENT : result;
}
static EquineContext of(ItemUsageContext context) {
@ -42,4 +47,8 @@ public interface EquineContext {
}
return MoreObjects.firstNonNull(Equine.of(entity).orElse(null), ABSENT);
}
interface Container {
EquineContext get();
}
}

2
src/main/java/com/minelittlepony/unicopia/UConventionalTags.java
View file

@ -19,7 +19,7 @@ public interface UConventionalTags {
TagKey<Item> MUSHROOMS = item("mushrooms");
TagKey<Item> MUFFINS = item("muffins");
TagKey<Item> MANGOES = item("mangoes");
TagKey<Item> OEATMEALS = item("oatmeals");
TagKey<Item> OATMEALS = item("oatmeals");
TagKey<Item> FRUITS = item("fruits");

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

@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.ability.data.Hit;
import com.minelittlepony.unicopia.advancement.UCriteria;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.item.FriendshipBraceletItem;
@ -79,6 +80,7 @@ public class ChangeFormAbility implements Ability<Hit> {
Race actualRace = isTransforming ? target.getSpecies() : Race.UNSET;
target.setSpecies(supressed.or(player.getCompositeRace().potential()));
target.setSuppressedRace(actualRace);
UCriteria.SEAPONY_TRANSITION.trigger(target.asEntity());
}
});

12
src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java
View file

@ -14,12 +14,14 @@ import com.minelittlepony.unicopia.entity.damage.UDamageSources;
import com.minelittlepony.unicopia.particle.ParticleSource;
import com.minelittlepony.unicopia.server.world.Ether;
import com.minelittlepony.unicopia.server.world.ModificationType;
import com.minelittlepony.unicopia.server.world.OfflinePlayerCache;
import com.minelittlepony.unicopia.util.SoundEmitter;
import com.minelittlepony.unicopia.util.VecHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.GameRules;
@ -67,10 +69,18 @@ public interface Caster<E extends Entity> extends
}
if (getMaster() instanceof PlayerEntity player) {
if (!asWorld().canPlayerModifyAt(player, pos)) {
if (!player.canModifyBlocks() || !asWorld().canPlayerModifyAt(player, pos)) {
return false;
}
} else {
if (asWorld() instanceof ServerWorld sw) {
@Nullable
PlayerEntity player = OfflinePlayerCache.getOfflinePlayer(sw, getMasterId().orElse(null));
if (player != null && !player.canModifyBlocks() || !sw.canPlayerModifyAt(player, pos)) {
return false;
}
}
if (!asWorld().getGameRules().getBoolean(GameRules.DO_MOB_GRIEFING)) {
return false;
}

12
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/HydrophobicSpell.java
View file

@ -61,7 +61,9 @@ public class HydrophobicSpell extends AbstractSpell {
storedFluidPositions.removeIf(entry -> {
if (!area.isPointInside(Vec3d.ofCenter(entry.pos()))) {
entry.restore(world);
if (source.canModifyAt(entry.pos())) {
entry.restore(world);
}
return true;
}
@ -72,7 +74,7 @@ public class HydrophobicSpell extends AbstractSpell {
pos = new BlockPos(pos);
BlockState state = world.getBlockState(pos);
if (state.getFluidState().isIn(affectedFluid)) {
if (source.canModifyAt(pos) && state.getFluidState().isIn(affectedFluid)) {
Block block = state.getBlock();
if (block instanceof FluidBlock) {
@ -95,7 +97,7 @@ public class HydrophobicSpell extends AbstractSpell {
source.spawnParticles(new Sphere(true, range), 10, pos -> {
BlockPos bp = BlockPos.ofFloored(pos);
if (source.asWorld().getFluidState(bp.up()).isIn(affectedFluid)) {
if (source.canModifyAt(bp) && source.asWorld().getFluidState(bp.up()).isIn(affectedFluid)) {
source.addParticle(UParticles.RAIN_DROPS, pos, Vec3d.ZERO);
}
});
@ -116,7 +118,9 @@ public class HydrophobicSpell extends AbstractSpell {
protected void onDestroyed(Caster<?> caster) {
Ether.get(caster.asWorld()).remove(this, caster);
storedFluidPositions.removeIf(entry -> {
entry.restore(caster.asWorld());
if (caster.canModifyAt(entry.pos())) {
entry.restore(caster.asWorld());
}
return true;
});
}

3
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/InfernoSpell.java
View file

@ -48,8 +48,9 @@ public class InfernoSpell extends FireSpell {
for (int i = 0; i < radius * 2; i++) {
if (w.random.nextInt(12) == 0) {
Vec3d vec = shape.computePoint(w.random).add(origin);
BlockPos pos = BlockPos.ofFloored(vec);
if (!applyBlocks(w, BlockPos.ofFloored(vec))) {
if (source.canModifyAt(pos) && !applyBlocks(w, pos)) {
applyEntities(source, vec);
}
}

1
src/main/java/com/minelittlepony/unicopia/advancement/UCriteria.java
View file

@ -30,6 +30,7 @@ public interface UCriteria {
CustomEventCriterion.Trigger RIDE_BALLOON = CUSTOM_EVENT.createTrigger("ride_balloon");
CustomEventCriterion.Trigger CONSTRUCT_BALLOON = CUSTOM_EVENT.createTrigger("construct_balloon");
CustomEventCriterion.Trigger TELEPORT_ABOVE_WORLD = CUSTOM_EVENT.createTrigger("teleport_above_world");
CustomEventCriterion.Trigger SEAPONY_TRANSITION = CUSTOM_EVENT.createTrigger("seapony_transition");
static void bootstrap() { }
}

2
src/main/java/com/minelittlepony/unicopia/block/cloud/CloudBlock.java
View file

@ -171,7 +171,7 @@ public class CloudBlock extends Block implements CloudLike {
}
protected boolean canInteract(BlockState state, BlockView world, BlockPos pos, EquineContext context) {
return context.collidesWithClouds();
return context.collidesWithClouds() || context.hasFeatherTouch();
}
@SuppressWarnings("deprecation")

19
src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java
View file

@ -63,24 +63,7 @@ public class CloudPillarBlock extends CloudBlock {
@Override
protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, EquineContext equineContext) {
var axis = state.get(AXIS);
int[] offsets = { axis.choose(1, 0, 0), axis.choose(0, 1, 0), axis.choose(0, 0, 1) };
float capOffset = 11F / 16F;
VoxelShape core = Block.createCuboidShape(
axis.choose(0, 1, 1), axis.choose(1, 0, 1), axis.choose(1, 1, 0),
16 - axis.choose(0, 1, 1), 16 - axis.choose(1, 0, 1), 16 - axis.choose(1, 1, 0)
);
VoxelShape foot = Block.createCuboidShape(0, 0, 0, 16 - (11 * offsets[0]), 16 - (11 * offsets[1]), 16 - (11 * offsets[2]));
VoxelShape cap = foot.offset(capOffset * offsets[0], capOffset * offsets[1], capOffset * offsets[2]);
var temp = new VoxelShape[] {
core,
VoxelShapes.union(core, foot),
VoxelShapes.union(core, cap),
VoxelShapes.union(core, cap, foot)
};
return temp[(state.get(TOP) ? 0 : 2) + (state.get(BOTTOM) ? 0 : 1)];
//return SHAPES.apply(state.get(AXIS))[(state.get(TOP) ? 0 : 2) + (state.get(BOTTOM) ? 0 : 1)];
return SHAPES.apply(state.get(AXIS))[(state.get(TOP) ? 0 : 2) + (state.get(BOTTOM) ? 0 : 1)];
}
@Override

2
src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java
View file

@ -167,8 +167,6 @@ public class WorldRenderDelegate {
return true;
}
pony.updateSupportingEntity();
matrices.push();
Entity owner = pony.asEntity();

168
src/main/java/com/minelittlepony/unicopia/client/render/entity/AirBalloonEntityModel.java
View file

@ -22,54 +22,50 @@ public class AirBalloonEntityModel extends EntityModel<AirBalloonEntity> {
private final List<ModelPart> ropes;
public AirBalloonEntityModel(ModelPart root) {
this.root = root;
isBurner = root.hasChild("burner");
isBalloon = root.hasChild("canopy");
public AirBalloonEntityModel(ModelPart root) {
this.root = root;
isBurner = root.hasChild("burner");
isBalloon = root.hasChild("canopy");
if (isBurner || isBalloon) {
ModelPart part = root.getChild(isBalloon ? "canopy" : "burner");
ropes = List.of(
part.getChild("rope_a"),
part.getChild("rope_b"),
part.getChild("rope_c"),
part.getChild("rope_d")
);
} else {
ropes = List.of();
}
}
if (isBurner || isBalloon) {
ModelPart part = root.getChild(isBalloon ? "canopy" : "burner");
ropes = List.of(part.getChild("rope_a"), part.getChild("rope_b"), part.getChild("rope_c"),
part.getChild("rope_d"));
} else {
ropes = List.of();
}
}
public static TexturedModelData getBasketModelData() {
ModelData modelData = new ModelData();
ModelPartData root = modelData.getRoot();
ModelPartData basket = root.addChild("basket", ModelPartBuilder.create().uv(0, 0).cuboid(-16, -1, -16, 32, 2, 30, Dilation.NONE), ModelTransform.pivot(0, 24, 0));
basket.addChild("walls", ModelPartBuilder.create().uv(0, 66).cuboid(-17, -12, -16, 2, 11, 30, Dilation.NONE)
.uv(64, 68).cuboid(15, -12, -16, 2, 11, 30, Dilation.NONE)
.uv(80, 38).cuboid(-16, -12, -17, 32, 11, 2, Dilation.NONE)
.uv(0, 32).cuboid(8, -12, 13, 8, 11, 2, Dilation.NONE)
.uv(0, 6).cuboid(-16, -12, 13, 8, 11, 2, Dilation.NONE), ModelTransform.NONE);
basket.addChild("rim", ModelPartBuilder.create().uv(40, 34).cuboid(-18, -13, -17, 4, 2, 32, Dilation.NONE)
.uv(0, 32).cuboid(14, -13, -17, 4, 2, 32, Dilation.NONE)
.uv(80, 32).cuboid(-17, -13, -18, 34, 2, 4, Dilation.NONE)
.uv(0, 19).cuboid(7, -13, 12, 10, 2, 4, Dilation.NONE)
.uv(0, 0).cuboid(-17, -13, 12, 10, 2, 4, Dilation.NONE), ModelTransform.NONE);
return TexturedModelData.of(modelData, 256, 128);
}
public static TexturedModelData getBasketModelData() {
ModelData modelData = new ModelData();
ModelPartData root = modelData.getRoot();
ModelPartData basket = root.addChild("basket", ModelPartBuilder.create().uv(0, 0).cuboid(-16, -1, -16, 32, 2, 30, Dilation.NONE), ModelTransform.pivot(0, 24, 0));
basket.addChild("walls", ModelPartBuilder.create().uv(0, 66).cuboid(-17, -12, -16, 2, 11, 30, Dilation.NONE)
.uv(64, 68).cuboid(15, -12, -16, 2, 11, 30, Dilation.NONE)
.uv(80, 38).cuboid(-16, -12, -17, 32, 11, 2, Dilation.NONE)
.uv(0, 32).cuboid(8, -12, 13, 8, 11, 2, Dilation.NONE)
.uv(0, 6).cuboid(-16, -12, 13, 8, 11, 2, Dilation.NONE), ModelTransform.NONE);
basket.addChild("rim", ModelPartBuilder.create().uv(40, 34).cuboid(-18, -13, -17, 4, 2, 32, Dilation.NONE)
.uv(0, 32).cuboid(14, -13, -17, 4, 2, 32, Dilation.NONE)
.uv(80, 32).cuboid(-17, -13, -18, 34, 2, 4, Dilation.NONE)
.uv(0, 19).cuboid(7, -13, 12, 10, 2, 4, Dilation.NONE)
.uv(0, 0).cuboid(-17, -13, 12, 10, 2, 4, Dilation.NONE), ModelTransform.NONE);
return TexturedModelData.of(modelData, 256, 128);
}
public static TexturedModelData getBurnerModelData() {
public static TexturedModelData getBurnerModelData() {
ModelData modelData = new ModelData();
ModelPartData root = modelData.getRoot();
ModelPartData burner = root.addChild("burner", ModelPartBuilder.create().uv(8, 0).cuboid(-6, -47, -6, 11, 15, 11, Dilation.NONE), ModelTransform.pivot(0, 24, 0));
burner.addChild("rope_d", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of(-5, -46, -6, 0.7854F, 0, -0.7854F));
burner.addChild("rope_c", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of(-4, -44, 3, -0.7854F, 0, -0.7854F));
burner.addChild("rope_b", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of( 5, -46, 1, -0.7854F, 0, 0.7854F));
burner.addChild("rope_a", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of( 5, -45, -6, 0.7854F, 0, 0.7854F));
burner.addChild("rope_d", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of(-5, -46, -6, 0.7854F, 0, -0.7854F));
burner.addChild("rope_c", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of(-4, -44, 3, -0.7854F, 0, -0.7854F));
burner.addChild("rope_b", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of(5, -46, 1, -0.7854F, 0, 0.7854F));
burner.addChild("rope_a", ModelPartBuilder.create().cuboid(-2, -68, 0, 2, 68, 2, Dilation.NONE), ModelTransform.of(5, -45, -6, 0.7854F, 0, 0.7854F));
return TexturedModelData.of(modelData, 64, 128);
}
public static TexturedModelData getCanopyModelData() {
public static TexturedModelData getCanopyModelData() {
ModelData modelData = new ModelData();
ModelPartData root = modelData.getRoot();
ModelPartData balloon = root.addChild("canopy", ModelPartBuilder.create().cuboid(-54, -178, -59, 112, 120, 112, Dilation.NONE), ModelTransform.pivot(0, 24, 0));
@ -80,40 +76,82 @@ public class AirBalloonEntityModel extends EntityModel<AirBalloonEntity> {
return TexturedModelData.of(modelData, 512, 256);
}
@Override
public void setAngles(AirBalloonEntity entity, float tickDelta, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
inflation = entity.getInflation(tickDelta);
root.roll = MathHelper.sin((float)(entity.getX() - entity.prevX));
root.pitch = MathHelper.sin((float)(entity.getZ() - entity.prevZ));
@Override
public void setAngles(AirBalloonEntity entity, float tickDelta, float limbSwingAmount, float ageInTicks,
float netHeadYaw, float headPitch) {
inflation = entity.getInflation(tickDelta);
if (isBurner) {
boolean lifted = inflation > 0.8F;
root.pivotY = 32 * (1 - inflation);
root.pivotX = inflation * MathHelper.sin(limbSwingAmount + entity.age / 5F) / 4F;
ropes.forEach(rope -> rope.visible = lifted);
}
if (isBurner || isBalloon) {
root.roll = MathHelper.clamp((float) (entity.getX() - entity.lastRenderX), -0.5F, 0.5F);
root.pitch = MathHelper.clamp((float) (entity.getZ() - entity.lastRenderZ), -0.5F, 0.5F);
if (entity.isLeashed()) {
root.roll *= -1;
root.pitch *= -1;
}
} else {
root.pitch = 0;
root.roll = 0;
}
if (isBalloon) {
root.pivotY = 0;
root.pivotX = inflation * MathHelper.cos(limbSwingAmount + entity.age / 5F) / 4F;
if (entity.getBasketType().isOf(BoatEntity.Type.BAMBOO)) {
ropes.forEach(rope -> rope.pivotY = 0);
} else {
ropes.forEach(ModelPart::resetTransform);
}
}
}
for (ModelPart rope : ropes) {
rope.resetTransform();
}
@Override
public void render(MatrixStack matrices, VertexConsumer vertexConsumer, int light, int overlay, float r, float g, float b, float a) {
if (isBalloon) {
matrices.push();
matrices.translate(0, 1 * (1 - inflation), 0);
if (isBurner) {
boolean lifted = inflation > 0.8F;
root.pivotY = 32 * (1 - inflation);
root.pivotX = inflation * MathHelper.sin(limbSwingAmount + entity.age / 5F) / 4F;
ropes.forEach(rope -> {
rope.visible = lifted;
rope.pitch *= 0.125;
rope.roll *= 0.125;
});
}
if (isBalloon) {
root.pivotY = 0;
root.pivotX = inflation * MathHelper.cos(limbSwingAmount + entity.age / 5F) / 4F;
if (entity.getBasketType().isOf(BoatEntity.Type.BAMBOO)) {
ropes.forEach(rope -> rope.pivotY = 0);
} else {
ropes.forEach(ModelPart::resetTransform);
}
}
for (int i = 0; i < ropes.size(); i++) {
ModelPart rope = ropes.get(i);
float rollRatio = root.roll / rope.roll;
float pitchRatio = root.pitch / rope.pitch;
rope.pivotY -= 5F * rollRatio;
rope.pivotY -= 5F * pitchRatio;
if (i == 0 || i == 3) {
rope.pivotZ -= 5 * pitchRatio;
}
if (i == 2 || i == 1) {
rope.pivotZ += 5 * pitchRatio;
}
if (i == 2 || i == 3) {
rope.pivotX -= 5 * rollRatio;
}
if (i == 0 || i == 1) {
rope.pivotX += 5 * rollRatio;
}
}
}
@Override
public void render(MatrixStack matrices, VertexConsumer vertexConsumer, int light, int overlay, float r, float g, float b, float a) {
if (isBalloon) {
matrices.push();
matrices.translate(0, 1 * (1 - inflation), 0);
matrices.scale(1, MathHelper.lerp(inflation, -0.05F, 1), 1);
root.render(matrices, vertexConsumer, light, overlay, r, g, b, a);
matrices.pop();
} else {
root.render(matrices, vertexConsumer, light, overlay, r, g, b, a);
}
}
}
}

5
src/main/java/com/minelittlepony/unicopia/datagen/providers/AdvancementDisplayBuilder.java
View file

@ -76,6 +76,11 @@ public class AdvancementDisplayBuilder {
return this;
}
public AdvancementDisplayBuilder doNotAnnounce() {
this.announce = false;
return this;
}
public AdvancementDisplayBuilder group(String group) {
this.group = group;
return this;

94
src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
View file

@ -51,57 +51,21 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
createTribeRootAdvancement(consumer, root, Race.EARTH).children(consumer, this::generateEarthTribeAdvancementsTree);
createTribeRootAdvancement(consumer, root, Race.BAT).children(consumer, this::generateBatTribeAdvancementsTree);
createTribeRootAdvancement(consumer, root, Race.PEGASUS).children(consumer, this::generatePegasusTribeAdvancementsTree);
createTribeRootAdvancement(consumer, root, Race.UNICORN).children(consumer, this::generateUnicornTribeAdvancementsTree);
root.child(UItems.DRAGON_BREATH_SCROLL).showToast().announce().criterion("has_scroll", hasItems(UItems.DRAGON_BREATH_SCROLL)).build(consumer, "take_a_note").children(p -> {
p.child(UItems.DRAGON_BREATH_SCROLL).criterion("send_book", dragonScroll(false, Items.WRITTEN_BOOK)).build(consumer, "dear_princess")
.child(UItems.DRAGON_BREATH_SCROLL).criterion("send_scroll", dragonScroll(false, UItems.DRAGON_BREATH_SCROLL)).build(consumer, "i_await_your_reply");
p.child(UItems.IMPORTED_OATS).hidden().frame(AdvancementFrame.CHALLENGE)
.criterion("send_oats", dragonScroll(false, UItems.OATS, UItems.IMPORTED_OATS))
.criterion("receieve_oats", dragonScroll(true, UItems.IMPORTED_OATS))
.criteriaMerger(CriterionMerger.OR).build(consumer, "imported_oats");
p.child(Items.CHIPPED_ANVIL).hidden().frame(AdvancementFrame.CHALLENGE).criterion("ding_sun", dingCelestia(Set.of(), Set.of(Race.BAT))).build(consumer, "blasphemy");
p.child(Items.CHIPPED_ANVIL).hidden().frame(AdvancementFrame.CHALLENGE).criterion("ding_sun", dingCelestia(Set.of(Race.BAT), Set.of())).build(consumer, "sweet_sweet_revenge");
});
root.child(UItems.OATS).showToast().announce().criterion("has_oats", hasItems(UItems.OATS)).build(consumer, "oats_so_easy");
root.child(Items.HAY_BLOCK).showToast().announce().criterion("eat_hay", ConsumeItemCriterion.Conditions.item(Items.HAY_BLOCK)).build(consumer, "what_the_hay");
root.child(UItems.COPPER_HORSE_SHOE).showToast().announce().criterion("has_horseshoe", hasItems(UTags.HORSE_SHOES)).build(consumer, "blacksmith").children(p -> {
p.child(UItems.IRON_HORSE_SHOE).criterion("has_iron_horseshoe", hasItems(UItems.IRON_HORSE_SHOE)).build(consumer, "change_of_shoes")
.child(UItems.GOLDEN_HORSE_SHOE).criterion("has_gold_horseshoe", hasItems(UItems.GOLDEN_HORSE_SHOE)).build(consumer, "fashionably_expensive")
.child(UItems.NETHERITE_HORSE_SHOE).criterion("has_netherite_horseshoe", hasItems(UItems.NETHERITE_HORSE_SHOE)).build(consumer, "overkill");
p.child(UItems.IRON_HORSE_SHOE).hidden().frame(AdvancementFrame.CHALLENGE).criterion("killed_entity_with_horseshoe", killWithItems(UTags.FROM_HORSESHOES)).build(consumer, "dead_ringer");
});
root.child(UItems.PINECONE).showToast().announce().frame(AdvancementFrame.CHALLENGE).criterion("eat_pinecone", ConsumeItemCriterion.Conditions.item(UItems.PINECONE)).build(consumer, "eat_pinecone");
root.child(UItems.OAK_BASKET).showToast().criterion("has_basket", hasItems(UTags.BASKETS)).build(consumer, "basket_case")
.child(Items.LANTERN).showToast().criterion("construct_balloon", CustomEventCriterion.create("construct_balloon")).build(consumer, "aeronaut")
.child(UItems.GIANT_BALLOON).showToast().announce().frame(AdvancementFrame.CHALLENGE).criterion("ride_balloon", CustomEventCriterion.create("ride_balloon")).build(consumer, "travelling_in_style");
root.child(UItems.MUFFIN).showToast().announce().hidden().criterion("has_muffin", hasItems(UItems.MUFFIN)).build(consumer, "baked_bads");
root.child(UItems.HORSE_SHOE_FRIES).showToast().announce().criterion("has_horse_shoe_fries", hasItems(UItems.HORSE_SHOE_FRIES)).build(consumer, "lucky");
root.child(UItems.TOAST).showToast().announce().criterion("has_toast", hasItems(UItems.TOAST)).build(consumer, "toast")
.child(UItems.BURNED_TOAST).hidden().criterion("has_burned_toast", hasItems(UItems.BURNED_TOAST)).build(consumer, "burn_toast");
root.child(UItems.GREEN_APPLE).showToast().announce().criterion("has_apple", hasItems(UTags.FRESH_APPLES)).build(consumer, "apple_route").children(p -> {
p.child(UItems.SWEET_APPLE).criterion("has_all_apples", hasItems(Items.APPLE, UItems.GREEN_APPLE, UItems.SWEET_APPLE, UItems.SOUR_APPLE, UItems.ROTTEN_APPLE, UItems.ZAP_APPLE, UItems.COOKED_ZAP_APPLE, Items.GOLDEN_APPLE)).build(consumer, "sweet_apple_acres");
p.child(UItems.ZAP_BULB).criterion("has_zap_apple", hasItems(UItems.ZAP_APPLE)).build(consumer, "trick_apple").children(pp -> {
pp.child(UItems.ZAP_APPLE).hidden().criterion("eat_trick_apple", CustomEventCriterion.createFlying("eat_trick_apple")).build(consumer, "eat_trick_apple");
pp.child(UItems.ZAP_APPLE).hidden().criterion("feed_trick_apple", CustomEventCriterion.createFlying("feed_trick_apple")).build(consumer, "feed_trick_apple");
});
p.child(UItems.JUICE).criterion("has_juice", hasItems(UItems.JUICE)).build(consumer, "juice")
.child(UItems.BURNED_JUICE).hidden().criterion("has_burned_juice", hasItems(UItems.BURNED_JUICE)).build(consumer, "burn_juice")
.child(UItems.CIDER).visible().criterion("has_cider", hasItems(UItems.CIDER)).rewards(AdvancementRewards.Builder.experience(12)).build(consumer, "brew_cider");
});
createTribeRootAdvancement(consumer, root, Race.UNICORN, Race.ALICORN).children(consumer, this::generateUnicornTribeAdvancementsTree);
createTribeRootAdvancement(consumer, root, Race.HIPPOGRIFF, Race.SEAPONY).children(consumer, this::generateHippogrifTribeAdvancementsTree);
});
generateEnchantmentsAdvancementsTree(consumer);
}
private AdvancementDisplayBuilder.Parent createTribeRootAdvancement(Consumer<Advancement> consumer, AdvancementDisplayBuilder.Parent root, Race race) {
private AdvancementDisplayBuilder.Parent createTribeRootAdvancement(Consumer<Advancement> consumer, AdvancementDisplayBuilder.Parent root, Race race, Race...extra) {
AdvancementDisplayBuilder builder = root.child(Registries.ITEM.get(race.getId().withSuffixedPath("_badge"))).showToast().announce().group(race.getId().getPath())
.criterion("be_" + race.getId().getPath(), new RaceChangeCriterion.Conditions(LootContextPredicate.EMPTY, race));
if (race == Race.UNICORN) {
builder
.criterion("be_alicorn", new RaceChangeCriterion.Conditions(LootContextPredicate.EMPTY, Race.ALICORN))
.criteriaMerger(CriterionMerger.OR);
if (extra.length > 0) {
for (Race r : extra) {
builder.criterion("be_" + r.getId().getPath(), new RaceChangeCriterion.Conditions(LootContextPredicate.EMPTY, r));
}
}
return builder.build(consumer, race.getId().getPath() + "_route");
@ -112,6 +76,33 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
p.child(UItems.PEBBLES).criterion("killed_entity_with_rock", killWithItems(UTags.FROM_ROCKS)).build(consumer, "sticks_and_stones");
p.child(UItems.WEIRD_ROCK).hidden().criterion("has_rock", hasItems(UItems.WEIRD_ROCK)).build(consumer, "thats_unusual");
});
parent.child(UItems.OATS).criterion("has_oats", hasItems(UItems.OATS)).build(consumer, "oats_so_easy");
parent.child(Items.HAY_BLOCK).criterion("eat_hay", ConsumeItemCriterion.Conditions.item(Items.HAY_BLOCK)).build(consumer, "what_the_hay");
parent.child(UItems.COPPER_HORSE_SHOE).criterion("has_horseshoe", hasItems(UTags.HORSE_SHOES)).build(consumer, "blacksmith").children(p -> {
p.child(UItems.IRON_HORSE_SHOE).criterion("has_iron_horseshoe", hasItems(UItems.IRON_HORSE_SHOE)).build(consumer, "change_of_shoes")
.child(UItems.GOLDEN_HORSE_SHOE).criterion("has_gold_horseshoe", hasItems(UItems.GOLDEN_HORSE_SHOE)).build(consumer, "fashionably_expensive")
.child(UItems.NETHERITE_HORSE_SHOE).criterion("has_netherite_horseshoe", hasItems(UItems.NETHERITE_HORSE_SHOE)).build(consumer, "overkill");
p.child(UItems.IRON_HORSE_SHOE).hidden().frame(AdvancementFrame.CHALLENGE).criterion("killed_entity_with_horseshoe", killWithItems(UTags.FROM_HORSESHOES)).build(consumer, "dead_ringer");
});
parent.child(UItems.PINECONE).frame(AdvancementFrame.CHALLENGE).criterion("eat_pinecone", ConsumeItemCriterion.Conditions.item(UItems.PINECONE)).build(consumer, "eat_pinecone");
parent.child(UItems.OAK_BASKET).doNotAnnounce().criterion("has_basket", hasItems(UTags.BASKETS)).build(consumer, "basket_case")
.child(Items.LANTERN).criterion("construct_balloon", CustomEventCriterion.create("construct_balloon")).build(consumer, "aeronaut")
.child(UItems.GIANT_BALLOON).announce().frame(AdvancementFrame.CHALLENGE).criterion("ride_balloon", CustomEventCriterion.create("ride_balloon")).build(consumer, "travelling_in_style");
parent.child(UItems.MUFFIN).hidden().criterion("has_muffin", hasItems(UItems.MUFFIN)).build(consumer, "baked_bads");
parent.child(UItems.HORSE_SHOE_FRIES).criterion("has_horse_shoe_fries", hasItems(UItems.HORSE_SHOE_FRIES)).build(consumer, "lucky");
parent.child(UItems.TOAST).criterion("has_toast", hasItems(UItems.TOAST)).build(consumer, "toast")
.child(UItems.BURNED_TOAST).hidden().criterion("has_burned_toast", hasItems(UItems.BURNED_TOAST)).build(consumer, "burn_toast");
parent.child(UItems.GREEN_APPLE).criterion("has_apple", hasItems(UTags.FRESH_APPLES)).build(consumer, "apple_route").children(p -> {
p.child(UItems.SWEET_APPLE).criterion("has_all_apples", hasItems(Items.APPLE, UItems.GREEN_APPLE, UItems.SWEET_APPLE, UItems.SOUR_APPLE, UItems.ROTTEN_APPLE, UItems.ZAP_APPLE, UItems.COOKED_ZAP_APPLE, Items.GOLDEN_APPLE)).build(consumer, "sweet_apple_acres");
p.child(UItems.ZAP_BULB).criterion("has_zap_apple", hasItems(UItems.ZAP_APPLE)).build(consumer, "trick_apple").children(pp -> {
pp.child(UItems.ZAP_APPLE).hidden().criterion("eat_trick_apple", CustomEventCriterion.createFlying("eat_trick_apple")).build(consumer, "eat_trick_apple");
pp.child(UItems.ZAP_APPLE).hidden().criterion("feed_trick_apple", CustomEventCriterion.createFlying("feed_trick_apple")).build(consumer, "feed_trick_apple");
});
p.child(UItems.JUICE).criterion("has_juice", hasItems(UItems.JUICE)).build(consumer, "juice")
.child(UItems.BURNED_JUICE).hidden().criterion("has_burned_juice", hasItems(UItems.BURNED_JUICE)).build(consumer, "burn_juice")
.child(UItems.CIDER).visible().criterion("has_cider", hasItems(UItems.CIDER)).rewards(AdvancementRewards.Builder.experience(12)).build(consumer, "brew_cider");
});
}
private void generatePegasusTribeAdvancementsTree(Consumer<Advancement> consumer, AdvancementDisplayBuilder.Parent parent) {
@ -168,6 +159,17 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
p.child(Items.WATER_BUCKET).criterion("split_sea", CustomEventCriterion.create("split_sea")).rewards(AdvancementRewards.Builder.experience(105)).build(consumer, "split_the_sea");
});
parent.child(UItems.DRAGON_BREATH_SCROLL).showToast().announce().criterion("has_scroll", hasItems(UItems.DRAGON_BREATH_SCROLL)).build(consumer, "take_a_note").children(p -> {
p.child(UItems.DRAGON_BREATH_SCROLL).criterion("send_book", dragonScroll(false, Items.WRITTEN_BOOK)).build(consumer, "dear_princess")
.child(UItems.DRAGON_BREATH_SCROLL).criterion("send_scroll", dragonScroll(false, UItems.DRAGON_BREATH_SCROLL)).build(consumer, "i_await_your_reply");
p.child(UItems.IMPORTED_OATS).hidden().frame(AdvancementFrame.CHALLENGE)
.criterion("send_oats", dragonScroll(false, UItems.OATS, UItems.IMPORTED_OATS))
.criterion("receieve_oats", dragonScroll(true, UItems.IMPORTED_OATS))
.criteriaMerger(CriterionMerger.OR).build(consumer, "imported_oats");
p.child(Items.CHIPPED_ANVIL).hidden().frame(AdvancementFrame.CHALLENGE).criterion("ding_sun", dingCelestia(Set.of(), Set.of(Race.BAT))).build(consumer, "blasphemy");
p.child(Items.CHIPPED_ANVIL).hidden().frame(AdvancementFrame.CHALLENGE).criterion("ding_sun", dingCelestia(Set.of(Race.BAT), Set.of())).build(consumer, "sweet_sweet_revenge");
});
parent.child(UItems.PEGASUS_AMULET).hidden().frame(AdvancementFrame.CHALLENGE).criterion("teleport_above_world", CustomEventCriterion.create("teleport_above_world")).rewards(AdvancementRewards.Builder.experience(100)).build(consumer, "a_falling_wizard");
}
@ -181,6 +183,12 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
});
}
private void generateHippogrifTribeAdvancementsTree(Consumer<Advancement> consumer, AdvancementDisplayBuilder.Parent parent) {
parent.child(UItems.BAITED_FISHING_ROD).showToast().announce().criterion("has_baited_fishing_rod", hasItems(UItems.BAITED_FISHING_ROD)).build(consumer, "bait");
parent.child(UItems.PEARL_NECKLACE).showToast().announce().criterion("seapony_transition", new CustomEventCriterion.Conditions(LootContextPredicate.EMPTY, "seapony_transition", RacePredicate.of(Set.of(Race.SEAPONY), Set.of()), null, 1)).build(consumer, "shoo_be_doo")
.child(UItems.PEARL_NECKLACE).showToast().announce().criterion("seapony_transition", new CustomEventCriterion.Conditions(LootContextPredicate.EMPTY, "seapony_transition", RacePredicate.of(Set.of(), Set.of(Race.SEAPONY)), null, 1)).build(consumer, "shoo_be_done");
}
private void generateEnchantmentsAdvancementsTree(Consumer<Advancement> consumer) {
AdvancementDisplayBuilder.create(Items.NETHERITE_SCRAP).showToast().announce()
.criterion("enchant_with_consumption", enchant(UEnchantments.CONSUMPTION))

2
src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java
View file

@ -169,7 +169,7 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider {
getOrCreateTagBuilder(UConventionalTags.SEEDS).add(Items.BEETROOT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS, Items.TORCHFLOWER_SEEDS, Items.WHEAT_SEEDS)
.add(UItems.OAT_SEEDS)
.forceAddTag(UTags.APPLE_SEEDS);
getOrCreateTagBuilder(UConventionalTags.OEATMEALS).add(UItems.OATMEAL);
getOrCreateTagBuilder(UConventionalTags.OATMEALS).add(UItems.OATMEAL);
getOrCreateTagBuilder(UConventionalTags.GRAIN).add(Items.WHEAT, UItems.OATS);
getOrCreateTagBuilder(UConventionalTags.NUTS).addOptionalTag(UConventionalTags.CROPS_PEANUTS);

4
src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java
View file

@ -19,6 +19,7 @@ import net.minecraft.item.Items;
import net.minecraft.registry.Registries;
import net.minecraft.data.client.ItemModelGenerator;
import net.minecraft.data.client.ModelIds;
import net.minecraft.data.client.Models;
import net.minecraft.data.client.TextureKey;
import net.minecraft.data.client.TextureMap;
@ -133,5 +134,8 @@ public class UModelProvider extends FabricModelProvider {
.addOverride(ModelIds.getItemSubModelId(UItems.GEMSTONE, "_pure"), "affinity", 0)
.addOverride(ModelIds.getItemSubModelId(UItems.GEMSTONE, "_corrupted"), "affinity", 1)
.upload(UItems.GEMSTONE, itemModelGenerator);
// fishing rod
ItemModels.register(itemModelGenerator, Models.HANDHELD_ROD, UItems.BAITED_FISHING_ROD);
}
}

15
src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/URecipeProvider.java
View file

@ -462,6 +462,12 @@ public class URecipeProvider extends FabricRecipeProvider {
// worms
offerReversibleCompactingRecipes(exporter, RecipeCategory.BUILDING_BLOCKS, UItems.WHEAT_WORMS, RecipeCategory.BUILDING_BLOCKS, UBlocks.WORM_BLOCK);
// fishing
ShapelessRecipeJsonBuilder.create(RecipeCategory.TOOLS, UItems.BAITED_FISHING_ROD)
.input(Items.FISHING_ROD).criterion(hasItem(Items.FISHING_ROD), conditionsFromItem(Items.FISHING_ROD))
.input(UItems.WHEAT_WORMS)
.group("fishing_rod")
.offerTo(exporter);
// utility
ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, Items.DIRT)
@ -473,6 +479,15 @@ public class URecipeProvider extends FabricRecipeProvider {
offerShapelessRecipe(exporter, Items.BONE_MEAL, UTags.SHELLS, "bonemeal", 3);
// pegasus feathers for non pegasi
ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, UItems.PEGASUS_FEATHER)
.input('*', Items.GHAST_TEAR).criterion("has_ghast_tear", conditionsFromItem(Items.GHAST_TEAR))
.input('#', UItems.GRYPHON_FEATHER).criterion("has_feather", conditionsFromItem(UItems.GRYPHON_FEATHER))
.pattern("***")
.pattern("*#*")
.pattern("***")
.offerTo(exporter);
offer2x2CompactingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, Items.COBBLESTONE, UItems.ROCK);
offerReversibleCompactingRecipesWithReverseRecipeGroup(exporter, RecipeCategory.MISC, UItems.PEBBLES, RecipeCategory.BUILDING_BLOCKS, Blocks.GRAVEL, convertBetween(UItems.PEBBLES, Blocks.GRAVEL), "pebbles");
offerShapelessRecipe(exporter, UItems.PEBBLES, Blocks.SUSPICIOUS_GRAVEL, "pebbles", 9);

128
src/main/java/com/minelittlepony/unicopia/entity/Living.java
View file

@ -20,7 +20,6 @@ import com.minelittlepony.unicopia.advancement.UCriteria;
import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate;
import com.minelittlepony.unicopia.entity.behaviour.EntityAppearance;
import com.minelittlepony.unicopia.entity.behaviour.Guest;
import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity;
import com.minelittlepony.unicopia.entity.damage.MagicalDamageSource;
import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck;
import com.minelittlepony.unicopia.entity.effect.CorruptInfluenceStatusEffect;
@ -31,6 +30,7 @@ import com.minelittlepony.unicopia.input.Heuristic;
import com.minelittlepony.unicopia.input.Interactable;
import com.minelittlepony.unicopia.item.GlassesItem;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.item.enchantment.UEnchantments;
import com.minelittlepony.unicopia.network.datasync.EffectSync;
import com.minelittlepony.unicopia.network.datasync.Transmittable;
import com.minelittlepony.unicopia.particle.ParticleUtils;
@ -67,7 +67,6 @@ import net.minecraft.sound.SoundCategory;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
@ -88,14 +87,6 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
private boolean invisible = false;
@Nullable
private Entity supportingEntity;
@Nullable
private Vec3d supportPositionOffset;
private int ticksOutsideVehicle;
private int ticksInVehicle;
@Nullable
private Caster<?> attacker;
@Nullable
@ -109,6 +100,8 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
private final Enchantments enchants = addTicker(new Enchantments(this));
private final ItemTracker armour = addTicker(new ItemTracker(this));
//private final Transportation<T> transportation = new Transportation<>(this);
private final Transportation<T> transportation = new Transportation<>(this);
protected Living(T entity, TrackedData<NbtCompound> effect) {
this.entity = entity;
@ -171,6 +164,10 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
return armour;
}
public Transportation<T> getTransportation() {
return transportation;
}
@Override
public final T asEntity() {
return entity;
@ -202,71 +199,9 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
return vehicle != null && getCarrierId().filter(vehicle.getUuid()::equals).isPresent();
}
public boolean setSupportingEntity(@Nullable Entity supportingEntity) {
this.supportingEntity = supportingEntity;
if (supportingEntity != null) {
ticksOutsideVehicle = 0;
}
return true;
}
@Nullable
public Entity getSupportingEntity() {
return supportingEntity;
}
public int getTicksInVehicle() {
return ticksInVehicle;
}
public void setPositionOffset(@Nullable Vec3d positionOffset) {
this.supportPositionOffset = positionOffset;
}
public void updatePositionOffset() {
setPositionOffset(supportingEntity == null ? null : entity.getPos().subtract(supportingEntity.getPos()));
}
public void updateRelativePosition(Box box) {
if (supportingEntity == null || supportPositionOffset == null) {
return;
}
if (getPhysics().isFlying()) {
return;
}
Vec3d newPos = supportingEntity.getPos().add(supportPositionOffset);
Vec3d posChange = entity.getPos().subtract(newPos);
entity.setPosition(newPos);
if (isClient()) {
Vec3d newServerPos = LivingEntityDuck.serverPos(entity);
if (newServerPos.lengthSquared() != 0) {
newServerPos = newServerPos.subtract(posChange);
entity.updateTrackedPositionAndAngles(
newServerPos.x, newServerPos.y, newServerPos.z,
entity.getYaw(), entity.getPitch(), 3, true);
}
} else {
entity.updateTrackedPosition(newPos.x, newPos.y, newPos.z);
}
if (!(entity instanceof PlayerEntity)) {
entity.lastRenderX = supportingEntity.lastRenderX + supportPositionOffset.x;
entity.lastRenderY = supportingEntity.lastRenderY + supportPositionOffset.y;
entity.lastRenderZ = supportingEntity.lastRenderZ + supportPositionOffset.z;
if (entity.getVelocity().length() < 0.1) {
LimbAnimationUtil.resetToZero(entity.limbAnimator);
}
}
entity.horizontalSpeed = 0;
entity.prevHorizontalSpeed = 0;
entity.speed = 0;
entity.setOnGround(true);
entity.verticalCollision = true;
entity.groundCollision = true;
entity.fallDistance = 0;
@Override
public boolean hasFeatherTouch() {
return EnchantmentHelper.getEquipmentLevel(UEnchantments.FEATHER_TOUCH, entity) > 0;
}
@Override
@ -276,44 +211,9 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
updateVelocity();
}
updateSupportingEntity();
return false;
}
public void updateSupportingEntity() {
if (supportingEntity != null) {
Box ownBox = entity.getBoundingBox()
.stretch(entity.getVelocity())
.expand(0.1, 0.5, 0.1)
.stretch(supportingEntity.getVelocity().multiply(-2));
MultiBoundingBoxEntity.getBoundingBoxes(supportingEntity).stream()
.filter(box -> box.stretch(supportingEntity.getVelocity()).expand(0, 0.5, 0).intersects(ownBox))
.findFirst()
.ifPresentOrElse(box -> {
ticksOutsideVehicle = 0;
if (supportPositionOffset == null) {
updatePositionOffset();
} else {
updateRelativePosition(box);
}
entity.setOnGround(true);
entity.verticalCollision = true;
entity.groundCollision = true;
}, () -> {
// Rubberband passengers to try and prevent players falling out when the velocity changes suddenly
if (ticksOutsideVehicle++ > 30) {
supportingEntity = null;
supportPositionOffset = null;
Unicopia.LOGGER.info("Entity left vehicle");
} else {
supportPositionOffset = supportPositionOffset.multiply(0.25, 1, 0.25);
}
});
}
}
@Override
public void tick() {
tickers.forEach(Tickable::tick);
@ -358,13 +258,7 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
updateDragonBreath();
if (ticksOutsideVehicle == 0) {
updatePositionOffset();
ticksInVehicle++;
} else {
ticksInVehicle = 0;
}
transportation.tick();
}
public void updateAttributeModifier(UUID id, EntityAttribute attribute, float desiredValue, Float2ObjectFunction<EntityAttributeModifier> modifierSupplier, boolean permanent) {

141
src/main/java/com/minelittlepony/unicopia/entity/Transportation.java Normal file
View file

@ -0,0 +1,141 @@
package com.minelittlepony.unicopia.entity;
import java.util.ArrayList;
import java.util.List;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.advancement.UCriteria;
import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity;
import com.minelittlepony.unicopia.entity.duck.EntityDuck;
import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity;
import com.minelittlepony.unicopia.util.Tickable;
import net.minecraft.block.ShapeContext;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.MovementType;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.event.GameEvent;
public class Transportation<T extends LivingEntity> implements Tickable {
private final Living<T> living;
@Nullable
private MultiBoundingBoxEntity vehicle;
@Nullable
private Entity vehicleEntity;
@Nullable
private Box vehicleBox;
private int ticksInVehicle;
private Vec3d lastVehiclePosition = Vec3d.ZERO;
Transportation(Living<T> living) {
this.living = living;
}
public <E extends Entity & MultiBoundingBoxEntity> void setVehicle(@Nullable E vehicle) {
this.vehicle = vehicle;
this.vehicleEntity = vehicle;
updatePreviousPosition();
}
@Override
public void tick() {
if (vehicle != null) {
ticksInVehicle++;
} else {
ticksInVehicle = 0;
}
if (ticksInVehicle > 20 && vehicle instanceof AirBalloonEntity) {
UCriteria.RIDE_BALLOON.trigger(living.asEntity());
}
}
public void updatePreviousPosition() {
vehicleBox = getVehicleBox();
lastVehiclePosition = vehicleEntity == null ? Vec3d.ZERO : vehicleEntity.getPos();
Entity entity = living.asEntity();
if (vehicleBox != null && living.asEntity().getBoundingBox().intersects(vehicleBox.expand(0.001, 0.5001, 0.001))) {
entity.setOnGround(true);
entity.onLanding();
entity.verticalCollision = true;
entity.groundCollision = true;
entity.velocityDirty = true;
entity.velocityModified = true;
}
}
public void onMove(MovementType movementType) {
if (vehicleBox == null || vehicleEntity == null) {
return;
}
Entity entity = living.asEntity();
Box passengerBox = entity.getBoundingBox().expand(0.001);
Vec3d vehicleMovement = vehicleEntity.getPos().subtract(lastVehiclePosition);
List<VoxelShape> shapes = new ArrayList<>();
vehicle.getCollissionShapes(ShapeContext.of(entity), shapes::add);
vehicleMovement = vehicleMovement.add(vehicleEntity.getVelocity());
vehicleMovement = Entity.adjustMovementForCollisions(entity, vehicleMovement, passengerBox, entity.getWorld(), shapes);
Vec3d newPos = entity.getPos().add(vehicleMovement);
if (!vehicleEntity.isOnGround()) {
// surface check to prevent the player from floating
if (newPos.getY() > vehicleBox.minY + 0.1 || newPos.getY() < vehicleBox.minY + 0.1) {
newPos = new Vec3d(newPos.getX(), vehicleBox.minY + 0.01, newPos.getZ());
}
// containment checks to prevent the player from falling out of the basket when in flight
if (newPos.getY() < vehicleEntity.getPos().getY() + 3) {
double maxDeviation = 0.1;
double z = MathHelper.clamp(newPos.getZ(), vehicleBox.minZ + maxDeviation, vehicleBox.maxZ - maxDeviation);
double x = MathHelper.clamp(newPos.getX(), vehicleBox.minX + maxDeviation, vehicleBox.maxX - maxDeviation);
newPos = new Vec3d(x, newPos.getY(), z);
}
entity.setPosition(newPos);
entity.updateTrackedPosition(newPos.x, newPos.y, newPos.z);
entity.setVelocity(Vec3d.ZERO);
}
entity.setOnGround(true);
entity.onLanding();
entity.verticalCollision = true;
entity.groundCollision = true;
if (entity.distanceTraveled > ((EntityDuck)entity).getNextStepSoundDistance()) {
entity.distanceTraveled -= 0.5;
entity.playSound(vehicle.getWalkedOnSound(entity.getY()), 0.5F, 1);
if (!entity.isSneaky()) {
entity.getWorld().emitGameEvent(entity, GameEvent.STEP, entity.getBlockPos());
}
}
}
@Nullable
private Box getVehicleBox() {
if (vehicle == null) {
return null;
}
Box entityBox = living.asEntity().getBoundingBox().stretch(living.asEntity().getVelocity());
for (Box box : vehicle.getGravityZoneBoxes()) {
if (entityBox.intersects(box.expand(0.001).stretch(vehicleEntity.getVelocity().multiply(1)))) {
return box;
}
}
setVehicle(null);
return null;
}
}

26
src/main/java/com/minelittlepony/unicopia/entity/collision/MultiBoundingBoxEntity.java
View file

@ -1,13 +1,37 @@
package com.minelittlepony.unicopia.entity.collision;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Stream;
import com.minelittlepony.unicopia.entity.collision.EntityCollisions.ComplexCollidable;
import net.minecraft.block.ShapeContext;
import net.minecraft.entity.Entity;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.math.Box;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
public interface MultiBoundingBoxEntity {
public interface MultiBoundingBoxEntity extends ComplexCollidable {
List<Box> getBoundingBoxes();
default List<Box> getGravityZoneBoxes() {
return getBoundingBoxes();
}
Map<Box, List<Entity>> getCollidingEntities(Stream<Box> boundingBoxes);
SoundEvent getWalkedOnSound(double y);
@Override
default void getCollissionShapes(ShapeContext context, Consumer<VoxelShape> output) {
for (Box box : getBoundingBoxes()) {
output.accept(VoxelShapes.cuboid(box));
}
}
static List<Box> getBoundingBoxes(Entity entity) {
return entity instanceof MultiBoundingBoxEntity multi ? multi.getBoundingBoxes() : List.of(entity.getBoundingBox());
}

291
src/main/java/com/minelittlepony/unicopia/entity/mob/AirBalloonEntity.java
View file

@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.entity.mob;
import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags;
import net.minecraft.block.BlockState;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.entity.FurnaceBlockEntity;
import net.minecraft.entity.*;
import net.minecraft.entity.data.*;
import net.minecraft.entity.mob.MobEntity;
@ -13,7 +14,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.predicate.entity.EntityPredicates;
import net.minecraft.registry.RegistryKey;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.Identifier;
@ -22,20 +25,22 @@ import net.minecraft.util.function.ValueLists;
import net.minecraft.util.math.*;
import net.minecraft.util.math.random.Random;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.World;
import net.minecraft.world.event.GameEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.IntFunction;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.EquineContext;
@ -47,7 +52,6 @@ import com.minelittlepony.unicopia.entity.MagicImmune;
import com.minelittlepony.unicopia.entity.collision.EntityCollisions;
import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity;
import com.minelittlepony.unicopia.entity.collision.MultiBox;
import com.minelittlepony.unicopia.entity.duck.EntityDuck;
import com.minelittlepony.unicopia.item.BasketItem;
import com.minelittlepony.unicopia.item.HotAirBalloonItem;
import com.minelittlepony.unicopia.item.UItems;
@ -61,12 +65,16 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
private static final TrackedData<String> BASKET_TYPE = DataTracker.registerData(AirBalloonEntity.class, TrackedDataHandlerRegistry.STRING);
private static final TrackedData<Integer> BALLOON_DESIGN = DataTracker.registerData(AirBalloonEntity.class, TrackedDataHandlerRegistry.INTEGER);
private static final Predicate<Entity> RIDER_PREDICATE = EntityPredicates.EXCEPT_SPECTATOR.and(e -> {
return !(e instanceof PlayerEntity p && p.getAbilities().flying);
});
private boolean prevBoosting;
private int prevInflation;
private Vec3d oldPosition = Vec3d.ZERO;
private Vec3d manualVelocity = Vec3d.ZERO;
private int ticksFlying;
private int maxFuel = 100;
private int fuel;
public AirBalloonEntity(EntityType<? extends AirBalloonEntity> type, World world) {
super(type, world);
@ -80,12 +88,12 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
dataTracker.startTracking(ASCENDING, false);
dataTracker.startTracking(BOOSTING, 0);
dataTracker.startTracking(INFLATION, 0);
dataTracker.startTracking(BASKET_TYPE, "");
dataTracker.startTracking(BASKET_TYPE, BasketType.DEFAULT.id().toString());
dataTracker.startTracking(BALLOON_DESIGN, 0);
}
public BasketType getBasketType() {
return BasketType.REGISTRY.get(Identifier.tryParse(dataTracker.get(BASKET_TYPE)));
return BasketType.of(dataTracker.get(BASKET_TYPE));
}
public void setBasketType(BasketType type) {
@ -144,14 +152,6 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
return hasBalloon() && hasBurner() && getInflation() >= getMaxInflation();
}
@Override
public List<Box> getBoundingBoxes() {
if (hasBalloon() && getInflation(1) > 0.999F) {
return List.of(getInteriorBoundingBox(), getBalloonBoundingBox());
}
return List.of(getInteriorBoundingBox());
}
@Override
public void tick() {
setAir(getMaxAir());
@ -178,6 +178,14 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
}
setInflation(inflation);
}
if (fuel > -6 && age % 60 == 0) {
fuel -= boosting ? 10 : 1;
if (fuel <= -6) {
setBoostTicks(0);
setAscending(false);
}
}
} else {
if (inflation < getMaxInflation() && inflation > 0) {
setInflation(--inflation);
@ -200,15 +208,16 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
if (hasBurner() && isAscending()) {
Vec3d burnerPos = getPos().add(0, 3, 0);
for (int i = 0; i < (boosting ? 6 : 1); i++) {
getWorld().addParticle(
getStackInHand(Hand.MAIN_HAND).isOf(Items.SOUL_LANTERN)
getWorld().addParticle(fuel <= 0
? ParticleTypes.SMOKE
: getStackInHand(Hand.MAIN_HAND).isOf(Items.SOUL_LANTERN)
? ParticleTypes.SOUL_FIRE_FLAME
: ParticleTypes.FLAME,
rng.nextTriangular(burnerPos.x, 0.25),
rng.nextTriangular(burnerPos.y, 1),
rng.nextTriangular(burnerPos.z, 0.25),
0,
Math.max(0, getVelocity().y + (boosting ? 0.1 : 0)),
(boosting ? 0.1 : 0),
0
);
}
@ -240,7 +249,7 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
if (leashPost.distanceTo(pos) >= 5) {
Vec3d newVel = leashPost.subtract(pos).multiply(0.01);
if (isAirworthy()) {
setVelocity(newVel.lengthSquared() < 0.03 ? Vec3d.ZERO : newVel);
setVelocity(newVel.lengthSquared() < 0.0001 ? Vec3d.ZERO : newVel);
} else {
setVelocity(getVelocity().multiply(0.9).add(newVel));
}
@ -248,86 +257,12 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
}
prevBoosting = boosting;
oldPosition = getPos();
if (getFireTicks() > 0) {
setFireTicks(1);
}
if (!isOnGround() && (isAirworthy() || isSubmergedInWater() || isLeashed())) {
ticksFlying++;
} else {
ticksFlying = 0;
}
updatePassengers(false);
super.tick();
setBoundingBox(MultiBox.of(getBoundingBox(), getBoundingBoxes()));
}
private void updatePassengers(boolean move) {
Set<Entity> alreadyTicked = new HashSet<>();
for (Box box : getBoundingBoxes()) {
for (Entity e : getWorld().getOtherEntities(this, box.stretch(getVelocity().multiply(-1)).expand(0, 0.5, 0))) {
if (e instanceof PlayerEntity p && p.getAbilities().flying) {
continue;
}
if (!alreadyTicked.add(e)) {
continue;
}
updatePassenger(e, box, e.getY() > getY() + 3);
}
}
}
private void updatePassenger(Entity e, Box box, boolean inBalloon) {
if (e instanceof AirBalloonEntity) {
return;
}
if (ticksFlying > 0) {
if (Living.getOrEmpty(e).filter(living -> !living.setSupportingEntity(this)).isPresent()) {
return;
}
Vec3d vel = getVelocity();
double height = box.getYLength();
if (height < 3 || e.getBoundingBox().minY > box.minY + height / 2D) {
if (vel.y > 0 && e.getBoundingBox().minY < box.maxY + 0.02) {
e.setPos(e.getX(), box.maxY, e.getZ());
e.setOnGround(true);
}
if (vel.y < 0 && e.getBoundingBox().minY > box.maxY) {
e.setPos(e.getX(), box.maxY, e.getZ());
e.setOnGround(true);
}
}
Living.getOrEmpty(e).ifPresent(living -> {
living.setPositionOffset(e.getPos().subtract(oldPosition));
living.updateRelativePosition(box);
if (ticksFlying > 20 && living.getTicksInVehicle() > 20) {
UCriteria.RIDE_BALLOON.trigger(e);
}
});
}
if (getWorld().isClient) {
if (e.distanceTraveled > ((EntityDuck)e).getNextStepSoundDistance()) {
e.distanceTraveled--;
e.playSound(inBalloon ? USounds.ENTITY_HOT_AIR_BALLOON_STEP : USounds.ENTITY_HOT_AIR_BALLOON_BASKET_STEP, 0.5F, 1);
if (!e.isSneaky()) {
getWorld().emitGameEvent(e, GameEvent.STEP, getBlockPos());
}
}
}
}
@Override
@ -355,11 +290,20 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
if (!getWorld().isClient) {
manualVelocity = manualVelocity.add(0.3 * xPush, 0, 0.3 * zPush);
}
} else if (stack.isEmpty() && isAscending()) {
setBoostTicks(50);
getWorld().playSound(null, getX() + hitPos.getX(), getY() + hitPos.getY(), getZ() + hitPos.getZ(), USounds.Vanilla.ENTITY_LEASH_KNOT_PLACE, getSoundCategory(), 1, 1);
if (!player.isSneaky()) {
getWorld().emitGameEvent(player, GameEvent.ENTITY_INTERACT, getBlockPos());
}
return ActionResult.SUCCESS;
}
if (stack.isEmpty() && isAscending()) {
setBoostTicks(50);
playSound(USounds.ENTITY_HOT_AIR_BALLOON_BOOST, 1, 1);
if (!player.isSneaky()) {
getWorld().emitGameEvent(player, GameEvent.ENTITY_INTERACT, getBlockPos());
}
return ActionResult.SUCCESS;
}
}
}
@ -387,9 +331,7 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
}
if (stack.isIn(ConventionalItemTags.SHEARS) && hasBalloon()) {
if (!player.getAbilities().creativeMode) {
stack.damage(1, player, p -> p.sendToolBreakStatus(hand));
}
stack.damage(1, player, p -> p.sendToolBreakStatus(hand));
setDesign(BalloonDesign.NONE);
dropItem(UItems.GIANT_BALLOON);
playSound(USounds.ENTITY_HOT_AIR_BALLOON_EQUIP_CANOPY, 1, 1);
@ -414,6 +356,25 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
return ActionResult.SUCCESS;
}
if (hasBurner()) {
int fuel = FurnaceBlockEntity.createFuelTimeMap().getOrDefault(stack.getItem(), 0);
if (fuel > 0) {
if (this.fuel < maxFuel) {
if (this.fuel < 0) {
this.fuel = fuel;
} else {
this.fuel += fuel;
}
if (!player.getAbilities().creativeMode) {
stack.decrement(1);
}
playSound(USounds.Vanilla.ENTITY_VILLAGER_YES, 1, 1);
return ActionResult.SUCCESS;
}
return ActionResult.FAIL;
}
}
return ActionResult.PASS;
}
@ -459,12 +420,16 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
}
@Override
protected void fall(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
public Race getSpecies() {
return Race.UNSET;
}
@Override
public Race getSpecies() {
return Race.UNSET;
public SoundEvent getWalkedOnSound(double y) {
if (y >= getBalloonBoundingBox().minY) {
return USounds.ENTITY_HOT_AIR_BALLOON_STEP;
}
return USounds.ENTITY_HOT_AIR_BALLOON_BASKET_STEP;
}
@Override
@ -497,6 +462,18 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
move(MovementType.SELF, getVelocity());
setVelocity(getVelocity().multiply(slipperyness));
}
} else {
Map<Box, List<Entity>> collidingEntities = getCollidingEntities(getBoundingBoxes().stream());
for (Map.Entry<Box, List<Entity>> passengers : collidingEntities.entrySet()) {
for (Entity passenger : passengers.getValue()) {
Living<?> living = Living.living(passenger);
if (living != null) {
living.getTransportation().setVehicle(this);
}
}
}
}
updateLimbs(false);
}
@ -507,17 +484,22 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
return false;
}
@Override
protected Box calculateBoundingBox() {
return MultiBox.of(super.calculateBoundingBox(), getBoundingBoxes());
}
@Override
public Box getVisibilityBoundingBox() {
if (hasBalloon()) {
return MultiBox.unbox(getBoundingBox()).union(getBalloonBoundingBox());
return getBalloonBoundingBox().withMinY(getY());
}
return MultiBox.unbox(getBoundingBox());
return getInteriorBoundingBox();
}
protected Box getInteriorBoundingBox() {
Box box = MultiBox.unbox(getBoundingBox());
return box.withMinY(box.minY - 0.2).contract(0.2, 0, 0.2);
return box.withMinY(box.minY - 0.05).contract(0.15, 0, 0.15);
}
protected Box getBalloonBoundingBox() {
@ -528,34 +510,98 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
}
@Override
public void getCollissionShapes(ShapeContext context, Consumer<VoxelShape> output) {
public List<Box> getGravityZoneBoxes() {
Box balloon = getBalloonBoundingBox().expand(0.001);
Box interior = getInteriorBoundingBox().expand(0.001);
if (hasBalloon() && getInflation(1) > 0.999F) {
return List.of(
// interior - basket to top of balloon
interior.withMaxY(balloon.minY).withMinY(interior.maxY),
// balloon
balloon.withMaxY(balloon.maxY + 0.5).withMinY(balloon.maxY)
);
}
return List.of(interior.withMaxY(balloon.minY).withMinY(interior.maxY));
}
Box box = MultiBox.unbox(getBoundingBox()).expand(0.3, 0, 0.3);
@Override
public List<Box> getBoundingBoxes() {
List<Box> boxes = new ArrayList<>();
Box box = getInteriorBoundingBox();
boxes.add(box);
double wallheight = box.maxY + 0.7;
double wallThickness = 0.7;
double wallheight = box.maxY + 0.72;
double wallThickness = 0.2;
if (!getBasketType().isOf(BoatEntity.Type.BAMBOO)) {
// front left (next to door)
output.accept(VoxelShapes.cuboid(new Box(box.minX, box.minY, box.minZ, box.minX + wallThickness + 0.2, wallheight, box.minZ + wallThickness)));
boxes.add(new Box(box.minX, box.minY, box.minZ, box.minX + wallThickness + 0.4, wallheight, box.minZ + wallThickness));
// front right (next to door)
output.accept(VoxelShapes.cuboid(new Box(box.maxX - wallThickness - 0.2, box.minY, box.minZ, box.maxX, wallheight, box.minZ + wallThickness)));
boxes.add(new Box(box.maxX - wallThickness - 0.4, box.minY, box.minZ, box.maxX, wallheight, box.minZ + wallThickness));
// back
output.accept(VoxelShapes.cuboid(new Box(box.minX, box.minY, box.maxZ - wallThickness, box.maxX, wallheight, box.maxZ)));
boxes.add(new Box(box.minX, box.minY, box.maxZ - wallThickness, box.maxX, wallheight, box.maxZ));
// left
output.accept(VoxelShapes.cuboid(new Box(box.maxX - wallThickness, box.minY, box.minZ, box.maxX, wallheight, box.maxZ)));
boxes.add(new Box(box.maxX - wallThickness, box.minY, box.minZ, box.maxX, wallheight, box.maxZ));
// right
output.accept(VoxelShapes.cuboid(new Box(box.minX, box.minY, box.minZ, box.minX + wallThickness, wallheight, box.maxZ)));
boxes.add(new Box(box.minX, box.minY, box.minZ, box.minX + wallThickness, wallheight, box.maxZ));
}
// top of balloon
if (hasBalloon() && getInflation() > 0) {
output.accept(VoxelShapes.cuboid(getBalloonBoundingBox()));
if (hasBalloon() && getInflation(1) > 0.999F) {
boxes.add(getBalloonBoundingBox());
}
return boxes;
}
@Override
public void move(MovementType movementType, Vec3d movement) {
Vec3d oldPos = this.getPos();
List<Box> boundingBoxes = getGravityZoneBoxes();
super.move(movementType, movement);
if (movementType == MovementType.SELF) {
Vec3d actualMovement = getPos().subtract(oldPos);
Map<Box, List<Entity>> collidingEntities = getCollidingEntities(
boundingBoxes.stream().map(box -> box.stretch(actualMovement))
);
for (Map.Entry<Box, List<Entity>> passengers : collidingEntities.entrySet()) {
for (Entity passenger : passengers.getValue()) {
movePassenger(passenger, actualMovement);
}
}
}
}
private void movePassenger(Entity passenger, Vec3d movement) {
Living<?> living = Living.living(passenger);
if (living != null) {
if (living.getPhysics().isGravityNegative()) {
movement = movement.multiply(1, -1, 1);
}
living.getTransportation().setVehicle(this);
}
List<VoxelShape> shapes = new ArrayList<>();
getCollissionShapes(ShapeContext.of(passenger), shapes::add);
movement = Entity.adjustMovementForCollisions(passenger, movement, passenger.getBoundingBox(), getWorld(), shapes);
passenger.setPosition(passenger.getPos().add(movement));
passenger.updateTrackedPosition(passenger.getX(), passenger.getY(), passenger.getZ());
}
@Override
public Map<Box, List<Entity>> getCollidingEntities(Stream<Box> boundingBoxes) {
return boundingBoxes.collect(Collectors.toMap(Function.identity(), box -> {
return getWorld().getOtherEntities(this, box.expand(0.001).stretch(getVelocity().multiply(1)), RIDER_PREDICATE).stream().distinct().toList();
}));
}
@Override
protected void fall(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
}
@Override
public void readCustomDataFromNbt(NbtCompound compound) {
super.readCustomDataFromNbt(compound);
@ -565,6 +611,7 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
setBoostTicks(compound.getInt("boostTicks"));
prevInflation = compound.getInt("inflationAmount");
setInflation(prevInflation);
fuel = MathHelper.clamp(compound.getInt("fuel"), 0, maxFuel);
}
@Override
@ -575,6 +622,11 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
compound.putBoolean("burnerActive", isAscending());
compound.putInt("boostTicks", getBoostTicks());
compound.putInt("inflationAmount", getInflation());
compound.putInt("fuel", fuel);
}
static boolean isBetween(double value, double min, double max) {
return value >= min && value <= max;
}
@SuppressWarnings("deprecation")
@ -607,6 +659,7 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
public record BasketType(Identifier id, @Nullable BoatEntity.Type boatType) {
private static final Map<Identifier, BasketType> REGISTRY = new HashMap<>();
public static final BasketType DEFAULT = of(BoatEntity.Type.OAK);
static {
Arrays.stream(BoatEntity.Type.values()).forEach(BasketType::of);
}
@ -616,7 +669,7 @@ public class AirBalloonEntity extends MobEntity implements EntityCollisions.Comp
}
public static BasketType of(String name) {
Identifier id = Identifier.tryParse(name);
Identifier id = name == null || name.isEmpty() ? null : Identifier.tryParse(name);
if (id == null) {
return of(BoatEntity.Type.OAK);
}

9
src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java
View file

@ -30,29 +30,34 @@ public interface UEntities {
.dimensions(EntityDimensions.fixed(0.25F, 0.25F)));
EntityType<MagicProjectileEntity> THROWN_ITEM = register("thrown_item", FabricEntityTypeBuilder.<MagicProjectileEntity>create(SpawnGroup.MISC, MagicProjectileEntity::new)
.trackRangeBlocks(100)
.disableSummon()
.trackedUpdateRate(2)
.dimensions(EntityDimensions.fixed(0.25F, 0.25F)));
EntityType<PhysicsBodyProjectileEntity> MUFFIN = register("muffin", FabricEntityTypeBuilder.<PhysicsBodyProjectileEntity>create(SpawnGroup.MISC, PhysicsBodyProjectileEntity::new)
.trackRangeBlocks(100)
.disableSummon()
.trackedUpdateRate(2)
.dimensions(EntityDimensions.fixed(0.25F, 0.25F)));
EntityType<MagicBeamEntity> MAGIC_BEAM = register("magic_beam", FabricEntityTypeBuilder.<MagicBeamEntity>create(SpawnGroup.MISC, MagicBeamEntity::new)
.trackRangeBlocks(100)
.disableSummon()
.trackedUpdateRate(2)
.dimensions(EntityDimensions.fixed(0.25F, 0.25F)));
EntityType<FloatingArtefactEntity> FLOATING_ARTEFACT = register("floating_artefact", FabricEntityTypeBuilder.create(SpawnGroup.MISC, FloatingArtefactEntity::new)
.trackRangeBlocks(200)
.disableSummon()
.dimensions(EntityDimensions.fixed(1, 1)));
EntityType<CastSpellEntity> CAST_SPELL = register("cast_spell", FabricEntityTypeBuilder.create(SpawnGroup.MISC, CastSpellEntity::new)
.trackRangeBlocks(200)
.disableSummon()
.dimensions(EntityDimensions.changing(4, 4)));
EntityType<FairyEntity> TWITTERMITE = register("twittermite", FabricEntityTypeBuilder.create(SpawnGroup.MISC, FairyEntity::new)
.trackRangeBlocks(200)
.dimensions(EntityDimensions.fixed(0.1F, 0.1F)));
EntityType<FriendlyCreeperEntity> FRIENDLY_CREEPER = register("friendly_creeper", FabricEntityTypeBuilder.create(SpawnGroup.MISC, FriendlyCreeperEntity::new)
.trackRangeChunks(8)
.dimensions(EntityDimensions.fixed(0.6f, 1.7f))
);
.disableSummon()
.dimensions(EntityDimensions.fixed(0.6f, 1.7f)));
EntityType<SpellbookEntity> SPELLBOOK = register("spellbook", FabricEntityTypeBuilder.create(SpawnGroup.MISC, SpellbookEntity::new)
.trackRangeBlocks(200)
.dimensions(EntityDimensions.fixed(0.9F, 0.5F)));

7
src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
View file

@ -388,6 +388,13 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
boolean mustAvoidAir = getCompositeRace().includes(Race.SEAPONY) && !sw.getFluidState(getOrigin()).isIn(FluidTags.WATER);
if (mustAvoidSun || mustAvoidAir) {
SpawnLocator.selectSpawnPosition(sw, entity, mustAvoidAir, mustAvoidSun);
if ((mustAvoidAir && !sw.getFluidState(getOrigin()).isIn(FluidTags.WATER))
|| (mustAvoidSun && MeteorlogicalUtil.isPositionExposedToSun(sw, getOrigin()))) {
Race suppressedRace = getSuppressedRace();
if (suppressedRace != Race.UNSET) {
setSpecies(suppressedRace);
}
}
}
}
ticksSunImmunity = INITIAL_SUN_IMMUNITY;

39
src/main/java/com/minelittlepony/unicopia/item/BaitedFishingRodItem.java Normal file
View file

@ -0,0 +1,39 @@
package com.minelittlepony.unicopia.item;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.projectile.FishingBobberEntity;
import net.minecraft.item.FishingRodItem;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.Hand;
import net.minecraft.util.TypedActionResult;
import net.minecraft.world.World;
public class BaitedFishingRodItem extends FishingRodItem {
public BaitedFishingRodItem(Settings settings) {
super(settings);
}
@Override
public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
TypedActionResult<ItemStack> result = super.use(world, user, hand);
if (!world.isClient) {
if (user.fishHook != null) {
user.fishHook.discard();
ItemStack stack = user.getStackInHand(hand);
int lure = (EnchantmentHelper.getLure(stack) + 1) * 2;
int luck = (EnchantmentHelper.getLuckOfTheSea(stack) + 1) * 2;
world.spawnEntity(new FishingBobberEntity(user, world, luck, lure));
}
if (result.getValue().isOf(this)) {
ItemStack stack = Items.FISHING_ROD.getDefaultStack();
stack.setDamage(result.getValue().getDamage());
return TypedActionResult.success(stack, world.isClient());
}
}
return result;
}
}

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

@ -89,6 +89,7 @@ public interface UItems {
Item HORSE_SHOE_FRIES = register("horse_shoe_fries", new Item(new Item.Settings().maxCount(32).food(UFoodComponents.HAY_FRIES)), ItemGroups.FOOD_AND_DRINK);
Item WHEAT_WORMS = register("wheat_worms", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.WORMS)), ItemGroups.NATURAL);
Item BAITED_FISHING_ROD = register("baited_fishing_rod", new BaitedFishingRodItem(new Item.Settings().maxDamage(64)), ItemGroups.TOOLS);
Item MUFFIN = register("muffin", new MuffinItem(new Item.Settings().maxCount(32).food(FoodComponents.BREAD), 0), ItemGroups.FOOD_AND_DRINK);
Item PINECONE = register("pinecone", new ForageableItem(new Item.Settings().food(UFoodComponents.PINECONE).maxCount(16), () -> Blocks.SPRUCE_LEAVES), ItemGroups.FOOD_AND_DRINK);
Item ACORN = register("acorn", new ForageableItem(new Item.Settings().food(UFoodComponents.ACORN).maxCount(16), () -> Blocks.OAK_LEAVES), ItemGroups.FOOD_AND_DRINK);

3
src/main/java/com/minelittlepony/unicopia/item/cloud/CloudBlockItem.java
View file

@ -19,8 +19,7 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
public class CloudBlockItem
extends BlockItem {
public class CloudBlockItem extends BlockItem {
public CloudBlockItem(Block block, Item.Settings settings) {
super(block, settings);
}

9
src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java
View file

@ -40,6 +40,15 @@ public interface UEnchantments {
*/
Enchantment PADDED = register("padded", new SimpleEnchantment(Options.armor().rarity(Rarity.UNCOMMON).maxLevel(3).traded().table()));
/**
* Allows non-flying races to mine and interact with cloud blocks
*
* Appears in:
* - Trades
* - Enchanting Table
*/
Enchantment FEATHER_TOUCH = register("feather_touch", new SimpleEnchantment(Options.create(EnchantmentTarget.BREAKABLE, UEnchantmentValidSlots.HANDS).rarity(Rarity.UNCOMMON).traded().table()));
/**
* Heavy players move more slowly but are less likely to be flung around wildly.
*

18
src/main/java/com/minelittlepony/unicopia/mixin/MixinEntity.java
View file

@ -21,11 +21,13 @@ import com.minelittlepony.unicopia.entity.duck.EntityDuck;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.ItemEntity;
import net.minecraft.entity.MovementType;
import net.minecraft.entity.Entity.PositionUpdater;
import net.minecraft.entity.Entity.RemovalReason;
import net.minecraft.fluid.Fluid;
import net.minecraft.item.ItemStack;
import net.minecraft.registry.tag.TagKey;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
@Mixin(Entity.class)
@ -118,4 +120,20 @@ abstract class MixinEntity implements EntityDuck {
info.setReturnValue(null);
}
}
@Inject(method = "move", at = @At("HEAD"))
private void beforeMove(MovementType movementType, Vec3d movement, CallbackInfo info) {
Living<?> living = Living.living((Entity)(Object)this);
if (living != null) {
living.getTransportation().updatePreviousPosition();
}
}
@Inject(method = "move", at = @At("RETURN"))
private void afterMove(MovementType movementType, Vec3d movement, CallbackInfo info) {
Living<?> living = Living.living((Entity)(Object)this);
if (living != null) {
living.getTransportation().onMove(movementType);
}
}
}

23
src/main/java/com/minelittlepony/unicopia/mixin/MixinEntityShapeContext.java
View file

@ -9,15 +9,13 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.minelittlepony.unicopia.EquineContext;
import com.minelittlepony.unicopia.Race;
import net.minecraft.block.EntityShapeContext;
import net.minecraft.entity.Entity;
import net.minecraft.fluid.FluidState;
import net.minecraft.item.ItemStack;
@Mixin(EntityShapeContext.class)
abstract class MixinEntityShapeContext implements EquineContext {
abstract class MixinEntityShapeContext implements EquineContext.Container {
private EquineContext equineContext;
@Inject(method = "<init>", at = @At("TAIL"))
@ -26,22 +24,7 @@ abstract class MixinEntityShapeContext implements EquineContext {
}
@Override
public Race getSpecies() {
return equineContext.getSpecies();
}
@Override
public Race.Composite getCompositeRace() {
return equineContext.getCompositeRace();
}
@Override
public float getCloudWalkingStrength() {
return equineContext.getCloudWalkingStrength();
}
@Override
public boolean collidesWithClouds() {
return equineContext.collidesWithClouds();
public EquineContext get() {
return equineContext;
}
}

44
src/main/java/com/minelittlepony/unicopia/server/world/OfflinePlayerCache.java Normal file
View file

@ -0,0 +1,44 @@
package com.minelittlepony.unicopia.server.world;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.jetbrains.annotations.Nullable;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.mojang.authlib.GameProfile;
import net.fabricmc.fabric.api.entity.FakePlayer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
public class OfflinePlayerCache {
private static final LoadingCache<Key, Optional<ServerPlayerEntity>> CACHE = CacheBuilder.newBuilder()
.expireAfterAccess(1, TimeUnit.MINUTES)
.build(CacheLoader.from(key -> {
ServerPlayerEntity offlinePlayer = FakePlayer.get(key.world(), new GameProfile(key.playerId(), "[Offline Player]"));
if (key.world().getServer().getPlayerManager().loadPlayerData(offlinePlayer) != null) {
return Optional.of(offlinePlayer);
}
return Optional.empty();
}));
@Nullable
public static ServerPlayerEntity getOfflinePlayer(ServerWorld world, UUID playerId) {
ServerPlayerEntity player = (ServerPlayerEntity)world.getPlayerByUuid(playerId);
if (player == null) {
player = world.getServer().getPlayerManager().getPlayer(playerId);
}
if (player == null) {
return CACHE.getUnchecked(new Key(world, playerId)).orElse(null);
}
return player;
}
record Key (ServerWorld world, UUID playerId) {}
}

14
src/main/resources/assets/unicopia/lang/en_us.json
View file

@ -145,6 +145,7 @@
"item.unicopia.crispy_hay_fries": "Crispy Hay Fries",
"item.unicopia.horse_shoe_fries": "Horse Shoe Fries",
"item.unicopia.wheat_worms": "Wheat Worms",
"item.unicopia.baited_fishing_rod": "Baited Fishing Rod",
"item.unicopia.muffin": "Muffin",
"item.unicopia.oatmeal_cookie": "Oatmeal Cookie",
"item.unicopia.pinecone_cookie": "Pinecone Cookie",
@ -1338,6 +1339,8 @@
"enchantment.unicopia.heart_bound.desc": "Causes an item to stay with you after you die",
"enchantment.unicopia.consumption": "Consumption",
"enchantment.unicopia.consumption.desc": "Converts drops mined using a tool into raw experience",
"enchantment.unicopia.feather_touch": "Feather Touch",
"enchantment.unicopia.feather_touch.desc": "Allows breaking and placing cloud blocks when held",
"commands.race.success.self": "Set own race to %1$s",
"commands.race.success": "%1$s changed race to %2$s",
@ -1614,6 +1617,8 @@
"advancements.unicopia.lightning_bug.description": "Attract 10 lightning strikes as a changeling",
"advancements.unicopia.wonder_bolt.title": "Wonder Bolt",
"advancements.unicopia.wonder_bolt.description": "Attract 10 lightning strikes",
"advancements.unicopia.bait.title": "Is This Bait?",
"advancements.unicopia.bait.description": "Put some worms on a hook",
"advancements.unicopia.jar.title": "Oh wow. What's this?",
"advancements.unicopia.jar.description": "Find an empty jar",
"advancements.unicopia.gotcha.title": "Got'cha!",
@ -1680,7 +1685,7 @@
"advancements.unicopia.blasphemy.title": "Blasphemy!",
"advancements.unicopia.blasphemy.description": "Ding Celestia on the noggin. Oops!",
"advancements.unicopia.earth_route.title": "Path of the Pony",
"advancements.unicopia.earth_route.title": "Hearth of the Earth",
"advancements.unicopia.earth_route.description": "Join the Apple Clan",
"advancements.unicopia.sticks_and_stones.title": "Sticks and Stones",
"advancements.unicopia.sticks_and_stones.description": "Kill a mob by throwing rocks at it",
@ -1761,6 +1766,13 @@
"advancements.unicopia.love_is_power.title": "Love is Power",
"advancements.unicopia.love_is_power.description": "Banish King Sombra with a crystal heart",
"advancements.unicopia.hippogriff_route.title": "Splash of Seaquestria",
"advancements.unicopia.hippogriff_route.description": "Join the Hippogriff's nest",
"advancements.unicopia.shoo_be_doo.title": "Shoo Be Doo!",
"advancements.unicopia.shoo_be_doo.description": "Use a pearl necklace to turn into a sea creature",
"advancements.unicopia.shoo_be_done.title": "Shoo Be Done!",
"advancements.unicopia.shoo_be_done.description": "Use a pearl necklace to turn back to normal",
"unicopia.toast.discoveries.title": "New Discoveries!",
"unicopia.toast.discoveries.description": "Check your spellbook"
}

BIN
src/main/resources/assets/unicopia/textures/item/baited_fishing_rod.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 6.3 KiB

1
src/main/resources/data/unicopia/tags/items/groups/earth_pony.json
View file

@ -58,6 +58,7 @@
"unicopia:crispy_hay_fries",
"unicopia:horse_shoe_fries",
"unicopia:wheat_worms",
"unicopia:baited_fishing_rod",
"unicopia:worm_block",
"unicopia:muffin",
"unicopia:acorn",