Merge pull request #10 from Team-Symphony/port/1.21.3

Flatkat · web-flow · commit 45b76481b061 · 2024-11-08T18:51:51.000+01:00
Port to 1.21.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 - MidnightLib will be replaced by a different config lib
 
+## [0.0.1-alpha+mc1.21.3] - 2024-11-7
+
+### Changed
+
+#### General
+
+- Ported to 1.21.3
+- Netherite Horse Armor's protection value is now configurable
+
 ## [0.0.1-alpha+mc1.21] - 2024-10-23
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.16.5
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
+loader_version=0.16.7
 
 # Mod Properties
-mod_version=0.0.1-alpha+mc1.21
+mod_version=0.0.1-alpha+mc1.21.3
 maven_group=dev.symphony.melody
 archives_base_name=melody
 
 # Dependencies
-fabric_version=0.105.0+1.21.1
-midnightlib_version = 1.6.3-fabric
+fabric_version=0.106.1+1.21.3
+midnightlib_version = 1.6.4-fabric
diff --git a/gradlew b/gradlew
diff --git a/src/client/java/dev/symphony/melody/map_book/MapBookScreen.java b/src/client/java/dev/symphony/melody/map_book/MapBookScreen.java
@@ -2,6 +2,7 @@
 
 import dev.symphony.melody.item.ModItems;
 import dev.symphony.melody.item.map_book.MapStateData;
