Skip to content

Commit aa6fe7b

Browse files
MalfradorMalfrador
committed
1.21.11
1 parent cd65f7c commit aa6fe7b

File tree

7 files changed

+19
-25
lines changed

7 files changed

+19
-25
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ java {
2121
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
2222
}
2323

24-
val papyrusVersion = "1.21.10-R0.1-SNAPSHOT"
24+
val papyrusVersion = "1.21.11-R0.1-SNAPSHOT"
2525
paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
2626

2727
dependencies {
2828
paperweightDevelopmentBundle("de.erethon.papyrus", "dev-bundle", papyrusVersion)
2929

3030
compileOnly("de.erethon", "Daedalus", "1.4-SNAPSHOT")
3131

32-
compileOnly("de.erethon.hephaestus:Hephaestus:1.0.4-SNAPSHOT")
32+
compileOnly("de.erethon.hephaestus:Hephaestus:1.0.5-SNAPSHOT")
3333
compileOnly("de.erethon.questsxl:QuestsXL:1.0.5-SNAPSHOT")
3434
compileOnly("de.erethon.hecate:Hecate:1.2-SNAPSHOT")
3535
compileOnly("de.erethon.factions:Factions:1.0-SNAPSHOT")
@@ -41,7 +41,7 @@ tasks {
4141
project.buildDir.mkdir()
4242
}
4343
val f = File(project.buildDir, "server.jar");
44-
uri("https://github.com/DRE2N/Papyrus/releases/download/latest/papyrus-paperclip-$papyrusVersion-mojmap.jar").toURL().openStream().use { it.copyTo(f.outputStream()) }
44+
//uri("https://github.com/DRE2N/Papyrus/releases/download/latest/papyrus-paperclip-$papyrusVersion-mojmap.jar").toURL().openStream().use { it.copyTo(f.outputStream()) }
4545
serverJar(f)
4646
runDirectory.set(file("C:\\Dev\\Erethon"))
4747
}

