2.1.0

2026-09-23 11:29:20 -05:00
1 parent 06bada5191
commit 3316df7195
@@ -5,9 +5,9 @@ plugins {
 }

 base {
-    archivesName = "${mod_id}-fabric-1.21.1"
+    archivesName = mod_id
 }
-version = "${mod_version}+${project.name}"
+version = "${mod_version}+1.21.1-fabric"

 // Handle duplicates from common-1.21.1's resources
 tasks.withType(AbstractCopyTask).configureEach {
@@ -134,7 +134,7 @@ publishing {
    publications {
        mavenJava(MavenPublication) {
            groupId = rootProject.group
-            artifactId = project.base.archivesName.get()
+            artifactId = "${mod_id}-fabric-1.21.1"
            version = project.version

            artifact(project.tasks.named('remapJar'))
@@ -172,6 +172,16 @@ public final class AntarchyFabricEvents {
            }
        });

+        net.fabricmc.fabric.api.event.player.UseItemCallback.EVENT.register((player, world, hand) -> {
+            InteractionResult result = com.craisinlord.antarchy.content.item.GiantFryingPanItem.handleMainHandUse(world, player, hand);
+            if (result == InteractionResult.PASS) {
+                return net.minecraft.world.InteractionResultHolder.pass(ItemStack.EMPTY);
+            }
+            ItemStack held = player.getItemInHand(hand);
+            return result.consumesAction()
+                    ? net.minecraft.world.InteractionResultHolder.sidedSuccess(held, world.isClientSide)
+                    : net.minecraft.world.InteractionResultHolder.fail(held);
+        });
        AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> {
            if (!world.isClientSide && player.getItemInHand(hand).getItem() instanceof AttitudeAdjusterItem && player.getAttackStrengthScale(0.5F) >= 0.95F) {
                AttitudeAdjusterSlamManager.markSpecialHit(player);
@@ -279,7 +279,7 @@ public final class AntarchyFabricClientBootstrap {
                        ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/ichor/ichor_still"),
                        ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "block/ichor/ichor_flowing"),
                        ResourceLocation.withDefaultNamespace("block/water_overlay"),
-                        0xFF3D0408
+                        0xFFFFFFFF
                )
        );

@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.fabric.client;

 import com.craisinlord.antarchy.Antarchy;
 import com.craisinlord.antarchy.fabric.registry.AntarchyFabricItems;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -11,7 +10,7 @@ import java.util.Collection;
 import java.util.Map;

 public final class SeparateLargeItemModels {
-    private static final Map<Item, ModelResourceLocation> GUI_MODELS = Map.ofEntries(
+    private static final Map<Item, ResourceLocation> GUI_MODELS = Map.ofEntries(
            entry(AntarchyFabricItems.ATTITUDE_ADJUSTER.get(), "attitude_adjuster_gui"),
            entry(AntarchyFabricItems.BATTLE_AXE.get(), "battle_axe_gui"),
            entry(AntarchyFabricItems.BIG_BERTHA.get(), "big_bertha_gui"),
@@ -33,17 +32,15 @@ public final class SeparateLargeItemModels {
    private SeparateLargeItemModels() {
    }

-    public static ModelResourceLocation modelFor(ItemStack stack) {
+    public static ResourceLocation modelFor(ItemStack stack) {
        return GUI_MODELS.get(stack.getItem());
    }

-    public static Collection<ModelResourceLocation> all() {
+    public static Collection<ResourceLocation> all() {
        return GUI_MODELS.values();
    }

-    private static Map.Entry<Item, ModelResourceLocation> entry(Item item, String modelPath) {
-        return Map.entry(item, ModelResourceLocation.inventory(
-                ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, modelPath)
-        ));
+    private static Map.Entry<Item, ResourceLocation> entry(Item item, String modelPath) {
+        return Map.entry(item, ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "item/" + modelPath));
    }
 }
@@ -0,0 +1,28 @@
+package com.craisinlord.antarchy.fabric.mixin.client;
+
+import com.craisinlord.antarchy.fabric.client.SeparateLargeItemModels;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.fabricmc.fabric.api.client.model.loading.v1.FabricBakedModelManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(GuiGraphics.class)
+public abstract class SeparateLargeItemGuiLightingMixin {
+    @ModifyVariable(
+            method = "renderItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;IIII)V",
+            at = @At("STORE"),
+            ordinal = 0
+    )
+    private BakedModel antarchy$useGuiModelForLighting(BakedModel original, @Local(argsOnly = true) ItemStack stack) {
+        var guiModel = SeparateLargeItemModels.modelFor(stack);
+        if (guiModel != null) {
+            return ((FabricBakedModelManager) Minecraft.getInstance().getModelManager()).getModel(guiModel);
+        }
+        return original;
+    }
+}
@@ -2,6 +2,7 @@ package com.craisinlord.antarchy.fabric.mixin.client;

 import com.craisinlord.antarchy.fabric.client.SeparateLargeItemModels;
 import com.llamalad7.mixinextras.sugar.Local;
+import net.fabricmc.fabric.api.client.model.loading.v1.FabricBakedModelManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
@@ -19,7 +20,7 @@ public abstract class SeparateLargeItemModelsMixin {
                                               @Local(argsOnly = true) ItemDisplayContext displayContext) {
        var guiModel = SeparateLargeItemModels.modelFor(stack);
        if (guiModel != null && isGuiContext(displayContext)) {
-            return Minecraft.getInstance().getModelManager().getModel(guiModel);
+            return ((FabricBakedModelManager) Minecraft.getInstance().getModelManager()).getModel(guiModel);
        }
        return original;
    }
@@ -620,7 +620,7 @@ public final class AntarchyFabricEntities {

    public static final DeferredHolder<EntityType<?>, EntityType<com.craisinlord.antarchy.content.entity.ManticoreEntity>> MANTICORE = ENTITY_TYPES.register("manticore",
            () -> EntityType.Builder.of(com.craisinlord.antarchy.content.entity.ManticoreEntity::new, MobCategory.MONSTER)
-                    .sized(1.95F, 2.0F)
+                    .sized(1.95F, 2.75F)
                    .clientTrackingRange(10)
                    .fireImmune()
                    .build("manticore"));
@@ -1046,7 +1046,7 @@ public final class AntarchyFabricItems {
            ));
    public static final DeferredItem<BloodGodsBladeItem> BLOOD_GODS_BLADE = ITEMS.register("blood_gods_blade",
            () -> new BloodGodsBladeItem(ULTIMATE_TIER,
-                    new Item.Properties().stacksTo(1).durability(4096).rarity(Rarity.EPIC).fireResistant(), 80, -2.4F));
+                    new Item.Properties().stacksTo(1).durability(4096).rarity(Rarity.EPIC).fireResistant(), 24, -2.4F));


    public static final DeferredItem<MantisClawItem> MANTIS_CLAW = ITEMS.register("mantis_claw",
@@ -28,6 +28,7 @@
  ],
  "client": [
    "client.SeparateLargeItemModelsMixin",
+    "client.SeparateLargeItemGuiLightingMixin",
    "client.CameraShakeMixin",
    "client.BrutalflyElytraExperienceBarMixin",
    "client.BloodglassChatOrderMixin",
@@ -1,3 +1,4 @@
 {
-  "parent": "antarchy:item/attitude_adjuster_held"
+  "parent": "antarchy:item/attitude_adjuster_held",
+  "gui_light": "front"
 }
@@ -1,3 +1,4 @@
 {
-  "parent": "antarchy:item/krakens_grasp_held"
+  "parent": "antarchy:item/krakens_grasp_held",
+  "gui_light": "front"
 }