Reverted changes to RiftTrackedCriterion
This commit is contained in:
parent
3dbd77dfa1
commit
d45e5d278f
4 changed files with 8 additions and 24 deletions
|
@ -70,7 +70,7 @@ public class AdvancementTab implements Consumer<Consumer<Advancement>> {
|
|||
.build(advancementConsumer, "dimdoors:dimdoors/string_theory");
|
||||
Advancement holeInTheSky = Advancement.Task.create()
|
||||
.display(makeDisplay(ModItems.RIFT_CONFIGURATION_TOOL, "hole_in_the_sky"))
|
||||
.criterion("encounter_rift", new RiftTrackedCriterion.Conditions(EntityPredicate.Extended.EMPTY, NumberRange.FloatRange.atMost(8.0)))
|
||||
.criterion("encounter_rift", new RiftTrackedCriterion.Conditions(EntityPredicate.Extended.EMPTY))
|
||||
.parent(root)
|
||||
.build(advancementConsumer, "dimdoors:dimdoors/hole_in_the_sky");
|
||||
Advancement darkOstiology = Advancement.Task.create()
|
||||
|
|
|
@ -116,7 +116,7 @@ public abstract class RiftBlockEntity extends BlockEntity implements BlockEntity
|
|||
@Override
|
||||
public NbtCompound toInitialChunkDataNbt() {
|
||||
for (ServerPlayerEntity serverPlayerEntity : PlayerLookup.tracking(this)) {
|
||||
ModCriteria.RIFT_TRACKED.trigger(serverPlayerEntity, this.getPos());
|
||||
ModCriteria.RIFT_TRACKED.trigger(serverPlayerEntity);
|
||||
}
|
||||
return super.toInitialChunkDataNbt();
|
||||
}
|
||||
|
|
|
@ -18,12 +18,11 @@ public class RiftTrackedCriterion extends AbstractCriterion<RiftTrackedCriterion
|
|||
|
||||
@Override
|
||||
protected Conditions conditionsFromJson(JsonObject obj, EntityPredicate.Extended playerPredicate, AdvancementEntityPredicateDeserializer predicateDeserializer) {
|
||||
NumberRange.FloatRange distancePredicate = NumberRange.FloatRange.fromJson(obj.get("distance"));
|
||||
return new Conditions(playerPredicate, distancePredicate);
|
||||
return new Conditions(playerPredicate);
|
||||
}
|
||||
|
||||
public void trigger(ServerPlayerEntity player, BlockPos riftPos) {
|
||||
this.trigger(player, t -> t.matches(player, new Vec3d(riftPos.getX() + 0.5, riftPos.getY() + 0.5, riftPos.getZ() + 0.5)));
|
||||
public void trigger(ServerPlayerEntity player) {
|
||||
this.trigger(player, t -> true);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -32,20 +31,8 @@ public class RiftTrackedCriterion extends AbstractCriterion<RiftTrackedCriterion
|
|||
}
|
||||
|
||||
public static class Conditions extends AbstractCriterionConditions {
|
||||
private NumberRange.FloatRange distance;
|
||||
public Conditions(EntityPredicate.Extended playerPredicate, NumberRange.FloatRange distance) {
|
||||
public Conditions(EntityPredicate.Extended playerPredicate) {
|
||||
super(ID, playerPredicate);
|
||||
this.distance = distance;
|
||||
}
|
||||
|
||||
public boolean matches(ServerPlayerEntity player, Vec3d pos) {
|
||||
return this.distance.testSqrt(player.getPos().squaredDistanceTo(pos));
|
||||
}
|
||||
|
||||
public JsonObject toJson(AdvancementEntityPredicateSerializer predicateSerializer) {
|
||||
JsonObject jsonObject = super.toJson(predicateSerializer);
|
||||
jsonObject.add("distance", this.distance.toJson());
|
||||
return jsonObject;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
{
|
||||
"parent": "dimdoors:dimdoors/root",
|
||||
"display": {
|
||||
"icon": {
|
||||
|
@ -19,11 +20,7 @@
|
|||
"criteria": {
|
||||
"encounter_rift": {
|
||||
"trigger": "dimdoors:rift_tracked",
|
||||
"conditions": {
|
||||
"distance": {
|
||||
"max": 8.0
|
||||
}
|
||||
}
|
||||
"conditions": {}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
|
|
Loading…
Reference in a new issue