Skip to content

Commit b4458e2

Browse files
committed
- custom Trident
1 parent 98a457e commit b4458e2

3 files changed

Lines changed: 44 additions & 22 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package blob.vanillasquared.mixin.world.item.items;
2+
3+
import blob.vanillasquared.util.api.other.vsqIdentifiers;
4+
import blob.vanillasquared.util.data.GeneralWeapon;
5+
import net.minecraft.world.entity.EquipmentSlotGroup;
6+
import net.minecraft.world.item.TridentItem;
7+
import net.minecraft.world.item.component.ItemAttributeModifiers;
8+
import org.spongepowered.asm.mixin.Mixin;
9+
import org.spongepowered.asm.mixin.injection.At;
10+
import org.spongepowered.asm.mixin.injection.Inject;
11+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
12+
13+
@Mixin(TridentItem.class)
14+
public class TridentItemMixin {
15+
@Inject(method = "createAttributes", at = @At("HEAD"), cancellable = true)
16+
private static void createAttributes(CallbackInfoReturnable<ItemAttributeModifiers> cir) {
17+
GeneralWeapon trident = new GeneralWeapon(vsqIdentifiers.vsqTridentOverride.identifier(), EquipmentSlotGroup.MAINHAND, 7.0f, -2.875f, +1.0f);
18+
cir.setReturnValue(trident.build());
19+
}
20+
}

src/main/java/blob/vanillasquared/util/api/other/vsqIdentifiers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ public enum vsqIdentifiers {
88
vsqArmorBootsOverride(Identifier.fromNamespaceAndPath("vanilla-squared", "armor_boots_override")),
99
vsqArmorHelmetOverride(Identifier.fromNamespaceAndPath("vanilla-squared", "armor_helmet_override")),
1010
vsqSwordOverride(Identifier.fromNamespaceAndPath("vanilla-squared", "sword_override")),
11-
vsqAxeOverride(Identifier.fromNamespaceAndPath("vanilla-squared", "axe_override"));
11+
vsqAxeOverride(Identifier.fromNamespaceAndPath("vanilla-squared", "axe_override")),
12+
vsqTridentOverride(Identifier.fromNamespaceAndPath("vanilla-squared", "trident_override"));
1213

1314
private final Identifier identifier;
1415

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
2-
"required": true,
3-
"package": "blob.vanillasquared.mixin",
4-
"compatibilityLevel": "JAVA_21",
5-
"mixins": [
6-
"world.item.items.ArmorMaterialMixin",
7-
"world.item.items.AxeMixin",
8-
"world.dmgsources.CombatRulesMixin",
9-
"world.entity.entities.FishingRodHookMixin",
10-
"world.item.ItemPropertiesMixin",
11-
"world.item.ItemsMixin",
12-
"world.entity.LivingEntityAttributesMixin",
13-
"world.entity.LivingEntityMixin",
14-
"world.entity.entities.PlayerMixin",
15-
"world.attributes.RangedAttributeMixin",
16-
"world.item.items.ToolMaterialMixin"
17-
],
18-
"injectors": {
19-
"defaultRequire": 1
20-
},
21-
"overwrites": {
22-
"requireAnnotations": true
2+
"required": true,
3+
"package": "blob.vanillasquared.mixin",
4+
"compatibilityLevel": "JAVA_21",
5+
"mixins": [
6+
"world.attributes.RangedAttributeMixin",
7+
"world.dmgsources.CombatRulesMixin",
8+
"world.entity.LivingEntityAttributesMixin",
9+
"world.entity.LivingEntityMixin",
10+
"world.entity.entities.FishingRodHookMixin",
11+
"world.entity.entities.PlayerMixin",
12+
"world.item.ItemPropertiesMixin",
13+
"world.item.ItemsMixin",
14+
"world.item.items.ArmorMaterialMixin",
15+
"world.item.items.AxeMixin",
16+
"world.item.items.ToolMaterialMixin",
17+
"world.item.items.TridentItemMixin"
18+
],
19+
"injectors": {
20+
"defaultRequire": 1
21+
},
22+
"overwrites": {
23+
"requireAnnotations": true
2324
}
2425
}

0 commit comments

Comments
 (0)