Skip to content

Commit 044606d

Browse files
committed
Reapply "new entity"
This reverts commit 91cd9d7.
1 parent 91cd9d7 commit 044606d

10 files changed

Lines changed: 56 additions & 3 deletions

src/main/java/com/adccadc/rust/item/ModItemGroups.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ public static void register() {
128128

129129
itemGroup.add(Moditems.RUSTY_IRON_BOOTS);
130130
itemGroup.add(Moditems.WAXED_IRON_BOOTS);
131+
132+
itemGroup.add(Moditems.RUSTY_IRON_GOLEM_EGG);
133+
itemGroup.add(Moditems.WAXED_IRON_GOLEM_EGG);
131134
});
132135
}
133136
}

src/main/java/com/adccadc/rust/item/Moditems.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com.adccadc.rust.item;
22

33
import com.adccadc.rust.Rust;
4+
import com.adccadc.rust.entity.ModEntity;
45
import net.minecraft.item.Item;
6+
import net.minecraft.item.SpawnEggItem;
57
import net.minecraft.item.ToolMaterial;
68
import net.minecraft.item.equipment.ArmorMaterial;
79
import net.minecraft.item.equipment.EquipmentAsset;
@@ -35,7 +37,7 @@ public static Item register(String name, Function<Item.Settings, Item> itemFacto
3537
14,
3638
Map.of(
3739
EquipmentType.HELMET, 1,
38-
EquipmentType.CHESTPLATE, 7,
40+
EquipmentType.CHESTPLATE, 5,
3941
EquipmentType.LEGGINGS, 4,
4042
EquipmentType.BOOTS, 1
4143
), 8,
@@ -48,13 +50,15 @@ public static Item register(String name, Function<Item.Settings, Item> itemFacto
4850
16,
4951
Map.of(
5052
EquipmentType.HELMET, 2,
51-
EquipmentType.CHESTPLATE, 8,
52-
EquipmentType.LEGGINGS, 3,
53+
EquipmentType.CHESTPLATE, 6,
54+
EquipmentType.LEGGINGS, 5,
5355
EquipmentType.BOOTS, 2
5456
), 6,
5557
SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.25F, 0.025F,
5658
ItemTags.IRON_TOOL_MATERIALS, WAXED
5759
);
60+
public static final Item RUSTY_IRON_GOLEM_EGG = register("rusty_iron_golem_spawn_egg", RustyIronGolemEgg::new, new Item.Settings());
61+
public static final Item WAXED_IRON_GOLEM_EGG = register("waxed_iron_golem_spawn_egg", WaxedIronGolemEgg::new, new Item.Settings());
5862

5963
public static final Item VERDIGRIS = register("verdigris", Item::new, new Item.Settings());
6064
public static final Item IRON_RUST = register("iron_rust", Item::new, new Item.Settings());
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.adccadc.rust.item;
2+
3+
import com.adccadc.rust.entity.ModEntity;
4+
import net.minecraft.entity.EntityType;
5+
import net.minecraft.entity.mob.MobEntity;
6+
import net.minecraft.item.SpawnEggItem;
7+
8+
public class RustyIronGolemEgg extends SpawnEggItem {
9+
public RustyIronGolemEgg(Settings settings) {
10+
super(ModEntity.RUSTY_IRON_GOLEM ,settings);
11+
}
12+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.adccadc.rust.item;
2+
3+
import com.adccadc.rust.entity.ModEntity;
4+
import net.minecraft.item.SpawnEggItem;
5+
6+
public class WaxedIronGolemEgg extends SpawnEggItem {
7+
public WaxedIronGolemEgg(Settings settings) {
8+
super(ModEntity.WAXED_IRON_GOLEM ,settings);
9+
}
10+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "rust:item/rusty_iron_golem_spawn_egg"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "rust:item/waxed_iron_golem_spawn_egg"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "rust:item/rusty_iron_golem_spawn_egg"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "rust:item/waxed_iron_golem_spawn_egg"
5+
}
6+
}
635 Bytes
Loading
565 Bytes
Loading

0 commit comments

Comments
 (0)