+import dev.symphony.melody.mixin.client.map_book.DrawContextAccessor;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -128,7 +129,7 @@ private void renderPlayerIcon(DrawContext context, float x, float z, float rotat
         float l = sprite.getMaxU();
         float m = sprite.getMaxV();
         Matrix4f matrix4f2 = context.getMatrices().peek().getPositionMatrix();
-        VertexConsumer vertexConsumer2 = context.getVertexConsumers().getBuffer(RenderLayer.getText(sprite.getAtlasId()));
+        VertexConsumer vertexConsumer2 = ((DrawContextAccessor)context).getVertexConsumers().getBuffer(RenderLayer.getText(sprite.getAtlasId()));
         vertexConsumer2.vertex(matrix4f2, -1.0F, 1.0F, -0.1F).color(255, 255, 255, 255).texture(g, h).light(15728880);
         vertexConsumer2.vertex(matrix4f2, 1.0F, 1.0F, -0.1F).color(255, 255, 255, 255).texture(l, h).light(15728880);
         vertexConsumer2.vertex(matrix4f2, 1.0F, -1.0F, -0.1F).color(255, 255, 255, 255).texture(l, m).light(15728880);
diff --git a/src/client/java/dev/symphony/melody/map_book/MapTile.java b/src/client/java/dev/symphony/melody/map_book/MapTile.java
@@ -1,27 +1,31 @@
 package dev.symphony.melody.map_book;
 
+import dev.symphony.melody.mixin.client.map_book.DrawContextAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
+import net.minecraft.client.render.MapRenderState;
 import net.minecraft.component.type.MapIdComponent;
 import net.minecraft.item.map.MapState;
 import org.jetbrains.annotations.NotNull;
 
 public final class MapTile implements Drawable {
     @NotNull
     private final MapBookScreen screen;
-    private final MapIdComponent id;
     @NotNull
     private final MapState mapState;
     @NotNull
     private final MinecraftClient client;
 
+    private final MapRenderState mapRenderState;
+
     public MapTile(@NotNull MapBookScreen screen, MapIdComponent id, @NotNull MapState mapState, @NotNull MinecraftClient client) {
         super();
         this.screen = screen;
-        this.id = id;
         this.mapState = mapState;
         this.client = client;
+        this.mapRenderState = new MapRenderState();
+        this.client.getMapRenderer().update(id, mapState, mapRenderState);
     }
 
     @Override
@@ -33,7 +37,9 @@ public void render(@NotNull DrawContext context, int mouseX, int mouseY, float d
         context.getMatrices().scale(this.screen.getScale(), this.screen.getScale(), -1.0F);
         context.getMatrices().translate((double)this.mapState.centerX - (double)offset + (double)this.screen.width / 2.0, (double)this.mapState.centerZ - (double)offset + (double)this.screen.height / 2.0, 0.0);
         context.getMatrices().scale(mapScale, mapScale, 1.0F);
-        this.client.gameRenderer.getMapRenderer().draw(context.getMatrices(), context.getVertexConsumers(), id, this.mapState, true, 15728880);
+        this.client.getMapRenderer().draw(mapRenderState, context.getMatrices(), ((DrawContextAccessor)context).getVertexConsumers(), true, 15728880);
         context.getMatrices().pop();
     }
+
+
 }
diff --git a/src/client/java/dev/symphony/melody/mixin/client/map_book/DrawContextAccessor.java b/src/client/java/dev/symphony/melody/mixin/client/map_book/DrawContextAccessor.java
@@ -0,0 +1,12 @@
+package dev.symphony.melody.mixin.client.map_book;
+
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.render.VertexConsumerProvider;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(DrawContext.class)
+public interface DrawContextAccessor {
+    @Accessor
+    VertexConsumerProvider.Immediate getVertexConsumers();
+}
diff --git a/src/client/java/dev/symphony/melody/mixin/client/map_book/HeldMapBookRenderingMixin.java b/src/client/java/dev/symphony/melody/mixin/client/map_book/HeldMapBookRenderingMixin.java
@@ -6,8 +6,9 @@
 import dev.symphony.melody.item.map_book.MapStateData;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.item.HeldItemRenderer;
+import net.minecraft.component.ComponentType;
 import net.minecraft.component.DataComponentTypes;
-import net.minecraft.item.Item;
+import net.minecraft.component.type.MapIdComponent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import org.spongepowered.asm.mixin.Final;
@@ -26,12 +27,11 @@ public class HeldMapBookRenderingMixin {
     @Unique
     private MapStateData nearestMap;
 
-    @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"), method = "renderFirstPersonItem")
-    private boolean passMapCheck(ItemStack instance, Item item, Operation<Boolean> original) {
-        if (original.call(instance, item)) return true;
-        if (client.player == null || client.world == null) return false;
+    @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;contains(Lnet/minecraft/component/ComponentType;)Z"), method = "renderFirstPersonItem")
+    private boolean passMapCheck(ItemStack instance, ComponentType<MapIdComponent> componentType, Operation<Boolean> original) {
+        if (!(instance.getItem() instanceof MapBookItem mapBookItem)) return original.call(instance, componentType);
 
-        if (!(instance.getItem() instanceof MapBookItem mapBookItem)) return false;
+        if (client.player == null || client.world == null) return false;
         nearestMap = mapBookItem.getNearestMap(instance, client.world, client.player.getPos());
         return nearestMap != null;
     }
diff --git a/src/client/resources/melody.client.mixins.json b/src/client/resources/melody.client.mixins.json
@@ -4,6 +4,7 @@
   "compatibilityLevel": "JAVA_21",
   "client": [
     "map_book.CartographyTableScreenMixin",
+    "map_book.DrawContextAccessor",
     "map_book.HeldMapBookRenderingMixin",
     "map_book.MapPositionRequestMixin"
   ],
diff --git a/src/main/java/dev/symphony/melody/Melody.java b/src/main/java/dev/symphony/melody/Melody.java
@@ -12,6 +12,8 @@
 import dev.symphony.melody.network.MapBookSyncPayload;
 
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.item.equipment.ArmorMaterials;
+import net.minecraft.item.equipment.EquipmentType;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +37,9 @@ public void onInitialize() {
 		ResourceConditionType<MelodyConfigCondition> conditionType = ResourceConditionType.create(Melody.id("config"), MelodyConfigCondition.CODEC);
 		ResourceConditions.register(conditionType);
 
+		// Set Netherite Horse Armor Defense value
+		ArmorMaterials.NETHERITE.defense().put(EquipmentType.BODY, MelodyConfig.netheriteHorseArmorDefense);
+
 		// gay stuff (registry)
 		ModItemGroups.registerItemGroups();
 		ModItems.registerItems();
diff --git a/src/main/java/dev/symphony/melody/config/MelodyConfig.java b/src/main/java/dev/symphony/melody/config/MelodyConfig.java
@@ -10,6 +10,7 @@ public class MelodyConfig extends MidnightConfig {
     @Entry(category = TRANS) public static boolean vehiclesMoveThroughLeaves = true;
     @Entry(category = TRANS, isSlider = true, min = 0f, max = 1f) public static float leafSpeedFactor = 0.85f;
     @MelodyConfigCondition.ResourceConfigName(config_name = "item/netherite_horse_armor") @Entry(category = TRANS) public static boolean netheriteHorseArmor = true;
+    @Entry(category = TRANS) public static int netheriteHorseArmorDefense = 15;
 
     public static final String EXPLORATION = "exploration";
     @MelodyConfigCondition.ResourceConfigName(config_name = "item/map_book") @Entry(category = EXPLORATION) public static boolean mapBook = true;
diff --git a/src/main/java/dev/symphony/melody/config/MelodyConfigCondition.java b/src/main/java/dev/symphony/melody/config/MelodyConfigCondition.java
@@ -6,7 +6,7 @@
 import dev.symphony.melody.Melody;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditionType;
-import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.RegistryOps;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.annotation.ElementType;
@@ -62,9 +62,8 @@ public ResourceConditionType<?> getType() {
         return ResourceConditionType.create(Melody.id("config"), CODEC);
     }
 
-
     @Override
-    public boolean test(@Nullable RegistryWrapper.WrapperLookup registryLookup) {
+    public boolean test(@Nullable RegistryOps.RegistryInfoGetter registryInfo) {
         return resourceMap.getOrDefault(config_name, false);
     }
 }
diff --git a/src/main/java/dev/symphony/melody/item/ModArmorMaterials.java b/src/main/java/dev/symphony/melody/item/ModArmorMaterials.java
diff --git a/src/main/java/dev/symphony/melody/item/ModItems.java b/src/main/java/dev/symphony/melody/item/ModItems.java
@@ -6,9 +6,14 @@
 import net.minecraft.component.ComponentType;
 import net.minecraft.item.AnimalArmorItem;
 import net.minecraft.item.Item;
+import net.minecraft.item.equipment.ArmorMaterials;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.sound.SoundEvents;
 
+import java.util.function.Function;
 import java.util.function.UnaryOperator;
 
 
@@ -19,19 +24,21 @@ public class ModItems {
     // ARTISTS: Eleanor
     public static final Item NETHERITE_HORSE_ARMOR = registerItem(
             // Uses custom armor material in order to change the protection from 11 to 15 (since horse armor takes the chestplate protection from the material)
-            "netherite_horse_armor", new AnimalArmorItem(ModArmorMaterials.NETHERITE_HORSE_ARMOR_MATERIAL, AnimalArmorItem.Type.EQUESTRIAN, false, new Item.Settings().maxCount(1).fireproof())
+            "netherite_horse_armor",
+            settings -> new AnimalArmorItem(ArmorMaterials.NETHERITE, AnimalArmorItem.Type.EQUESTRIAN, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, false, settings),
+            new Item.Settings().maxCount(1).fireproof()
     );
 
     // FEATURE: Map Book
     // AUTHORS: Nettakrim
     // ARTISTS: Eleanor
-    public static final MapBookItem MAP_BOOK = (MapBookItem)registerItem("map_book", new MapBookItem(new Item.Settings().maxCount(16)));
+    public static final MapBookItem MAP_BOOK = (MapBookItem)registerItem("map_book", MapBookItem::new, new Item.Settings().maxCount(16));
     public static final ComponentType<MapBookAdditionsComponent> MAP_BOOK_ADDITIONS = registerComponent("melody_map_book_additions", (builder) -> builder.codec(MapBookAdditionsComponent.CODEC).packetCodec(MapBookAdditionsComponent.PACKET_CODEC).cache());
 
 
-
-    public static Item registerItem(String name, Item item){
-        return Registry.register(Registries.ITEM, Melody.id(name), item);
+    public static Item registerItem(String id, Function<Item.Settings, Item> constructor, Item.Settings settings) {
+        RegistryKey<Item> key = RegistryKey.of(RegistryKeys.ITEM, Melody.id(id));
+        return Registry.register(Registries.ITEM, key, constructor.apply(settings.useItemPrefixedTranslationKey().registryKey(key)));
     }
 
     private static <T> ComponentType<T> registerComponent(String id, UnaryOperator<ComponentType.Builder<T>> builderOperator) {
diff --git a/src/main/java/dev/symphony/melody/item/ModRecipes.java b/src/main/java/dev/symphony/melody/item/ModRecipes.java
@@ -3,13 +3,13 @@
 import dev.symphony.melody.Melody;
 import dev.symphony.melody.item.map_book.MapBookAdditionRecipe;
 import dev.symphony.melody.item.map_book.MapBookCloningRecipe;
-import net.minecraft.recipe.SpecialRecipeSerializer;
+import net.minecraft.recipe.SpecialCraftingRecipe;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 
 public final class ModRecipes {
-    public static final SpecialRecipeSerializer<MapBookAdditionRecipe> MAP_BOOK_ADDITION_SERIALIZER = new SpecialRecipeSerializer<>(MapBookAdditionRecipe::new);
-    public static final SpecialRecipeSerializer<MapBookCloningRecipe> MAP_BOOK_CLONING_SERIALIZER = new SpecialRecipeSerializer<>(MapBookCloningRecipe::new);
+    public static final SpecialCraftingRecipe.SpecialRecipeSerializer<MapBookAdditionRecipe> MAP_BOOK_ADDITION_SERIALIZER = new SpecialCraftingRecipe.SpecialRecipeSerializer<>(MapBookAdditionRecipe::new);
+    public static final SpecialCraftingRecipe.SpecialRecipeSerializer<MapBookCloningRecipe> MAP_BOOK_CLONING_SERIALIZER = new SpecialCraftingRecipe.SpecialRecipeSerializer<>(MapBookCloningRecipe::new);
 
     public static void registerRecipes() {
         Melody.LOGGER.info("Registering Recipes for: " + Melody.MOD_ID);
diff --git a/src/main/java/dev/symphony/melody/item/map_book/MapBookAdditionRecipe.java b/src/main/java/dev/symphony/melody/item/map_book/MapBookAdditionRecipe.java
@@ -77,11 +77,6 @@ private AdditionResult getResult(CraftingRecipeInput craftingRecipeInput, World
         return new AdditionResult(mapBook, maps);
     }
 
-    @Override
-    public boolean fits(int width, int height) {
-        return width * height >= 2;
-    }
-
     @Override @NotNull
     public RecipeSerializer<MapBookAdditionRecipe> getSerializer() {
         return ModRecipes.MAP_BOOK_ADDITION_SERIALIZER;
diff --git a/src/main/java/dev/symphony/melody/item/map_book/MapBookCloningRecipe.java b/src/main/java/dev/symphony/melody/item/map_book/MapBookCloningRecipe.java
@@ -58,11 +58,6 @@ private ItemStack getResult(CraftingRecipeInput craftingRecipeInput) {
         }
     }
 
-    @Override
-    public boolean fits(int width, int height) {
-        return width * height >= 2;
-    }
-
     @Override @NotNull
     public RecipeSerializer<MapBookCloningRecipe> getSerializer() {
         return ModRecipes.MAP_BOOK_CLONING_SERIALIZER;
diff --git a/src/main/java/dev/symphony/melody/item/map_book/MapBookItem.java b/src/main/java/dev/symphony/melody/item/map_book/MapBookItem.java
@@ -22,7 +22,6 @@
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
-import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +32,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public final class MapBookItem extends NetworkSyncedItem {
+public final class MapBookItem extends Item {
     public MapBookItem(Item.Settings settings) {
         super(settings);
     }
@@ -51,14 +50,14 @@ public ActionResult useOnBlock(@NotNull ItemUsageContext context) {
                 }
             }
 
-            return ActionResult.success(context.getWorld().isClient);
+            return ActionResult.SUCCESS;
         } else {
             return super.useOnBlock(context);
         }
     }
 
     @Override @NotNull
-    public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
+    public ActionResult use(World world, PlayerEntity user, Hand hand) {
         if (world != null && !world.isClient()) {
             ServerPlayerEntity player = (ServerPlayerEntity)user;
             ItemStack item = user.getStackInHand(hand);
diff --git a/src/main/resources/assets/melody/lang/en_us.json b/src/main/resources/assets/melody/lang/en_us.json
@@ -9,6 +9,7 @@
   "melody.midnightconfig.vehiclesMoveThroughLeaves": "Rideable mobs can move through leaves when ridden",
   "melody.midnightconfig.leafSpeedFactor": "Rideable mob speed percentage while inside leaves",
   "melody.midnightconfig.netheriteHorseArmor": "Netherite Horse Armor",
+  "melody.midnightconfig.netheriteHorseArmorDefense": "Netherite Horse Armor defense points",
 
   "melody.midnightconfig.category.exploration": "Exploration",
   "melody.midnightconfig.mapBook": "Map Book",
diff --git a/src/main/resources/assets/minecraft/models/equipment/netherite.json b/src/main/resources/assets/minecraft/models/equipment/netherite.json
@@ -0,0 +1,19 @@
+{
+  "layers": {
+    "horse_body": [
+      {
+        "texture": "minecraft:netherite"
+      }
+    ],
+    "humanoid": [
+      {
+        "texture": "minecraft:netherite"
+      }
+    ],
+    "humanoid_leggings": [
+      {
+        "texture": "minecraft:netherite"
+      }
+    ]
+  }
+}
diff --git a/src/main/resources/assets/minecraft/textures/entity/equipment/horse_body/netherite.png b/src/main/resources/assets/minecraft/textures/entity/equipment/horse_body/netherite.png
diff --git a/src/main/resources/data/melody/recipe/empty_map_book.json b/src/main/resources/data/melody/recipe/empty_map_book.json
@@ -2,12 +2,8 @@
     "type": "minecraft:crafting_shapeless",
     "category": "misc",
     "ingredients": [
-        {
-            "item": "minecraft:book"
-        },
-        {
-            "item": "minecraft:map"
-        }
+            "minecraft:book",
+            "minecraft:map"
     ],
     "result": {
         "id": "melody:map_book",
diff --git a/src/main/resources/data/melody/recipe/netherite_horse_armor_smithing.json b/src/main/resources/data/melody/recipe/netherite_horse_armor_smithing.json