‎src/main/java/de/erethon/aether/ai/goals/AEAvoidTargetGoal.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import de.erethon.aether.ai.GoalClass;
44
import net.minecraft.core.Registry;
55
import net.minecraft.core.registries.BuiltInRegistries;
6-
import net.minecraft.resources.ResourceLocation;
6+
import net.minecraft.resources.Identifier;
77
import net.minecraft.world.entity.EntityType;
88
import net.minecraft.world.entity.LivingEntity;
99
import net.minecraft.world.entity.PathfinderMob;
@@ -31,7 +31,7 @@ public Goal get(LivingEntity entity) {
3131
@Override
3232
public void load(String[] args) {
3333
isCreatureOnly = true;
34-
Optional<EntityType<?>> byName = BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(args[0].toLowerCase()));
34+
Optional<EntityType<?>> byName = BuiltInRegistries.ENTITY_TYPE.getOptional(Identifier.tryParse(args[0].toLowerCase()));
3535
if (byName.isPresent()) {
3636
EntityType<?> entityType = byName.get();
3737
toAvoid = entityType.getClass();

‎src/main/java/de/erethon/aether/ai/goals/NearestAttackableTarget.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
import de.erethon.aether.Aether;
44
import de.erethon.aether.ai.GoalClass;
55
import net.minecraft.core.registries.BuiltInRegistries;
6-
import net.minecraft.network.protocol.game.ServerPacketListener;
7-
import net.minecraft.resources.ResourceLocation;
6+
import net.minecraft.resources.Identifier;
87
import net.minecraft.server.level.ServerPlayer;
98
import net.minecraft.world.entity.EntityType;
109
import net.minecraft.world.entity.LivingEntity;
@@ -30,7 +29,7 @@ public Goal get(LivingEntity entity) {
3029

3130
@Override
3231
public void load(String[] args) {
33-
Optional<EntityType<?>> byName = BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse("minecraft:" + args[0].toLowerCase()));
32+
Optional<EntityType<?>> byName = BuiltInRegistries.ENTITY_TYPE.getOptional(Identifier.tryParse("minecraft:" + args[0].toLowerCase()));
3433
if (byName.isPresent()) {
3534
EntityType<?> entityType = byName.get();
3635
target = entityType.getClass();

‎src/main/java/de/erethon/aether/commands/NaturalSpawnCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.minecraft.core.Holder;
1515
import net.minecraft.core.registries.Registries;
1616
import net.minecraft.resources.ResourceKey;
17-
import net.minecraft.resources.ResourceLocation;
17+
import net.minecraft.resources.Identifier;
1818
import net.minecraft.world.level.biome.Biome;
1919
import org.bukkit.Location;
2020
import org.bukkit.command.CommandSender;
@@ -332,7 +332,7 @@ private void handleInfo(String[] args, Player player) {
332332
CraftWorld craftWorld = (CraftWorld) loc.getWorld();
333333
Holder<Biome> biomeHolder = craftWorld.getHandle().getBiome(new BlockPos(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
334334
String biomeName = biomeHolder.unwrapKey()
335-
.map(ResourceKey::location)
335+
.map(ResourceKey::identifier)
336336
.map(Object::toString)
337337
.orElse("unknown");
338338

@@ -393,7 +393,7 @@ private String resolveTarget(String type, String target, Player player) {
393393
CraftWorld craftWorld = (CraftWorld) loc.getWorld();
394394
Holder<Biome> biomeHolder = craftWorld.getHandle().getBiome(new BlockPos(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
395395
return biomeHolder.unwrapKey()
396-
.map(ResourceKey::location)
396+
.map(ResourceKey::identifier)
397397
.map(Object::toString)
398398
.orElse("minecraft:plains");
399399
}
@@ -474,7 +474,7 @@ public List<String> onTabComplete(CommandSender sender, String[] args) {
474474
targets.addAll(regions);
475475
} else if (type.equals("biome")) {
476476
CraftWorld craftWorld = (CraftWorld) loc.getWorld();
477-
for (ResourceLocation holder : craftWorld.getHandle().registryAccess().lookupOrThrow(Registries.BIOME).keySet()) {
477+
for (Identifier holder : craftWorld.getHandle().registryAccess().lookupOrThrow(Registries.BIOME).keySet()) {
478478
targets.add(holder.toString());
479479
}
480480
}

‎src/main/java/de/erethon/aether/creature/AetherBaseMob.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import net.minecraft.network.protocol.Packet;
3838
import net.minecraft.network.protocol.game.ClientGamePacketListener;
3939
import net.minecraft.network.syncher.SynchedEntityData;
40-
import net.minecraft.resources.ResourceLocation;
40+
import net.minecraft.resources.Identifier;
4141
import net.minecraft.server.MinecraftServer;
4242
import net.minecraft.server.level.ServerEntity;
4343
import net.minecraft.server.level.ServerLevel;
@@ -69,9 +69,9 @@
6969
import net.minecraft.world.entity.monster.Monster;
7070
import net.minecraft.world.entity.monster.RangedAttackMob;
7171
import net.minecraft.world.entity.player.Player;
72-
import net.minecraft.world.entity.projectile.AbstractArrow;
7372
import net.minecraft.world.entity.projectile.Projectile;
7473
import net.minecraft.world.entity.projectile.ProjectileUtil;
74+
import net.minecraft.world.entity.projectile.arrow.AbstractArrow;
7575
import net.minecraft.world.item.ItemStack;
7676
import net.minecraft.world.item.Items;
7777
import net.minecraft.world.item.ProjectileWeaponItem;
@@ -291,11 +291,6 @@ public void onCrossbowAttackPerformed() {
291291
noActionTime = 0;
292292
}
293293

294-
@Override
295-
public boolean canFireProjectileWeapon(ProjectileWeaponItem projectileWeapon) {
296-
return projectileWeapon == Items.CROSSBOW;
297-
}
298-
299294
public boolean isChargingCrossbow() {
300295
return isChargingCrossbow;
301296
}
@@ -725,7 +720,7 @@ public boolean saveAsPassenger(ValueOutput output, boolean includeAll, boolean i
725720
if (type == EntityType.PLAYER) {
726721
type = EntityType.MANNEQUIN;
727722
}
728-
ResourceLocation key = EntityType.getKey(type);
723+
Identifier key = EntityType.getKey(type);
729724
String outputKey = key.toString();
730725
output.putString("id", outputKey);
731726
this.saveWithoutId(output , includeAll, includeNonSaveable, forceSerialization); // CraftBukkit - pass on includeAll // Paper - Raw entity serialization API

‎src/main/java/de/erethon/aether/creature/NPCData.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import net.minecraft.core.Holder;
1919
import net.minecraft.core.Registry;
2020
import net.minecraft.core.registries.BuiltInRegistries;
21-
import net.minecraft.resources.ResourceLocation;
21+
import net.minecraft.resources.Identifier;
2222
import net.minecraft.world.entity.Entity;
2323
import net.minecraft.world.entity.EntityType;
2424
import net.minecraft.world.entity.MobCategory;
@@ -347,7 +347,7 @@ public void load() {
347347
}
348348
// General
349349
String displayTypeString = cfg.getString("displayType", "pig");
350-
Optional<Holder.Reference<EntityType<?>>> optional = BuiltInRegistries.ENTITY_TYPE.get(ResourceLocation.fromNamespaceAndPath("minecraft", displayTypeString));
350+
Optional<Holder.Reference<EntityType<?>>> optional = BuiltInRegistries.ENTITY_TYPE.get(Identifier.fromNamespaceAndPath("minecraft", displayTypeString));
351351
if (optional.isEmpty()) {
352352
Aether.addException(ID, "Could not find displayType " + displayTypeString, "Ensure the displayType exists in vanilla", null);
353353
return;
@@ -420,7 +420,7 @@ public void load() {
420420
}
421421
Attribute attribute;
422422
try {
423-
attribute = attributeRegistry.get(ResourceLocation.fromNamespaceAndPath("minecraft", id)).get().value();
423+
attribute = attributeRegistry.get(Identifier.fromNamespaceAndPath("minecraft", id)).get().value();
424424
} catch (Exception e) {
425425
Aether.addException(ID, "Could not find attribute " + id, "Ensure the attribute exists", e);
426426
continue;

‎src/main/java/de/erethon/aether/spawning/MobSpawnConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public MobSpawnConfig() {
3737

3838
public WeightedList<String> getSpawnsForBiome(Holder<Biome> biomeHolder) {
3939
String biomeName = biomeHolder.unwrapKey()
40-
.map(ResourceKey::location)
40+
.map(ResourceKey::identifier)
4141
.map(Object::toString)
4242
.orElse("minecraft:plains"); // Fallback for safety
4343
return biomeSpawns.getOrDefault(biomeName, WeightedList.of());
@@ -49,7 +49,7 @@ public WeightedList<String> getSpawnsForRegion(String regionName) {
4949

5050
public double getBiomeSpawnChance(Holder<Biome> biomeHolder) {
5151
String biomeName = biomeHolder.unwrapKey()
52-
.map(ResourceKey::location)
52+
.map(ResourceKey::identifier)
5353
.map(Object::toString)
5454
.orElse("minecraft:plains");
5555
return biomeSpawnChances.getOrDefault(biomeName, 1.0);

0 commit comments

Comments
 (0)