Move around environment attributes

Author: kennytv

api/src/main/java/com/viaversion/viaversion/api/minecraft/item/data/SwingAnimation.java

@@ -29,7 +29,7 @@
 
 public record SwingAnimation(int type, int duration) {
 
-    private static final int DEFAULT_TYPE = EnumTypes.SWING_ANIMATION.byName("whack");
+    private static final int DEFAULT_TYPE = EnumTypes.SWING_ANIMATION.idFromName("whack");
 
     public static final Type<SwingAnimation> TYPE = new Type<>(SwingAnimation.class) {
         @Override

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_9to1_21_11/Protocol1_21_9To1_21_11.java

@@ -17,6 +17,11 @@
  */
 package com.viaversion.viaversion.protocols.v1_21_9to1_21_11;
 
+import com.viaversion.nbt.tag.ByteTag;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntTag;
+import com.viaversion.nbt.tag.NumberTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.MappingData;
 import com.viaversion.viaversion.api.data.MappingDataBase;
@@ -50,6 +55,8 @@
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.rewriter.text.NBTComponentRewriter;
+import java.util.function.Function;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 
@@ -71,6 +78,25 @@ public Protocol1_21_9To1_21_11() {
     protected void registerPackets() {
         super.registerPackets();
 
+        registryDataRewriter.addHandler("dimension_type", (key, tag) -> {
+            final ByteTag trueTag = new ByteTag((byte) 1);
+            final CompoundTag attributes = new CompoundTag();
+            tag.put("attributes", attributes);
+            moveAttribute(tag, attributes, "cloud_height", "visual/cloud_height", Function.identity(), null);
+            moveAttribute(tag, attributes, "has_raids", "gameplay/can_start_raid", Function.identity(), trueTag);
+            moveAttribute(tag, attributes, "piglin_safe", "gameplay/piglins_zombify", attributeTag -> ((NumberTag) attributeTag).asBoolean() ? ByteTag.ZERO : trueTag, ByteTag.ZERO);
+            moveAttribute(tag, attributes, "respawn_anchor_works", "gameplay/respawn_anchor_works", Function.identity(), trueTag);
+            moveAttribute(tag, attributes, "ultrawarm", "gameplay/fast_lava", Function.identity(), ByteTag.ZERO);
+            moveAttribute(tag, attributes, "ultrawarm", "gameplay/water_evaporates", Function.identity(), ByteTag.ZERO);
+        });
+        registryDataRewriter.addHandler("worldgen/biome", (key, tag) -> {
+            final CompoundTag effects = tag.getCompoundTag("effects");
+            final CompoundTag attributes = new CompoundTag();
+            tag.put("attributes", attributes);
+            moveAttribute(effects, attributes, "sky_color", "visual/sky_color", Function.identity(), new IntTag(0));
+            moveAttribute(effects, attributes, "water_fog_color", "visual/water_fog_color", Function.identity(), new IntTag(-16448205));
+            moveAttribute(effects, attributes, "fog_color", "visual/fog_color", Function.identity(), new IntTag(0));
+        });
         registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
 
         tagRewriter.registerGeneric(ClientboundPackets1_21_9.UPDATE_TAGS);
@@ -149,6 +175,19 @@ protected void onMappingDataLoaded() {
         super.onMappingDataLoaded();
     }
 
+    private void moveAttribute(
+        final CompoundTag baseTag, final CompoundTag attributes,
+        final String key, final String mappedKey,
+        final Function<Tag, Tag> tagMapper, @Nullable final Tag defaultTag
+    ) {
+        final Tag attributeTag = baseTag.get(key);
+        if (attributeTag != null) {
+            attributes.put(mappedKey, tagMapper.apply(attributeTag));
+        } else if (defaultTag != null) {
+            attributes.put(mappedKey, defaultTag);
+        }
+    }
+
     @Override
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_11.PLAYER));

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_9to1_21_11/rewriter/EntityPacketRewriter1_21_11.java

@@ -19,14 +19,14 @@
 
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
+import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_9;
-import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundConfigurationPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPacket1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.Protocol1_21_9To1_21_11;
 import com.viaversion.viaversion.protocols.v1_21_9to1_21_11.storage.GameTimeStorage;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
-import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
+import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandlerEvent;
 
 public final class EntityPacketRewriter1_21_11 extends EntityRewriter<ClientboundPacket1_21_9, Protocol1_21_9To1_21_11> {
 
@@ -59,11 +59,8 @@ protected void registerRewrites() {
             entityDataTypes.optionalComponentType
         );
 
-        filter().type(EntityTypes1_21_11.WOLF).index(20).handler((event, data) -> {
-            final long currentGameTime = event.user().get(GameTimeStorage.class).gameTime();
-            final int remainingAngerTime = data.value();
-            data.setTypeAndValue(entityDataTypes.longType, currentGameTime + remainingAngerTime);
-        });
+        filter().type(EntityTypes1_21_11.WOLF).index(20).handler(this::relativeToAbsoluteTicks);
+        filter().type(EntityTypes1_21_11.BEE).index(18).handler(this::relativeToAbsoluteTicks);
     }
 
     @Override
@@ -75,4 +72,10 @@ public void onMappingDataLoaded() {
     public EntityType typeFromId(final int type) {
         return EntityTypes1_21_11.getTypeFromId(type);
     }
+
+    private void relativeToAbsoluteTicks(final EntityDataHandlerEvent event, final EntityData data) {
+        final long currentGameTime = event.user().get(GameTimeStorage.class).gameTime();
+        final int remainingAngerTime = data.value();
+        data.setTypeAndValue(protocol.mappedTypes().entityDataTypes().longType, currentGameTime + remainingAngerTime);
+    }
 }