Skip to content

Commit 1112eff

Browse files
committed
Return Meteor+ items
1 parent 830a3c8 commit 1112eff

File tree

8 files changed

+62
-1
lines changed

8 files changed

+62
-1
lines changed

src/main/java/nekiplay/Main.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package nekiplay;
2+
3+
import nekiplay.main.items.ModItems;
4+
import net.fabricmc.api.ModInitializer;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
8+
public class Main implements ModInitializer {
9+
public static final Logger LOG = LoggerFactory.getLogger(Main.class);
10+
public static final String METEOR_LOGPREFIX = "[Meteor+]";
11+
@Override
12+
public void onInitialize() {
13+
LOG.info(METEOR_LOGPREFIX + " Initializing items...");
14+
ModItems.initialize();
15+
LOG.info(METEOR_LOGPREFIX + " Loaded items");
16+
}
17+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package nekiplay.main.items;
2+
3+
import net.minecraft.item.Item;
4+
import net.minecraft.item.Items;
5+
import net.minecraft.registry.RegistryKey;
6+
import net.minecraft.registry.RegistryKeys;
7+
import net.minecraft.util.Identifier;
8+
9+
import java.util.function.Function;
10+
11+
public class ModItems {
12+
13+
public static Item register(String path, Function<Item.Settings, Item> factory, Item.Settings settings) {
14+
final RegistryKey<Item> registryKey = RegistryKey.of(RegistryKeys.ITEM, Identifier.of("meteorplus", path));
15+
return Items.register(registryKey, factory, settings);
16+
}
17+
public static Item METEOR_PLUS_LOGO_ITEM = null;
18+
public static Item METEOR_PLUS_LOGO_MODS_ITEM = null;
19+
20+
public static void initialize() {
21+
METEOR_PLUS_LOGO_ITEM = register("logo", Item::new, new Item.Settings());
22+
METEOR_PLUS_LOGO_MODS_ITEM = register("logo_mods", Item::new, new Item.Settings());
23+
}
24+
}

src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import meteordevelopment.meteorclient.commands.Commands;
66
import meteordevelopment.meteorclient.systems.modules.misc.BetterChat;
77
import nekiplay.MixinPlugin;
8+
import nekiplay.main.items.ModItems;
89
import nekiplay.meteorplus.features.commands.*;
910
import nekiplay.meteorplus.features.modules.combat.*;
1011
import nekiplay.meteorplus.features.modules.combat.velocity.VelocityPlus;
@@ -46,7 +47,7 @@
4647
public class MeteorPlusAddon extends MeteorAddon {
4748
public static final Logger LOG = LoggerFactory.getLogger(MeteorPlusAddon.class);
4849

49-
public static final Category CATEGORYMODS = new Category("Integrations", Items.REDSTONE.getDefaultStack());
50+
public static final Category CATEGORYMODS = new Category("Integrations", ModItems.METEOR_PLUS_LOGO_MODS_ITEM.getDefaultStack());
5051
public static final String HUD_TITLE = "Meteor+";
5152
public static final HudGroup HUD_GROUP = new HudGroup(HUD_TITLE);
5253

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"model": {
3+
"type": "model",
4+
"model": "meteorplus:item/logo"
5+
}
6+
}
7+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"model": {
3+
"type": "model",
4+
"model": "meteorplus:item/logo_mods"
5+
}
6+
}
7+

src/main/resources/assets/meteorplus/models/item/logo.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
"layer0": "meteorplus:item/logo"
55
}
66
}
7+

src/main/resources/assets/meteorplus/models/item/logo_mods.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
"layer0": "meteorplus:item/logo_mods"
55
}
66
}
7+

src/main/resources/fabric.mod.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"icon": "assets/meteorplus/icon.png",
1818
"environment": "*",
1919
"entrypoints": {
20+
"main": [
21+
"nekiplay.Main"
22+
],
2023
"meteor": [
2124
"nekiplay.meteorplus.MeteorPlusAddon"
2225
]

0 commit comments

Comments
 (0)