mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-27 07:27:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

use WorldAttached for static DamageSources

Browse source
This commit is contained in:
TropheusJ 2023-06-30 02:48:20 -04:00
parent c3ab704a17
commit d63ef2647c
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/simibubi/create/foundation/damageTypes/DamageTypeData.java
View file

@ -4,13 +4,12 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.simibubi.create.Create; import com.simibubi.create.Create;
import com.simibubi.create.foundation.utility.WorldAttached;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
@ -28,7 +27,7 @@ import net.minecraft.world.damagesource.DamageSources;
import net.minecraft.world.damagesource.DamageType; import net.minecraft.world.damagesource.DamageType;
import net.minecraft.world.damagesource.DeathMessageType; import net.minecraft.world.damagesource.DeathMessageType;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.LevelAccessor;
/** /**
* An extension of {@link DamageType} that contains extra data, functionality, and utility. * An extension of {@link DamageType} that contains extra data, functionality, and utility.
@ -46,32 +45,29 @@ public class DamageTypeData {
private Holder<DamageType> holder; private Holder<DamageType> holder;
private final Map<LevelReader, DamageSource> staticSourceCache = new WeakHashMap<>(); private final WorldAttached<DamageSource> staticSources;
protected DamageTypeData(ResourceKey<DamageType> key, DamageType type, Collection<TagKey<DamageType>> tags) { protected DamageTypeData(ResourceKey<DamageType> key, DamageType type, Collection<TagKey<DamageType>> tags) {
this.key = key; this.key = key;
this.id = key.location(); this.id = key.location();
this.type = type; this.type = type;
this.tags = tags; this.tags = tags;
this.staticSources = new WorldAttached<>(level -> new DamageSource(getHolder(level)));
} }
public DamageSource source(LevelReader level) { public DamageSource source(LevelAccessor level) {
if (!staticSourceCache.containsKey(level)) { return staticSources.get(level);
Holder<DamageType> holder = getHolder(level);
staticSourceCache.put(level, new DamageSource(holder));
}
return staticSourceCache.get(level);
} }
public DamageSource source(LevelReader level, @Nullable Entity entity) { public DamageSource source(LevelAccessor level, @Nullable Entity entity) {
return new DamageSource(getHolder(level), entity); return new DamageSource(getHolder(level), entity);
} }
public DamageSource source(LevelReader level, @Nullable Entity cause, @Nullable Entity direct) { public DamageSource source(LevelAccessor level, @Nullable Entity cause, @Nullable Entity direct) {
return new DamageSource(getHolder(level), cause, direct); return new DamageSource(getHolder(level), cause, direct);
} }
private Holder<DamageType> getHolder(LevelReader level) { private Holder<DamageType> getHolder(LevelAccessor level) {
if (this.holder == null) { if (this.holder == null) {
Registry<DamageType> registry = level.registryAccess().registryOrThrow(Registries.DAMAGE_TYPE); Registry<DamageType> registry = level.registryAccess().registryOrThrow(Registries.DAMAGE_TYPE);
this.holder = registry.getHolderOrThrow(key); this.holder = registry.getHolderOrThrow(key);
@ -177,6 +173,7 @@ public class DamageTypeData {
* <li>{@link DeathMessageType#INTENTIONAL_GAME_DESIGN}: "death.attack." + msgId, wrapped in brackets, linking to MCPE-28723</li> * <li>{@link DeathMessageType#INTENTIONAL_GAME_DESIGN}: "death.attack." + msgId, wrapped in brackets, linking to MCPE-28723</li>
* </ul> * </ul>
*/ */
@SuppressWarnings("JavadocReference")
public Builder deathMessageType(DeathMessageType type) { public Builder deathMessageType(DeathMessageType type) {
this.deathMessageType = type; this.deathMessageType = type;
return this; return this;