Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted changes to RiftTrackedCriterion

Browse source
This commit is contained in:
Waterpicker 2021-10-09 23:40:38 -05:00
parent 3dbd77dfa1
commit d45e5d278f
4 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/datagen/java/org/dimdev/dimdoors/datagen/AdvancementTab.java
View file

@ -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()

2
src/main/java/org/dimdev/dimdoors/block/entity/RiftBlockEntity.java
View file

@ -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();
}

21
src/main/java/org/dimdev/dimdoors/criteria/RiftTrackedCriterion.java
View file

@ -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;
}
}
}

7
src/main/resources/data/dimdoors/advancements/dimdoors/hole_in_the_sky.json
View file

@ -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": [