Skip to content

Commit

Permalink
Added item and block ID config
Browse files Browse the repository at this point in the history
  • Loading branch information
@kill05
kill05 committed Jun 10, 2024
1 parent 2226634 commit 3111ffb
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 28 deletions.
32 changes: 29 additions & 3 deletions src/main/java/com/github/kill05/ArchitectTools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import turniplabs.halplibe.helper.RecipeBuilder;
import turniplabs.halplibe.util.ClientStartEntrypoint;
import turniplabs.halplibe.util.RecipeEntrypoint;
import turniplabs.halplibe.util.TomlConfigHandler;
import turniplabs.halplibe.util.toml.Toml;

import java.io.IOException;
import java.net.URI;
Expand All @@ -48,20 +50,44 @@ public final class ArchitectTools implements ModInitializer, RecipeEntrypoint, C

public static final String MOD_ID = "architectstools";
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public static final TomlConfigHandler CONFIG;
public static final int MAX_TOOL_PARTS = 3;
public static int ITEM_ID = 20000;
public static int BLOCK_ID = 1500;

public static int PART_ID;
public static int TOOL_ID;
public static int ITEM_ID;

public static int BLOCK_ID;

static {
new Registries();
Toml toml = new Toml();

// Id
toml.addCategory("Set from which ID each category of blocks/items should start registering.", "IDs");
toml.addEntry("IDs.Parts", 23000);
toml.addEntry("IDs.Tools", 23100);
toml.addEntry("IDs.Items", 23200);
toml.addEntry("IDs.Blocks", 1500);

// Gameplay
//toml.addCategory("Change how the game and the mod are played.", "Gameplay");
//toml.addEntry("Gameplay.DisableOtherTools", "Set to true to disable vanilla tools so players can only use tools from Architect's Tools.", false);

CONFIG = new TomlConfigHandler(MOD_ID, toml);

PART_ID = toml.get("IDs.Parts", Integer.class);
TOOL_ID = toml.get("IDs.Tools", Integer.class);
ITEM_ID = toml.get("IDs.Items", Integer.class);
BLOCK_ID = toml.get("IDs.Blocks", Integer.class);
}


// Items and Blocks
public static final Item BLANK_PATTERN = item("blank_pattern", "blank_pattern");

public static final Block ARCHITECT_TABLE_BLOCK = new BlockBuilder(MOD_ID)
.build(new ArchitectTableBlock(BLOCK_ID++));
.build(new ArchitectTableBlock());


public static <T extends Item> T item(T item, String texture) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/github/kill05/blocks/architectstation/ArchitectTableBlock.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.kill05.blocks.architectstation;

import com.github.kill05.ArchitectTools;
import com.github.kill05.blocks.architectstation.part.PartModeGui;
import net.minecraft.client.Minecraft;
import net.minecraft.core.block.BlockTileEntity;
Expand All @@ -10,8 +11,8 @@

