From bdb90f1e33780d7d24f6045ca5e2c56ec3a006c7 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Sun, 28 Jun 2026 01:24:01 +0700 Subject: [PATCH] AW: add wideners from pulsar --- build.gradle | 1 + .../mixin/CampfireBlockEntityMixin.java | 2 +- .../modules/entities/boats/BoatEntities.java | 2 +- .../items/infinite_totem/client/Client.java | 4 ++-- src/main/resources/andromeda.accesswidener | 20 ++++++++++++++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 652f2098..93b192ff 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ apply from: "https://raw.githubusercontent.com/constellation-mc/artifacts/main/a constellationRepo(project, "pulsar") repositories { + mavenLocal() maven { url = "https://maven.shedaniel.me/" } maven { url = "https://maven.terraformersmc.com/releases/" } mavenCentral() diff --git a/src/main/java/dev/zenfyr/andromeda/modules/blocks/campfire_effects/mixin/CampfireBlockEntityMixin.java b/src/main/java/dev/zenfyr/andromeda/modules/blocks/campfire_effects/mixin/CampfireBlockEntityMixin.java index 3613973c..5cd8994f 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/blocks/campfire_effects/mixin/CampfireBlockEntityMixin.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/blocks/campfire_effects/mixin/CampfireBlockEntityMixin.java @@ -44,7 +44,7 @@ abstract class CampfireBlockEntityMixin { if (!accept) return; List entities = new ArrayList<>(); - world.getEntities().get(new AABB(pos).inflate(campfireEffect.range()), entity -> { + world.getEntities(null, new AABB(pos).inflate(campfireEffect.range())).forEach(entity -> { if ((entity instanceof AgeableMob && campfireEffect.affectsPassive()) || entity instanceof Player) { entities.add((LivingEntity) entity); diff --git a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/BoatEntities.java b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/BoatEntities.java index 65516a3f..0e7607e7 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/BoatEntities.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/entities/boats/BoatEntities.java @@ -57,7 +57,7 @@ public class BoatEntities { TNTBoatEntity.EXPLODE_BOAT_ON_SERVER, (server, player, handler, buf, responseSender) -> { UUID id = buf.readUUID(); server.execute(() -> { - Entity entity = player.level.getEntities().get(id); + Entity entity = player.serverLevel().getEntity(id); if (entity instanceof TNTBoatEntity boat && boat.isAlive() && player == boat.getFirstPassenger()) boat.explode(); diff --git a/src/main/java/dev/zenfyr/andromeda/modules/items/infinite_totem/client/Client.java b/src/main/java/dev/zenfyr/andromeda/modules/items/infinite_totem/client/Client.java index 2217aaf8..947dd948 100644 --- a/src/main/java/dev/zenfyr/andromeda/modules/items/infinite_totem/client/Client.java +++ b/src/main/java/dev/zenfyr/andromeda/modules/items/infinite_totem/client/Client.java @@ -46,8 +46,8 @@ public class Client { int uuid = packetByteBuf.readVarInt(); ItemStack stack = packetByteBuf.readItem(); client.execute(() -> { - ItemEntity entity = (ItemEntity) - MakeSure.notNull(client.level, "client.world").getEntities().get(uuid); + ItemEntity entity = + (ItemEntity) MakeSure.notNull(client.level, "client.world").getEntity(uuid); if (entity != null) entity.getEntityData().set(ItemEntity.DATA_ITEM, stack); }); }); diff --git a/src/main/resources/andromeda.accesswidener b/src/main/resources/andromeda.accesswidener index 151981aa..116e90d3 100644 --- a/src/main/resources/andromeda.accesswidener +++ b/src/main/resources/andromeda.accesswidener @@ -14,10 +14,21 @@ accessible field net/minecraft/world/entity/Entity level Lnet/minecraft/world/le # gui/no_more_adventure accessible class net/minecraft/client/gui/screens/debug/GameModeSwitcherScreen$GameModeIcon -# entities/boats (furnaceBoat) +# entities/boats accessible field net/minecraft/client/renderer/entity/BoatRenderer boatResources Ljava/util/Map; accessible field net/minecraft/world/entity/vehicle/Boat status Lnet/minecraft/world/entity/vehicle/Boat$Status; extendable method net/minecraft/world/entity/vehicle/Boat floatBoat ()V +accessible method net/minecraft/client/multiplayer/ClientLevel getEntities ()Lnet/minecraft/world/level/entity/LevelEntityGetter; + +# entities/minecarts +accessible method net/minecraft/world/entity/vehicle/AbstractMinecart getDropItem ()Lnet/minecraft/world/item/Item; + +# entities/villagers_follow_emeralds +accessible field net/minecraft/world/entity/ai/goal/TemptGoal calmDown I +accessible field net/minecraft/world/entity/ai/goal/TemptGoal targetingConditions Lnet/minecraft/world/entity/ai/targeting/TargetingConditions; + +# gui +accessible method net/minecraft/client/gui/GuiGraphics renderTooltipInternal (Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V # gui/gui_particles (furnaceScreen) accessible field net/minecraft/client/gui/screens/inventory/AbstractContainerScreen topPos I @@ -30,11 +41,17 @@ accessible field net/minecraft/client/gui/screens/debug/GameModeSwitcherScreen s # misc/recipe_advancements_generation accessible field net/minecraft/server/ServerAdvancementManager advancements Lnet/minecraft/advancements/AdvancementList; +# items/magnet +accessible field net/minecraft/world/entity/item/ItemEntity DATA_ITEM Lnet/minecraft/network/syncher/EntityDataAccessor; + # items/minecart_block_picking accessible field net/minecraft/world/entity/vehicle/MinecartFurnace fuel I accessible field net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity litTime I accessible field net/minecraft/world/level/BaseSpawner nextSpawnData Lnet/minecraft/world/level/SpawnData; +# items/pouches +accessible field net/minecraft/world/level/block/entity/BlockEntityType validBlocks Ljava/util/Set; + # entities/villagers_follow_emeralds mechanics/throwable_items accessible field net/minecraft/world/entity/Mob goalSelector Lnet/minecraft/world/entity/ai/goal/GoalSelector; @@ -49,6 +66,7 @@ accessible method net/minecraft/world/entity/animal/Bee$BeePollinateGoal isPolli accessible method net/minecraft/world/entity/animal/Bee$BeePollinateGoal hasPollinatedLongEnough ()Z # world/falling_beenests +accessible method net/minecraft/world/entity/item/FallingBlockEntity (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V accessible method net/minecraft/world/entity/item/FallingBlockEntity readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V accessible method net/minecraft/world/level/block/entity/BeehiveBlockEntity removeIgnoredBeeTags (Lnet/minecraft/nbt/CompoundTag;)V -- 2.51.2