Skip to content

Commit

Permalink
8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MC-datapack committed Feb 16, 2025
1 parent c149ad9 commit 30c56e8
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 16 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ yarn_mappings=25w07a+build.1
loader_version=0.16.10

# Mod Properties
mod_version=8.0+25w07a
mod_version=8.1+25w07a
maven_group=github.mcdatapack.more_tools_and_armor
archives_base_name=more_tools_and_armor

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package github.mcdatapack.more_tools_and_armor.mixns;

import com.llamalad7.mixinextras.sugar.Local;
import github.mcdatapack.more_tools_and_armor.init.ArmorMaterialInit;
import github.mcdatapack.more_tools_and_armor.item.MoreToolsAndArmorArmorItem;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.*;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import java.util.ArrayList;
import java.util.List;

@Mixin(ItemStack.class)
public abstract class ToolTipHandler {
@Shadow
public abstract Item getItem();

@Shadow public abstract void increment(int amount);

@Inject(method = "getTooltip", at = @At("RETURN"), cancellable = true)
private void getTooltip(Item.TooltipContext context, PlayerEntity player, TooltipType tooltipType, CallbackInfoReturnable<List<Text>> info) {
List<Text> list = new ArrayList<>();
var returnV = info.getReturnValue();
list.add(returnV.getFirst());
returnV.removeFirst();
if (getItem() == Items.GOLDEN_HELMET || getItem() == Items.GOLDEN_CHESTPLATE || getItem() == Items.GOLDEN_LEGGINGS || getItem() == Items.GOLDEN_BOOTS ||
getItem() == Items.NETHERITE_HELMET || getItem() == Items.NETHERITE_CHESTPLATE || getItem() == Items.NETHERITE_LEGGINGS || getItem() == Items.NETHERITE_BOOTS) {
list.add(1, Text.translatable("more_tools_and_armor.tooltip.piglin_save"));
} else if (getItem() instanceof MoreToolsAndArmorArmorItem armorItem) {
var material = armorItem.getMaterial();
if (material == ArmorMaterialInit.DEEPSLATE_EMERALD) {
list.add(Text.translatable("more_tools_and_armor.tooltip.piglin_save"));
} else if (material == ArmorMaterialInit.END_DIAMOND || material == ArmorMaterialInit.VOID) {
list.add(Text.translatable("more_tools_and_armor.tooltip.piglin_save"));
list.add(Text.translatable("more_tools_and_armor.tooltip.enderman_save"));
} else if (material == ArmorMaterialInit.ONETHDENDERITE) {
list.add(Text.translatable("more_tools_and_armor.tooltip.piglin_save"));
list.add(Text.translatable("more_tools_and_armor.tooltip.enderman_save"));
list.add(Text.translatable("more_tools_and_armor.tooltip.piglin_passive"));
} else if (material == ArmorMaterialInit.OLED) {
list.add(Text.translatable("more_tools_and_armor.tooltip.piglin_save"));
list.add(Text.translatable("more_tools_and_armor.tooltip.enderman_save"));
list.add(Text.translatable("more_tools_and_armor.tooltip.piglin_passive"));
list.add(Text.translatable("more_tools_and_armor.tooltip.enderman_passive"));
list.add(Text.translatable("more_tools_and_armor.tooltip.iron_golem_passive"));
}
}
list.addAll(returnV);
info.setReturnValue(list);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"more_tools_and_armor.tooltip.piglin_save": "§2Piglin Save",
"more_tools_and_armor.tooltip.enderman_save": "§2Allows the Player to look into the eyes of a Enderman without being attacked",
"more_tools_and_armor.tooltip.piglin_passive": "§2Piglins do not attack the player even if the Player Punches the Piglin",
"more_tools_and_armor.tooltip.enderman_passive": "§2Enderman do not attack the player even if the Player Punches the Enderman",
"more_tools_and_armor.tooltip.iron_golem_passive": "§2Iron Golems do not attack the player even if the Player Punches the Iron Golem",

"itemGroup.more_tools_and_armor.more_tools_and_armor_group": "More Tools and Armor",
"block.more_tools_and_armor.end_coal_ore": "End Coal Ore",
"block.more_tools_and_armor.end_copper_ore": "End Copper Ore",
Expand Down Expand Up @@ -228,4 +234,4 @@
"advancement.description.onethdenderite/tool": "Obtain an §2O§4neth§5d§eend§8erite§5 Pickaxe and an §2O§4neth§5d§eend§8erite§5 Shovel and an §2O§4neth§5d§eend§8erite§5 Hoe",
"advancement.title.onethdenderite/armor": "§2O§4neth§5d§eend§8erite§5 Armor",
"advancement.description.onethdenderite/armor": "Obtain an full set of §2O§4neth§5d§eend§8erite§5 Armor"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
]
},
"mixins": [
"mixins.more_tools_and_armor-abilities.json"
"mixins.more_tools_and_armor.json"
],
"depends": {
"fabricloader": ">=0.16.9",
Expand Down
13 changes: 0 additions & 13 deletions src/main/resources/mixins.more_tools_and_armor-abilities.json

This file was deleted.

14 changes: 14 additions & 0 deletions src/main/resources/mixins.more_tools_and_armor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"required": true,
"minVersion": "0.8",
"package": "github.mcdatapack.more_tools_and_armor.mixns",
"compatibilityLevel": "JAVA_21",
"mixins": [
"ability.EndermanEntityMixin",
"ability.TargetPredicateMixin",
"ToolTipHandler"
],
"injectors": {
"defaultRequire": 1
}
}

0 comments on commit 30c56e8

Please sign in to comment.