README.md

@@ -5,7 +5,6 @@ A port of Tinker's Construct for [**BTA**](https://www.betterthanadventure.net).
 - This mod is in **alpha**.
   This means it's extremely **unstable** and only meant to be used for **testing** purposes.
   Breaking changes are likely to happen, so beware of that.
-- **Currently**, this mod does **NOT** support multiplayer
 
 ## Dependencies
 - [Halplibe](https://github.com/Turnip-Labs/bta-halplibe/releases)

build.gradle

@@ -85,8 +85,8 @@ dependencies {
 	modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}"
 	modImplementation "ModMenu:ModMenu:${project.mod_menu_version}"
 
-	implementation files("libraries/catalyst-core-1.2.1.jar")
-	implementation files("libraries/catalyst-fluids-1.1.1.jar")
+	implementation files("libraries/catalyst-core-1.4.3.jar")
+	//implementation files("libraries/catalyst-fluids-1.1.6.jar")
 
 	implementation files("libraries/btwaila-1.1.0-7.2-pre1.jar");
 

gradle.properties

@@ -5,12 +5,12 @@ bta_version=7.2-pre1
 
 # Loader & Mod Menu
 loader_version=0.15.6-babric.6-bta
-mod_menu_version=2.0.5
+mod_menu_version=2.0.6
 
 # HalpLibe
-halplibe_version=4.0.6
+halplibe_version=4.1.2
 
 # Mod
-mod_version=0.0.2
+mod_version=0.0.5
 mod_group=kill05
 mod_name=architectstools

src/main/java/com/github/kill05/architectstools/ArchitectGuis.java

@@ -0,0 +1,53 @@
+package com.github.kill05.architectstools;
+
+import com.github.kill05.architectstools.blocks.architectstation.ArchitectTableTileEntity;
+import com.github.kill05.architectstools.blocks.architectstation.inventory.ArchitectStationGuiFactory;
+import com.github.kill05.architectstools.blocks.architectstation.inventory.part.PartModeContainer;
+import com.github.kill05.architectstools.blocks.architectstation.inventory.part.PartModeGui;
+import com.github.kill05.architectstools.blocks.architectstation.inventory.tool.ToolModeContainer;
+import com.github.kill05.architectstools.blocks.architectstation.inventory.tool.ToolModeGui;
+import net.minecraft.client.entity.player.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.core.player.inventory.Container;
+import net.minecraft.server.entity.player.EntityPlayerMP;
+import org.jetbrains.annotations.NotNull;
+import turniplabs.halplibe.helper.gui.GuiHelper;
+import turniplabs.halplibe.helper.gui.registered.RegisteredGui;
+
+public class ArchitectGuis {
+
+	public static final RegisteredGui PART_MODE = GuiHelper.registerServerGui(ArchitectTools.MOD_ID, "part_mode", new ArchitectStationGuiFactory() {
+		@Override
+		public @NotNull GuiScreen createGui(@NotNull RegisteredGui gui, @NotNull EntityPlayerSP player, @NotNull ArchitectTableTileEntity tile) {
+			return new PartModeGui(tile, player);
+		}
+
+		@Override
+		public @NotNull Container createContainer(@NotNull RegisteredGui gui, @NotNull EntityPlayerMP player, @NotNull ArchitectTableTileEntity tile) {
+			return new PartModeContainer(tile, player);
+		}
+
+		@Override
+		public RegisteredGui getNextGui() {
+			return TOOL_MODE;
+		}
+	});
+
+	public static final RegisteredGui TOOL_MODE = GuiHelper.registerServerGui(ArchitectTools.MOD_ID, "tool_mode", new ArchitectStationGuiFactory() {
+		@Override
+		public @NotNull GuiScreen createGui(@NotNull RegisteredGui gui, @NotNull EntityPlayerSP player, @NotNull ArchitectTableTileEntity tile) {
+			return new ToolModeGui(tile, player);
+		}
+
+		@Override
+		public @NotNull Container createContainer(@NotNull RegisteredGui gui, @NotNull EntityPlayerMP player, @NotNull ArchitectTableTileEntity tile) {
+			return new ToolModeContainer(tile, player);
+		}
+
+		@Override
+		public RegisteredGui getNextGui() {
+			return PART_MODE;
+		}
+	});
+
+}

src/main/java/com/github/kill05/ArchitectTools.java → src/main/java/com/github/kill05/architectstools/ArchitectTools.java

@@ -1,45 +1,48 @@
-package com.github.kill05;
-
-import com.github.kill05.blocks.architectstation.ArchitectTableBlock;
-import com.github.kill05.blocks.architectstation.ArchitectTableTileEntity;
-import com.github.kill05.exceptions.ArchitectItemException;
-import com.github.kill05.exceptions.InvalidMaterialException;
-import com.github.kill05.items.part.ArchitectPart;
-import com.github.kill05.items.part.PartType;
-import com.github.kill05.items.tool.ArchitectTool;
-import com.github.kill05.items.tool.ToolPartInfo;
-import com.github.kill05.materials.ArchitectMaterial;
-import com.github.kill05.utils.ClassUtils;
-import com.github.kill05.utils.ItemUtils;
-import com.mojang.nbt.*;
+package com.github.kill05.architectstools;
+
+import com.github.kill05.architectstools.blocks.architectstation.ArchitectTableBlock;
+import com.github.kill05.architectstools.blocks.architectstation.ArchitectTableTileEntity;
+import com.github.kill05.architectstools.config.ArchitectConfig;
+import com.github.kill05.architectstools.exceptions.ArchitectItemException;
+import com.github.kill05.architectstools.exceptions.InvalidMaterialException;
+import com.github.kill05.architectstools.items.part.ArchitectPart;
+import com.github.kill05.architectstools.items.part.PartType;
+import com.github.kill05.architectstools.items.tool.ArchitectTool;
+import com.github.kill05.architectstools.items.tool.ToolPartInfo;
+import com.github.kill05.architectstools.materials.ArchitectMaterial;
+import com.github.kill05.architectstools.materials.MaterialInfo;
+import com.github.kill05.architectstools.recipe.RecipeEntryRepairTool;
+import com.github.kill05.architectstools.utils.ClassUtils;
+import com.github.kill05.architectstools.utils.ItemUtils;
+import com.mojang.nbt.ListTag;
+import com.mojang.nbt.StringTag;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.render.stitcher.TextureRegistry;
 import net.minecraft.core.block.Block;
+import net.minecraft.core.block.tag.BlockTags;
 import net.minecraft.core.data.DataLoader;
 import net.minecraft.core.data.registry.Registries;
+import net.minecraft.core.data.registry.recipe.RecipeGroup;
+import net.minecraft.core.data.registry.recipe.RecipeNamespace;
+import net.minecraft.core.data.registry.recipe.RecipeSymbol;
+import net.minecraft.core.data.registry.recipe.entry.RecipeEntryCrafting;
 import net.minecraft.core.item.Item;
 import net.minecraft.core.item.ItemStack;
-import org.apache.commons.lang3.tuple.Pair;
+import net.minecraft.core.sound.BlockSounds;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import turniplabs.halplibe.helper.BlockBuilder;
-import turniplabs.halplibe.helper.EntityHelper;
-import turniplabs.halplibe.helper.ItemBuilder;
-import turniplabs.halplibe.helper.RecipeBuilder;
+import turniplabs.halplibe.helper.*;
 import turniplabs.halplibe.util.ClientStartEntrypoint;
 import turniplabs.halplibe.util.RecipeEntrypoint;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 
@@ -49,19 +52,24 @@ 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 int MAX_TOOL_PARTS = 3;
-	public static int ITEM_ID = 20000;
-	public static int BLOCK_ID = 1500;
 
-	static {
-		new Registries();
-	}
+	public static final RecipeNamespace RECIPE_NAMESPACE = new RecipeNamespace();
+	public static final RecipeGroup<RecipeEntryCrafting<?, ?>> RECIPE_WORKBENCH = new RecipeGroup<>(new RecipeSymbol(new ItemStack(Block.workbench)));
 
 
 	// 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++));
+		.setTopTexture(MOD_ID + ":block/architect_table_top")
+		.setSideTextures(MOD_ID + ":block/architect_table_side")
+		.setBottomTexture("minecraft" + ":block/planks_oak")
+		.setHardness(2.5F)
+		.setResistance(5.0F)
+		.setFlammability(10, 10)
+		.setBlockSound(BlockSounds.WOOD)
+		.setTags(BlockTags.MINEABLE_BY_AXE)
+		.build(new ArchitectTableBlock());
 
 
 	public static <T extends Item> T item(T item, String texture) {
@@ -73,41 +81,47 @@ public static <T extends Item> T item(T item, String texture) {
 	public static Item item(String name, String texture) {
 		return new ItemBuilder(MOD_ID)
 			.setIcon(MOD_ID + ":item/" + texture)
-			.build(new Item(name, ITEM_ID++));
+			.build(new Item(name, ArchitectConfig.ITEM_ID++));
 	}
 
-
 	// Materials
 	public static @Nullable ArchitectMaterial getMaterial(@Nullable String id) {
 		if (id == null) return null;
 		return ArchitectMaterial.MATERIAL_REGISTRY.getItem(id);
 	}
 
-	public static @Nullable ArchitectMaterial getMaterial(@Nullable ItemStack item) {
-		if (item == null) return null;
+	public static @NotNull MaterialInfo getMaterialInfo(@Nullable ItemStack item) {
+		if (item == null) return new MaterialInfo(null, 0);
 		for (ArchitectMaterial material : ArchitectMaterial.MATERIAL_REGISTRY) {
-			if (material.isThisMaterial(item)) return material;
+			Integer value = material.getMaterialValue(item);
+			if (value != null) return new MaterialInfo(material, value);
 		}
 
-		return null;
+		return new MaterialInfo(null, 0);
 	}
 
 
 	// Tool Parts
-	public static @NotNull ItemStack createPartStack(@NotNull ArchitectMaterial material, ArchitectPart type) {
-		return material.createPart(type);
+	public static @NotNull ItemStack createPartStack(@NotNull ArchitectMaterial material, ArchitectPart part) throws ArchitectItemException {
+		if (!material.isValidPart(part))
+			throw new ArchitectItemException(String.format("Part '%s' can't be made out of material '%s'", part.getPartId(), material.id()));
+
+		ItemStack item = new ItemStack(part);
+		setPartMaterial(item, material);
+		return item;
 	}
 
-	public static @NotNull ItemStack createPartStack(@NotNull String material, @NotNull ArchitectPart part) throws InvalidMaterialException {
-		ArchitectMaterial architectMaterial = getMaterial(material);
-		if (architectMaterial == null) throw new InvalidMaterialException("Invalid material: " + material);
-		return architectMaterial.createPart(part);
+	public static @NotNull ItemStack createPartStack(@NotNull String materialName, @NotNull ArchitectPart part) throws InvalidMaterialException, ArchitectItemException {
+		ArchitectMaterial material = getMaterial(materialName);
+		if (material == null) throw new InvalidMaterialException("Invalid material: " + materialName);
+		return createPartStack(material, part);
 	}
 
-	public static @NotNull ItemStack createPartStack(@NotNull ItemStack material, @NotNull ArchitectPart part) throws InvalidMaterialException {
-		ArchitectMaterial architectMaterial = getMaterial(material);
-		if (architectMaterial == null) throw new InvalidMaterialException("Invalid material: " + material);
-		return architectMaterial.createPart(part);
+	public static @NotNull ItemStack createPartStack(@NotNull ItemStack materialItem, @NotNull ArchitectPart part) throws InvalidMaterialException, ArchitectItemException {
+		MaterialInfo info = getMaterialInfo(materialItem);
+		if (info.material() == null) throw new InvalidMaterialException("Invalid material: " + materialItem);
+		if (info.value() * materialItem.stackSize < part.getMaterialCost()) throw new InvalidMaterialException("Not enough material.");
+		return createPartStack(info.material(), part);
 	}
 
 	public static @Nullable ArchitectMaterial getPartMaterial(@NotNull ItemStack item) {
@@ -192,17 +206,17 @@ public static void setToolPart(@NotNull ItemStack item, @NotNull PartType part,
 		return getMaterial(materialTag.getValue());
 	}
 
-	public static List<Pair<@NotNull ToolPartInfo, @Nullable ArchitectMaterial>> getToolParts(@NotNull ItemStack item, @Nullable PartType type) {
+	public static Map<@NotNull ToolPartInfo, @Nullable ArchitectMaterial> getToolParts(@NotNull ItemStack item, @Nullable PartType type) {
 		if (!(item.getItem() instanceof ArchitectTool tool))
 			throw new ArchitectItemException("Item is not an ArchitectTool.");
 
-		ArrayList<Pair<ToolPartInfo, ArchitectMaterial>> list = new ArrayList<>();
+		Map<ToolPartInfo, ArchitectMaterial> map = new LinkedHashMap<>();
 		for (ToolPartInfo info : tool.getPartList()) {
 			if (type != null && info.type() != type) continue;
-			list.add(Pair.of(info, getToolPart(item, info)));
+			map.put(info, getToolPart(item, info));
 		}
 
-		return list;
+		return map;
 	}
 
 	public static void iterateToolParts(@NotNull ItemStack item, boolean renderOrder, @NotNull BiConsumer<@NotNull ToolPartInfo, @Nullable ArchitectMaterial> consumer) {
@@ -218,14 +232,25 @@ public static void iterateToolParts(@NotNull ItemStack item, boolean renderOrder
 	// Code
 	@Override
 	public void onInitialize() {
-		EntityHelper.createTileEntity(ArchitectTableTileEntity.class, "architect_station");
-
-		// Register items
+		// Register materials and items
 		ClassUtils.initializeClasses(
+			ArchitectMaterial.class,
 			ArchitectPart.class,
 			ArchitectTool.class
 		);
 
+		ItemStack parent = BLANK_PATTERN.getDefaultStack();
+		for (ArchitectMaterial material : ArchitectMaterial.MATERIAL_REGISTRY) {
+			for (ArchitectPart part : ArchitectPart.VALUES) {
+				try {
+					CreativeHelper.setParent(ArchitectTools.createPartStack(material, part), parent);
+				} catch (ArchitectItemException ignored) { // Some parts can't be made out of certain materials
+				}
+			}
+		}
+
+		EntityHelper.createTileEntity(ArchitectTableTileEntity.class, "architect_station");
+
 		LOGGER.info("Architect's Tools initialized.");
 	}
 
@@ -268,7 +293,7 @@ public void afterClientStart() {
 		}
 		Iterator<Path> it = walk.iterator();
 
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			Path file = it.next();
 			String name = file.getFileName().toString();
 			if (name.endsWith(".png")) {
@@ -301,6 +326,11 @@ public void afterClientStart() {
 
 	@Override
 	public void onRecipesReady() {
+		ArchitectMaterial.lock();
+		for (ArchitectMaterial material : ArchitectMaterial.MATERIAL_REGISTRY) {
+			material.initGroups();
+		}
+
 		RecipeBuilder.Shaped(MOD_ID, "xo", "ox")
 			.addInput('x', Item.stick)
 			.addInput('o', "minecraft:planks")
@@ -313,12 +343,14 @@ public void onRecipesReady() {
 			.addInput('b', BLANK_PATTERN)
 			.addInput('w', Block.workbench)
 			.create("architect_table", ARCHITECT_TABLE_BLOCK.getDefaultStack());
+
+		Registries.RECIPES.addCustomRecipe(MOD_ID + ":workbench/repair_tool", new RecipeEntryRepairTool());
 	}
 
 	@Override
 	public void initNamespaces() {
-
+		Registries.RECIPES.register(MOD_ID, RECIPE_NAMESPACE);
+		RECIPE_NAMESPACE.register("workbench", RECIPE_WORKBENCH);
 	}
 
-
 }

src/main/java/com/github/kill05/MiningLevel.java → src/main/java/com/github/kill05/architectstools/MiningLevel.java

@@ -1,4 +1,4 @@
-package com.github.kill05;
+package com.github.kill05.architectstools;
 
 import net.minecraft.core.lang.I18n;
 import turniplabs.halplibe.mixin.accessors.LanguageAccessor;

src/main/java/com/github/kill05/architectstools/MixinConfigPlugin.java

@@ -0,0 +1,46 @@
+package com.github.kill05.architectstools;
+
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class MixinConfigPlugin implements IMixinConfigPlugin {
+
+	@Override
+	public void onLoad(String mixinPackage) {
+
+	}
+
+	@Override
+	public String getRefMapperConfig() {
+		return null;
+	}
+
+	@Override
+	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+		return true;
+	}
+
+	@Override
+	public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+	}
+
+	@Override
+	public List<String> getMixins() {
+		return null;
+	}
+
+	@Override
+	public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+	}
+
+	@Override
+	public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+	}
+}