public class ArchitectTableBlock extends BlockTileEntity {

public ArchitectTableBlock(int id) {
super("architect_table", id, Material.wood);
public ArchitectTableBlock() {
super("architect_table", ArchitectTools.BLOCK_ID++, Material.wood);
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/github/kill05/items/part/ArchitectPart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ public class ArchitectPart extends Item implements ArchitectItem, ICustomDescrip
public static final ArchitectPart TOOL_BINDING = partItem("tool_binding", "part/binding")
.validTypes(PartType.EXTRA);

public static final ArchitectPart SWORD_GUARD = partItem("sword_guard", "part/wide_guard")
.validTypes(PartType.EXTRA);

public static final ArchitectPart PICKAXE_HEAD = partItem("pickaxe_head", "pickaxe/head")
.validTypes(PartType.HEAD);

Expand All @@ -41,9 +44,6 @@ public class ArchitectPart extends Item implements ArchitectItem, ICustomDescrip
public static final ArchitectPart SWORD_BLADE = partItem("sword_blade")
.validTypes(PartType.HEAD);

public static final ArchitectPart SWORD_GUARD = partItem("sword_guard", "part/wide_guard")
.validTypes(PartType.EXTRA);


public static ArchitectPart partItem(String id) {
return partItem(id, "part/" + id);
Expand All @@ -52,15 +52,15 @@ public static ArchitectPart partItem(String id) {
public static ArchitectPart partItem(String id, String texture) {
return new ItemBuilder(ArchitectTools.MOD_ID)
.setItemModel(item -> new ArchitectPartModel((ArchitectPart) item, texture))
.build(new ArchitectPart(ArchitectTools.ITEM_ID++, id));
.build(new ArchitectPart(id));
}

private final String partId;
private final int ordinal;
private final List<PartType> validTypes;

public ArchitectPart(int id, String partId) {
super(partId + "_part", id);
public ArchitectPart(String partId) {
super(partId + "_part", ArchitectTools.PART_ID++);
this.partId = partId;
this.ordinal = VALUES.size();
this.validTypes = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/kill05/items/tool/ArchitectAxe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

public class ArchitectAxe extends ArchitectTool {

public ArchitectAxe(int id) {
super(id, "axe");
public ArchitectAxe() {
super("axe");
addPart(ArchitectPart.AXE_HEAD, "axe/head");
addPart(ArchitectPart.TOOL_BINDING, "axe/binding").renderPriority(-1);
addPart(ArchitectPart.TOOL_ROD, "pickaxe/handle");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/kill05/items/tool/ArchitectMattock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

public class ArchitectMattock extends ArchitectTool {

public ArchitectMattock(int id) {
super(id, "mattock");
public ArchitectMattock() {
super("mattock");

addPart(ArchitectPart.AXE_HEAD, "mattock/head");
addPart(ArchitectPart.SHOVEL_HEAD, "mattock/back");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/kill05/items/tool/ArchitectPickaxe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

public class ArchitectPickaxe extends ArchitectTool {

public ArchitectPickaxe(int id) {
super(id, "pickaxe");
public ArchitectPickaxe() {
super("pickaxe");
addPart(ArchitectPart.PICKAXE_HEAD, "pickaxe/head");
addPart(ArchitectPart.TOOL_BINDING, "pickaxe/binding").renderPriority(-1);
addPart(ArchitectPart.TOOL_ROD, "pickaxe/handle");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/kill05/items/tool/ArchitectShortsword.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

public class ArchitectShortsword extends ArchitectTool {

public ArchitectShortsword(int id) {
super(id, "shortsword");
public ArchitectShortsword() {
super("shortsword");

addPart(ArchitectPart.SWORD_BLADE, "shortsword/blade");
addPart(ArchitectPart.SWORD_GUARD, "shortsword/guard");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/kill05/items/tool/ArchitectShovel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

public class ArchitectShovel extends ArchitectTool {

public ArchitectShovel(int id) {
super(id, "shovel");
public ArchitectShovel() {
super("shovel");
addPart(ArchitectPart.SHOVEL_HEAD, "shovel/head");
addPart(ArchitectPart.TOOL_ROD, "shovel/handle");
addPart(ArchitectPart.TOOL_BINDING, "shovel/binding");
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/github/kill05/items/tool/ArchitectTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ public abstract class ArchitectTool extends Item implements ArchitectItem, ICust

public static final List<ArchitectTool> VALUES = new ArrayList<>();

public static final ArchitectTool PICKAXE = toolItem(new ArchitectPickaxe(ArchitectTools.ITEM_ID++));
public static final ArchitectTool AXE = toolItem(new ArchitectAxe(ArchitectTools.ITEM_ID++));
public static final ArchitectTool SHOVEL = toolItem(new ArchitectShovel(ArchitectTools.ITEM_ID++));
public static final ArchitectTool MATTOCK = toolItem(new ArchitectMattock(ArchitectTools.ITEM_ID++));
public static final ArchitectTool SHORTSWORD = toolItem(new ArchitectShortsword(ArchitectTools.ITEM_ID++));
public static final ArchitectTool PICKAXE = toolItem(new ArchitectPickaxe());
public static final ArchitectTool AXE = toolItem(new ArchitectAxe());
public static final ArchitectTool SHOVEL = toolItem(new ArchitectShovel());
public static final ArchitectTool MATTOCK = toolItem(new ArchitectMattock());
public static final ArchitectTool SHORTSWORD = toolItem(new ArchitectShortsword());

public static ArchitectTool toolItem(ArchitectTool tool) {
return new ItemBuilder(ArchitectTools.MOD_ID)
Expand All @@ -44,8 +44,8 @@ public static ArchitectTool toolItem(ArchitectTool tool) {
private final List<ToolPartInfo> renderOrder;
private final Collection<Tag<Block>> mineableTags;

public ArchitectTool(int id, String toolId) {
super(toolId + "_tool", id);
public ArchitectTool(String toolId) {
super(toolId + "_tool", ArchitectTools.TOOL_ID++);
this.validStatistics = new LinkedHashMap<>();
this.partList = new ArrayList<>();
this.renderOrder = new ArrayList<>();
Expand Down

0 comments on commit 3111ffb

Please sign in to comment.