Skip to content

Commit 4a17da2

Browse files
committed
Fix fatal crash in stapler equipment mixin
1 parent 9caf0a3 commit 4a17da2

File tree

4 files changed

+18
-27
lines changed

4 files changed

+18
-27
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
88
loader_version = 0.16.10
99

1010
# Mod Properties
11-
mod_version = 1.4.0
11+
mod_version = 1.4.1
1212
maven_group = blue.endless
1313
archives_base_name = scarves
1414

src/main/java/blue/endless/scarves/ScarvesItems.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package blue.endless.scarves;
22

3+
import net.minecraft.block.Block;
4+
import net.minecraft.entity.EquipmentSlot;
35
import net.minecraft.item.BlockItem;
6+
import net.minecraft.item.Equipment;
47
import net.minecraft.item.Item;
58
import net.minecraft.registry.Registries;
69
import net.minecraft.registry.Registry;
@@ -17,12 +20,24 @@ public class ScarvesItems {
1720
public static void register() {
1821
SCARF = register( new ScarfItem(), ScarfItem.ID );
1922

20-
SCARF_STAPLER = register(new BlockItem(ScarvesBlocks.SCARF_STAPLER, new Item.Settings().rarity(Rarity.UNCOMMON)) , ScarfStaplerBlock.ID);
23+
SCARF_STAPLER = register(new HeadEquippableBlock(ScarvesBlocks.SCARF_STAPLER, new Item.Settings().rarity(Rarity.UNCOMMON)) , ScarfStaplerBlock.ID);
2124
SCARF_TABLE = register(new BlockItem(ScarvesBlocks.SCARF_TABLE, new Item.Settings().rarity(Rarity.UNCOMMON)), ScarfTableBlock.ID);
2225
}
2326

2427
private static <T extends Item> T register(T item, String id) {
2528
Registry.register(Registries.ITEM, Identifier.of(ScarvesMod.MODID, id), item);
2629
return item;
2730
}
31+
32+
private static class HeadEquippableBlock extends BlockItem implements Equipment {
33+
34+
public HeadEquippableBlock(Block block, Settings settings) {
35+
super(block, settings);
36+
}
37+
38+
@Override
39+
public EquipmentSlot getSlotType() {
40+
return EquipmentSlot.HEAD;
41+
}
42+
}
2843
}

src/main/java/blue/endless/scarves/mixin/EntityEquipmentMixin.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/resources/scarves.mixins.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
"required": true,
33
"minVersion": "0.8",
44
"package": "blue.endless.scarves.mixin",
5-
"compatibilityLevel": "JAVA_17",
6-
"mixins": [
7-
"EntityEquipmentMixin"
8-
],
5+
"compatibilityLevel": "JAVA_21",
96
"client": [
107
"EntityScarfHaverMixin",
118
"ClientPlayerEntityMixin",

0 commit comments

Comments
 (0)