From 06b9f180861658b5726386e219a126dcb691a236 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Sat, 22 Jul 2017 18:56:42 -0500 Subject: [PATCH] Fix typo in project name, fix config, build 0.1.2 --- build.gradle | 4 +- build.properties | 2 +- .../tcomplement/TinkersComplement.java | 86 ++++++++++++++++++ .../common/ClientProxy.java | 4 +- .../common/CommonProxy.java | 2 +- .../common/Config.java | 4 +- .../common/ModIds.java | 2 +- .../common/PulseBase.java | 18 ++-- .../common/TCompNetwork.java | 8 +- .../feature/FeatureClientProxy.java | 8 +- .../feature/ModuleFeature.java | 24 ++--- .../feature/PartMaterialBlacklist.java | 4 +- .../feature/blocks/BlockMelter.java | 10 +- .../feature/client/GuiMelter.java | 12 +-- .../feature/client/MelterRenderer.java | 4 +- .../feature/inventory/ContainerMelter.java | 4 +- .../feature/multiblock/MultiblockMelter.java | 6 +- .../feature/network/FluidUpdatePacket.java | 4 +- .../feature/tileentity/TileMelter.java | 14 +-- .../library/IBlacklist.java | 2 +- .../library/RecipeMatchBlacklist.java | 2 +- .../library/TCompRegistry.java | 2 +- .../library/Util.java | 12 +-- .../library/feature/MelterTank.java | 8 +- .../plugin/ceramics/CeramicsClientEvents.java | 4 +- .../plugin/ceramics/CeramicsPlugin.java | 14 +-- .../ceramics/CeramicsPluginClientProxy.java | 4 +- .../plugin/exnihilo/ENPluginClientProxy.java | 4 +- .../plugin/exnihilo/ENPluginEvents.java | 2 +- .../plugin/exnihilo/ExNihiloPlugin.java | 12 +-- .../plugin/exnihilo/items/SledgeHammer.java | 6 +- .../plugin/jei/JEIPlugin.java | 4 +- .../shared/CommonsClientProxy.java | 4 +- .../shared/ModuleCommons.java | 12 +-- .../tcompliment/TinkersCompliment.java | 53 ----------- .../blockstates/cast.json | 2 +- .../blockstates/fluid_block.json | 0 .../blockstates/materials.json | 2 +- .../blockstates/melter.json | 8 +- .../blockstates/porcelain_casting.json | 32 +++++++ .../blockstates/porcelain_melter.json | 10 +- .../blockstates/porcelain_tank.json | 10 +- .../assets/tcomplement/lang/en_us.lang | 41 +++++++++ .../models/block/melter.json | 0 .../models/item/parts/sledge_head.tmat.json | 2 +- .../models/item/tools/sledge_hammer.tcon.json | 9 ++ .../textures/blocks/melter/front_active.png | Bin .../textures/blocks/melter/front_inactive.png | Bin .../textures/blocks/melter/side.png | Bin .../blocks/porcelain/basin_bottom.png | Bin .../textures/blocks/porcelain/basin_side.png | Bin .../textures/blocks/porcelain/basin_top.png | Bin .../textures/blocks/porcelain/gauge_side.png | Bin .../blocks/porcelain/melter_front_active.png | Bin .../porcelain/melter_front_inactive.png | Bin .../textures/blocks/porcelain/melter_side.png | Bin .../blocks/porcelain/table_bottom.png | Bin .../textures/blocks/porcelain/table_side.png | Bin .../textures/blocks/porcelain/table_top.png | Bin .../textures/blocks/porcelain/tank_side.png | Bin .../textures/blocks/porcelain/window_side.png | Bin .../textures/blocks/porcelain/window_top.png | Bin .../textures/gui/melter.png | Bin .../textures/items/materials/cast_bucket.png | Bin .../textures/items/sledge_hammer/binding.png | Bin .../items/sledge_hammer/binding_cactus.png | Bin .../items/sledge_hammer/binding_contrast.png | Bin .../items/sledge_hammer/binding_paper.png | Bin .../items/sledge_hammer/broken_head.png | Bin .../sledge_hammer/broken_head_cactus.png | Bin .../sledge_hammer/broken_head_contrast.png | Bin .../items/sledge_hammer/broken_head_paper.png | Bin .../textures/items/sledge_hammer/head.png | Bin .../items/sledge_hammer/head_cactus.png | Bin .../items/sledge_hammer/head_contrast.png | Bin .../items/sledge_hammer/head_paper.png | Bin .../items/sledge_hammer/mod_bane_spider.png | Bin .../items/sledge_hammer/mod_beheading.png | Bin .../items/sledge_hammer/mod_blasting.png | Bin .../items/sledge_hammer/mod_diamond.png | Bin .../items/sledge_hammer/mod_emerald.png | Bin .../items/sledge_hammer/mod_fiery.png | Bin .../items/sledge_hammer/mod_fortified.png | Bin .../items/sledge_hammer/mod_glowing.png | Bin .../items/sledge_hammer/mod_haste.png | Bin .../items/sledge_hammer/mod_knockback.png | Bin .../textures/items/sledge_hammer/mod_luck.png | Bin .../items/sledge_hammer/mod_mending_moss.png | Bin .../items/sledge_hammer/mod_necrotic.png | Bin .../items/sledge_hammer/mod_reinforced.png | Bin .../items/sledge_hammer/mod_sharpness.png | Bin .../items/sledge_hammer/mod_shulking.png | Bin .../textures/items/sledge_hammer/mod_silk.png | Bin .../items/sledge_hammer/mod_smite.png | Bin .../items/sledge_hammer/mod_soulbound.png | Bin .../textures/items/sledge_hammer/mod_web.png | Bin .../blockstates/porcelain_casting.json | 32 ------- .../assets/tcompliment/lang/en_us.lang | 41 --------- .../models/item/tools/sledge_hammer.tcon.json | 9 -- .../item/modifiers/sledge_hammer.mod.json | 40 ++++---- src/main/resources/mcmod.info | 6 +- src/main/resources/pack.mcmeta | 2 +- 102 files changed, 324 insertions(+), 287 deletions(-) create mode 100644 src/main/java/knightminer/tcomplement/TinkersComplement.java rename src/main/java/knightminer/{tcompliment => tcomplement}/common/ClientProxy.java (95%) rename src/main/java/knightminer/{tcompliment => tcomplement}/common/CommonProxy.java (72%) rename src/main/java/knightminer/{tcompliment => tcomplement}/common/Config.java (86%) rename src/main/java/knightminer/{tcompliment => tcomplement}/common/ModIds.java (82%) rename src/main/java/knightminer/{tcompliment => tcomplement}/common/PulseBase.java (90%) rename src/main/java/knightminer/{tcompliment => tcomplement}/common/TCompNetwork.java (86%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/FeatureClientProxy.java (84%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/ModuleFeature.java (89%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/PartMaterialBlacklist.java (85%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/blocks/BlockMelter.java (90%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/client/GuiMelter.java (95%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/client/MelterRenderer.java (91%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/inventory/ContainerMelter.java (93%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/multiblock/MultiblockMelter.java (92%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/network/FluidUpdatePacket.java (93%) rename src/main/java/knightminer/{tcompliment => tcomplement}/feature/tileentity/TileMelter.java (93%) rename src/main/java/knightminer/{tcompliment => tcomplement}/library/IBlacklist.java (73%) rename src/main/java/knightminer/{tcompliment => tcomplement}/library/RecipeMatchBlacklist.java (91%) rename src/main/java/knightminer/{tcompliment => tcomplement}/library/TCompRegistry.java (98%) rename src/main/java/knightminer/{tcompliment => tcomplement}/library/Util.java (80%) rename src/main/java/knightminer/{tcompliment => tcomplement}/library/feature/MelterTank.java (73%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/ceramics/CeramicsClientEvents.java (94%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/ceramics/CeramicsPlugin.java (86%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/ceramics/CeramicsPluginClientProxy.java (81%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/exnihilo/ENPluginClientProxy.java (89%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/exnihilo/ENPluginEvents.java (95%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/exnihilo/ExNihiloPlugin.java (79%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/exnihilo/items/SledgeHammer.java (94%) rename src/main/java/knightminer/{tcompliment => tcomplement}/plugin/jei/JEIPlugin.java (90%) rename src/main/java/knightminer/{tcompliment => tcomplement}/shared/CommonsClientProxy.java (69%) rename src/main/java/knightminer/{tcompliment => tcomplement}/shared/ModuleCommons.java (76%) delete mode 100644 src/main/java/knightminer/tcompliment/TinkersCompliment.java rename src/main/resources/assets/{tcompliment => tcomplement}/blockstates/cast.json (73%) rename src/main/resources/assets/{tcompliment => tcomplement}/blockstates/fluid_block.json (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/blockstates/materials.json (74%) rename src/main/resources/assets/{tcompliment => tcomplement}/blockstates/melter.json (69%) create mode 100644 src/main/resources/assets/tcomplement/blockstates/porcelain_casting.json rename src/main/resources/assets/{tcompliment => tcomplement}/blockstates/porcelain_melter.json (57%) rename src/main/resources/assets/{tcompliment => tcomplement}/blockstates/porcelain_tank.json (79%) create mode 100644 src/main/resources/assets/tcomplement/lang/en_us.lang rename src/main/resources/assets/{tcompliment => tcomplement}/models/block/melter.json (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/models/item/parts/sledge_head.tmat.json (67%) create mode 100644 src/main/resources/assets/tcomplement/models/item/tools/sledge_hammer.tcon.json rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/melter/front_active.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/melter/front_inactive.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/melter/side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/basin_bottom.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/basin_side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/basin_top.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/gauge_side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/melter_front_active.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/melter_front_inactive.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/melter_side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/table_bottom.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/table_side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/table_top.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/tank_side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/window_side.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/blocks/porcelain/window_top.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/gui/melter.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/materials/cast_bucket.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/binding.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/binding_cactus.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/binding_contrast.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/binding_paper.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/broken_head.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/broken_head_cactus.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/broken_head_contrast.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/broken_head_paper.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/head.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/head_cactus.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/head_contrast.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/head_paper.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_bane_spider.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_beheading.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_blasting.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_diamond.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_emerald.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_fiery.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_fortified.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_glowing.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_haste.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_knockback.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_luck.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_mending_moss.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_necrotic.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_reinforced.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_sharpness.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_shulking.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_silk.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_smite.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_soulbound.png (100%) rename src/main/resources/assets/{tcompliment => tcomplement}/textures/items/sledge_hammer/mod_web.png (100%) delete mode 100644 src/main/resources/assets/tcompliment/blockstates/porcelain_casting.json delete mode 100644 src/main/resources/assets/tcompliment/lang/en_us.lang delete mode 100644 src/main/resources/assets/tcompliment/models/item/tools/sledge_hammer.tcon.json diff --git a/build.gradle b/build.gradle index 4111455..6de8a2c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup. -group = "knightminer.tcompliment" -archivesBaseName = "TinkersCompliment" +group = "knightminer.tcomplement" +archivesBaseName = "TinkersComplement" // External properties ext.configFile = file "build.properties" diff --git a/build.properties b/build.properties index a46d811..79def4a 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -mod_version=0.1.1 +mod_version=0.1.2 minecraft_version=1.11.2 forge_version=13.20.0.2282 mappings=snapshot_20170401 diff --git a/src/main/java/knightminer/tcomplement/TinkersComplement.java b/src/main/java/knightminer/tcomplement/TinkersComplement.java new file mode 100644 index 0000000..02337a6 --- /dev/null +++ b/src/main/java/knightminer/tcomplement/TinkersComplement.java @@ -0,0 +1,86 @@ +package knightminer.tcomplement; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import knightminer.tcomplement.common.Config; +import knightminer.tcomplement.common.TCompNetwork; +import knightminer.tcomplement.feature.ModuleFeature; +import knightminer.tcomplement.plugin.ceramics.CeramicsPlugin; +import knightminer.tcomplement.plugin.exnihilo.ExNihiloPlugin; +import knightminer.tcomplement.shared.ModuleCommons; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import slimeknights.mantle.common.GuiHandler; +import slimeknights.mantle.pulsar.control.PulseManager; + +@Mod( + modid = TinkersComplement.modID, + name = TinkersComplement.modName, + version = TinkersComplement.modVersion, + dependencies = "required-after:forge;" + + "required-after:mantle;" + + "required-after:tconstruct;" + + "after:exnihiloadscensio", + acceptedMinecraftVersions = "[1.11.2, 1.12)") +public class TinkersComplement { + public static final String modID = "tcomplement"; + public static final String modVersion = "${version}"; + public static final String modName = "Tinkers' Complement"; + + public static final Logger log = LogManager.getLogger(modID); + + @Mod.Instance(modID) + public static TinkersComplement instance; + + public static PulseManager pulseManager = new PulseManager(Config.pulseConfig); + public static GuiHandler guiHandler = new GuiHandler(); + + static { + pulseManager.registerPulse(new ModuleCommons()); + pulseManager.registerPulse(new ModuleFeature()); + pulseManager.registerPulse(new ExNihiloPlugin()); + pulseManager.registerPulse(new CeramicsPlugin()); + } + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + Config.load(event); + NetworkRegistry.INSTANCE.registerGuiHandler(instance, guiHandler); + + TCompNetwork.instance.setup(); + } + + // Old version compatibility + @Mod.EventHandler + public void onMissingMapping(FMLMissingMappingsEvent event) { + // TODO: safe to remove when I update to 1.12 + // thanks to /u/Thiakil on reddit for this code + for (FMLMissingMappingsEvent.MissingMapping mapping : event.getAll()){ + if (mapping.resourceLocation.getResourceDomain().equals( "tcompliment" )){ + ResourceLocation newLoc = new ResourceLocation( modID, mapping.resourceLocation.getResourcePath() ); + switch( mapping.type ){ + case ITEM: + Item newItem = Item.REGISTRY.getObject( newLoc ); + if (newItem != null) + mapping.remap( newItem ); + else + mapping.warn(); + break; + case BLOCK: + Block newBlock = Block.REGISTRY.getObject( newLoc ); + if (newBlock != null && newBlock != Blocks.AIR) + mapping.remap( newBlock ); + else + mapping.warn(); + } + } + } + } +} diff --git a/src/main/java/knightminer/tcompliment/common/ClientProxy.java b/src/main/java/knightminer/tcomplement/common/ClientProxy.java similarity index 95% rename from src/main/java/knightminer/tcompliment/common/ClientProxy.java rename to src/main/java/knightminer/tcomplement/common/ClientProxy.java index 5071853..937357c 100644 --- a/src/main/java/knightminer/tcompliment/common/ClientProxy.java +++ b/src/main/java/knightminer/tcomplement/common/ClientProxy.java @@ -1,8 +1,8 @@ -package knightminer.tcompliment.common; +package knightminer.tcomplement.common; import javax.annotation.Nonnull; -import knightminer.tcompliment.library.Util; +import knightminer.tcomplement.library.Util; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; diff --git a/src/main/java/knightminer/tcompliment/common/CommonProxy.java b/src/main/java/knightminer/tcomplement/common/CommonProxy.java similarity index 72% rename from src/main/java/knightminer/tcompliment/common/CommonProxy.java rename to src/main/java/knightminer/tcomplement/common/CommonProxy.java index 1725bec..2edfe96 100644 --- a/src/main/java/knightminer/tcompliment/common/CommonProxy.java +++ b/src/main/java/knightminer/tcomplement/common/CommonProxy.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.common; +package knightminer.tcomplement.common; public class CommonProxy { public void preInit() {} diff --git a/src/main/java/knightminer/tcompliment/common/Config.java b/src/main/java/knightminer/tcomplement/common/Config.java similarity index 86% rename from src/main/java/knightminer/tcompliment/common/Config.java rename to src/main/java/knightminer/tcomplement/common/Config.java index 63a8994..0b5ad53 100644 --- a/src/main/java/knightminer/tcompliment/common/Config.java +++ b/src/main/java/knightminer/tcomplement/common/Config.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.common; +package knightminer.tcomplement.common; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -6,7 +6,7 @@ public class Config { - public static ForgeCFG pulseConfig = new ForgeCFG("TinkersComplimentModules", "Modules"); + public static ForgeCFG pulseConfig = new ForgeCFG("TComplementModules", "Modules"); public static float oreToIngotRatio = 1.0f; diff --git a/src/main/java/knightminer/tcompliment/common/ModIds.java b/src/main/java/knightminer/tcomplement/common/ModIds.java similarity index 82% rename from src/main/java/knightminer/tcompliment/common/ModIds.java rename to src/main/java/knightminer/tcomplement/common/ModIds.java index 67ad3d8..e56c123 100644 --- a/src/main/java/knightminer/tcompliment/common/ModIds.java +++ b/src/main/java/knightminer/tcomplement/common/ModIds.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.common; +package knightminer.tcomplement.common; public interface ModIds { public interface Ceramics { diff --git a/src/main/java/knightminer/tcompliment/common/PulseBase.java b/src/main/java/knightminer/tcomplement/common/PulseBase.java similarity index 90% rename from src/main/java/knightminer/tcompliment/common/PulseBase.java rename to src/main/java/knightminer/tcomplement/common/PulseBase.java index 8c4608c..fb4b219 100644 --- a/src/main/java/knightminer/tcompliment/common/PulseBase.java +++ b/src/main/java/knightminer/tcomplement/common/PulseBase.java @@ -1,9 +1,9 @@ -package knightminer.tcompliment.common; +package knightminer.tcomplement.common; -import knightminer.tcompliment.TinkersCompliment; -import knightminer.tcompliment.feature.ModuleFeature; -import knightminer.tcompliment.library.Util; -import knightminer.tcompliment.plugin.ceramics.CeramicsPlugin; +import knightminer.tcomplement.TinkersComplement; +import knightminer.tcomplement.feature.ModuleFeature; +import knightminer.tcomplement.library.Util; +import knightminer.tcomplement.plugin.ceramics.CeramicsPlugin; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.item.Item; @@ -38,11 +38,11 @@ protected boolean isSmelteryLoaded() { } protected boolean isFeaturesLoaded() { - return TinkersCompliment.pulseManager.isPulseLoaded(ModuleFeature.pulseID); + return TinkersComplement.pulseManager.isPulseLoaded(ModuleFeature.pulseID); } protected boolean isCeramicsPluginLoaded() { - return TinkersCompliment.pulseManager.isPulseLoaded(CeramicsPlugin.pulseID); + return TinkersComplement.pulseManager.isPulseLoaded(CeramicsPlugin.pulseID); } /* Blocks */ @@ -145,6 +145,10 @@ protected static void registerTE(Class teClazz, String nam GameRegistry.registerTileEntity(teClazz, Util.resource(name)); } + protected static void registerTE(Class teClazz, String name, String... alts) { + GameRegistry.registerTileEntityWithAlternatives(teClazz, Util.resource(name), alts); + } + protected static > T register(T thing, String name) { thing.setRegistryName(Util.getResource(name)); GameRegistry.register(thing); diff --git a/src/main/java/knightminer/tcompliment/common/TCompNetwork.java b/src/main/java/knightminer/tcomplement/common/TCompNetwork.java similarity index 86% rename from src/main/java/knightminer/tcompliment/common/TCompNetwork.java rename to src/main/java/knightminer/tcomplement/common/TCompNetwork.java index b9a1e1f..e120b33 100644 --- a/src/main/java/knightminer/tcompliment/common/TCompNetwork.java +++ b/src/main/java/knightminer/tcomplement/common/TCompNetwork.java @@ -1,7 +1,7 @@ -package knightminer.tcompliment.common; +package knightminer.tcomplement.common; -import knightminer.tcompliment.TinkersCompliment; -import knightminer.tcompliment.feature.network.FluidUpdatePacket; +import knightminer.tcomplement.TinkersComplement; +import knightminer.tcomplement.feature.network.FluidUpdatePacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; @@ -16,7 +16,7 @@ public class TCompNetwork extends NetworkWrapper { public static TCompNetwork instance = new TCompNetwork(); public TCompNetwork() { - super(TinkersCompliment.modID); + super(TinkersComplement.modID); } public void setup() { diff --git a/src/main/java/knightminer/tcompliment/feature/FeatureClientProxy.java b/src/main/java/knightminer/tcomplement/feature/FeatureClientProxy.java similarity index 84% rename from src/main/java/knightminer/tcompliment/feature/FeatureClientProxy.java rename to src/main/java/knightminer/tcomplement/feature/FeatureClientProxy.java index af17ad2..e496c85 100644 --- a/src/main/java/knightminer/tcompliment/feature/FeatureClientProxy.java +++ b/src/main/java/knightminer/tcomplement/feature/FeatureClientProxy.java @@ -1,10 +1,10 @@ -package knightminer.tcompliment.feature; +package knightminer.tcomplement.feature; import static slimeknights.tconstruct.common.ModelRegisterUtil.registerItemModel; -import knightminer.tcompliment.common.ClientProxy; -import knightminer.tcompliment.feature.client.MelterRenderer; -import knightminer.tcompliment.feature.tileentity.TileMelter; +import knightminer.tcomplement.common.ClientProxy; +import knightminer.tcomplement.feature.client.MelterRenderer; +import knightminer.tcomplement.feature.tileentity.TileMelter; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.client.model.ModelLoader; diff --git a/src/main/java/knightminer/tcompliment/feature/ModuleFeature.java b/src/main/java/knightminer/tcomplement/feature/ModuleFeature.java similarity index 89% rename from src/main/java/knightminer/tcompliment/feature/ModuleFeature.java rename to src/main/java/knightminer/tcomplement/feature/ModuleFeature.java index 00cb1ae..cecfd96 100644 --- a/src/main/java/knightminer/tcompliment/feature/ModuleFeature.java +++ b/src/main/java/knightminer/tcomplement/feature/ModuleFeature.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.feature; +package knightminer.tcomplement.feature; import java.util.List; import java.util.Set; @@ -8,14 +8,14 @@ import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.Subscribe; -import knightminer.tcompliment.common.CommonProxy; -import knightminer.tcompliment.common.Config; -import knightminer.tcompliment.common.ModIds; -import knightminer.tcompliment.common.PulseBase; -import knightminer.tcompliment.feature.blocks.BlockMelter; -import knightminer.tcompliment.feature.tileentity.TileMelter; -import knightminer.tcompliment.library.TCompRegistry; -import knightminer.tcompliment.shared.ModuleCommons; +import knightminer.tcomplement.common.CommonProxy; +import knightminer.tcomplement.common.Config; +import knightminer.tcomplement.common.ModIds; +import knightminer.tcomplement.common.PulseBase; +import knightminer.tcomplement.feature.blocks.BlockMelter; +import knightminer.tcomplement.feature.tileentity.TileMelter; +import knightminer.tcomplement.library.TCompRegistry; +import knightminer.tcomplement.shared.ModuleCommons; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -44,9 +44,9 @@ @Pulse(id = ModuleFeature.pulseID, description = "Adds standalone Knights' Construct features") public class ModuleFeature extends PulseBase { - public static final String pulseID = "KnightsFeature"; + public static final String pulseID = "ModuleFeature"; - @SidedProxy(clientSide = "knightminer.tcompliment.feature.FeatureClientProxy", serverSide = "knightminer.tcompliment.common.CommonProxy") + @SidedProxy(clientSide = "knightminer.tcomplement.feature.FeatureClientProxy", serverSide = "knightminer.tcomplement.common.CommonProxy") public static CommonProxy proxy; public static Block melter; @@ -67,7 +67,7 @@ public void preInit(FMLPreInitializationEvent event) { } - registerTE(TileMelter.class, "melter"); + registerTE(TileMelter.class, "melter", "tcompliment:melter"); proxy.preInit(); } diff --git a/src/main/java/knightminer/tcompliment/feature/PartMaterialBlacklist.java b/src/main/java/knightminer/tcomplement/feature/PartMaterialBlacklist.java similarity index 85% rename from src/main/java/knightminer/tcompliment/feature/PartMaterialBlacklist.java rename to src/main/java/knightminer/tcomplement/feature/PartMaterialBlacklist.java index b3824b4..86d73e7 100644 --- a/src/main/java/knightminer/tcompliment/feature/PartMaterialBlacklist.java +++ b/src/main/java/knightminer/tcomplement/feature/PartMaterialBlacklist.java @@ -1,6 +1,6 @@ -package knightminer.tcompliment.feature; +package knightminer.tcomplement.feature; -import knightminer.tcompliment.library.IBlacklist; +import knightminer.tcomplement.library.IBlacklist; import net.minecraft.item.ItemStack; import slimeknights.tconstruct.library.materials.Material; import slimeknights.tconstruct.library.tools.IToolPart; diff --git a/src/main/java/knightminer/tcompliment/feature/blocks/BlockMelter.java b/src/main/java/knightminer/tcomplement/feature/blocks/BlockMelter.java similarity index 90% rename from src/main/java/knightminer/tcompliment/feature/blocks/BlockMelter.java rename to src/main/java/knightminer/tcomplement/feature/blocks/BlockMelter.java index 16b6287..d8eee10 100644 --- a/src/main/java/knightminer/tcompliment/feature/blocks/BlockMelter.java +++ b/src/main/java/knightminer/tcomplement/feature/blocks/BlockMelter.java @@ -1,10 +1,10 @@ -package knightminer.tcompliment.feature.blocks; +package knightminer.tcomplement.feature.blocks; import java.util.Random; -import knightminer.tcompliment.TinkersCompliment; -import knightminer.tcompliment.feature.tileentity.TileMelter; -import knightminer.tcompliment.library.TCompRegistry; +import knightminer.tcomplement.TinkersComplement; +import knightminer.tcomplement.feature.tileentity.TileMelter; +import knightminer.tcomplement.library.TCompRegistry; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -76,7 +76,7 @@ protected boolean openGui(EntityPlayer player, World world, BlockPos pos) { return false; } - player.openGui(TinkersCompliment.instance, 0, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(TinkersComplement.instance, 0, world, pos.getX(), pos.getY(), pos.getZ()); return true; } diff --git a/src/main/java/knightminer/tcompliment/feature/client/GuiMelter.java b/src/main/java/knightminer/tcomplement/feature/client/GuiMelter.java similarity index 95% rename from src/main/java/knightminer/tcompliment/feature/client/GuiMelter.java rename to src/main/java/knightminer/tcomplement/feature/client/GuiMelter.java index 13c2f12..7aa69b1 100644 --- a/src/main/java/knightminer/tcompliment/feature/client/GuiMelter.java +++ b/src/main/java/knightminer/tcomplement/feature/client/GuiMelter.java @@ -1,13 +1,13 @@ -package knightminer.tcompliment.feature.client; +package knightminer.tcomplement.feature.client; import java.util.List; import java.util.function.Consumer; import com.google.common.collect.Lists; -import knightminer.tcompliment.feature.inventory.ContainerMelter; -import knightminer.tcompliment.feature.tileentity.TileMelter; -import knightminer.tcompliment.library.Util; +import knightminer.tcomplement.feature.inventory.ContainerMelter; +import knightminer.tcomplement.feature.tileentity.TileMelter; +import knightminer.tcomplement.library.Util; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; @@ -85,12 +85,12 @@ else if((progress > 1f && progress < 2f) || progress == Float.POSITIVE_INFINITY) else if(progress >= 2f && progress < 3f) { bar = uberHeatBar; progress = 1f; - tooltip = "gui.melter.progress.no_space"; + tooltip = "gui.tcomplement.melter.progress.no_space"; } else if(progress >= 3f) { bar = uberHeatBar; progress = 1f; - tooltip = "gui.melter.progress.wrong_fluid"; + tooltip = "gui.tcomplement.melter.progress.wrong_fluid"; } int height = 1 + Math.round(progress * (bar.h - 1)); diff --git a/src/main/java/knightminer/tcompliment/feature/client/MelterRenderer.java b/src/main/java/knightminer/tcomplement/feature/client/MelterRenderer.java similarity index 91% rename from src/main/java/knightminer/tcompliment/feature/client/MelterRenderer.java rename to src/main/java/knightminer/tcomplement/feature/client/MelterRenderer.java index ca88601..4a587de 100644 --- a/src/main/java/knightminer/tcompliment/feature/client/MelterRenderer.java +++ b/src/main/java/knightminer/tcomplement/feature/client/MelterRenderer.java @@ -1,8 +1,8 @@ -package knightminer.tcompliment.feature.client; +package knightminer.tcomplement.feature.client; import javax.annotation.Nonnull; -import knightminer.tcompliment.feature.tileentity.TileMelter; +import knightminer.tcomplement.feature.tileentity.TileMelter; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/knightminer/tcompliment/feature/inventory/ContainerMelter.java b/src/main/java/knightminer/tcomplement/feature/inventory/ContainerMelter.java similarity index 93% rename from src/main/java/knightminer/tcompliment/feature/inventory/ContainerMelter.java rename to src/main/java/knightminer/tcomplement/feature/inventory/ContainerMelter.java index 18e3ee4..0774cc0 100644 --- a/src/main/java/knightminer/tcompliment/feature/inventory/ContainerMelter.java +++ b/src/main/java/knightminer/tcomplement/feature/inventory/ContainerMelter.java @@ -1,6 +1,6 @@ -package knightminer.tcompliment.feature.inventory; +package knightminer.tcomplement.feature.inventory; -import knightminer.tcompliment.feature.tileentity.TileMelter; +import knightminer.tcomplement.feature.tileentity.TileMelter; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.Slot; diff --git a/src/main/java/knightminer/tcompliment/feature/multiblock/MultiblockMelter.java b/src/main/java/knightminer/tcomplement/feature/multiblock/MultiblockMelter.java similarity index 92% rename from src/main/java/knightminer/tcompliment/feature/multiblock/MultiblockMelter.java rename to src/main/java/knightminer/tcomplement/feature/multiblock/MultiblockMelter.java index ac6a5ee..24468b2 100644 --- a/src/main/java/knightminer/tcompliment/feature/multiblock/MultiblockMelter.java +++ b/src/main/java/knightminer/tcomplement/feature/multiblock/MultiblockMelter.java @@ -1,9 +1,9 @@ -package knightminer.tcompliment.feature.multiblock; +package knightminer.tcomplement.feature.multiblock; import com.google.common.collect.ImmutableList; -import knightminer.tcompliment.feature.blocks.BlockMelter; -import knightminer.tcompliment.feature.tileentity.TileMelter; +import knightminer.tcomplement.feature.blocks.BlockMelter; +import knightminer.tcomplement.feature.tileentity.TileMelter; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/knightminer/tcompliment/feature/network/FluidUpdatePacket.java b/src/main/java/knightminer/tcomplement/feature/network/FluidUpdatePacket.java similarity index 93% rename from src/main/java/knightminer/tcompliment/feature/network/FluidUpdatePacket.java rename to src/main/java/knightminer/tcomplement/feature/network/FluidUpdatePacket.java index 25f17bc..685f78e 100644 --- a/src/main/java/knightminer/tcompliment/feature/network/FluidUpdatePacket.java +++ b/src/main/java/knightminer/tcomplement/feature/network/FluidUpdatePacket.java @@ -1,7 +1,7 @@ -package knightminer.tcompliment.feature.network; +package knightminer.tcomplement.feature.network; import io.netty.buffer.ByteBuf; -import knightminer.tcompliment.feature.tileentity.TileMelter; +import knightminer.tcomplement.feature.tileentity.TileMelter; import net.minecraft.client.Minecraft; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/knightminer/tcompliment/feature/tileentity/TileMelter.java b/src/main/java/knightminer/tcomplement/feature/tileentity/TileMelter.java similarity index 93% rename from src/main/java/knightminer/tcompliment/feature/tileentity/TileMelter.java rename to src/main/java/knightminer/tcomplement/feature/tileentity/TileMelter.java index 4d5e1fb..b873d4e 100644 --- a/src/main/java/knightminer/tcompliment/feature/tileentity/TileMelter.java +++ b/src/main/java/knightminer/tcomplement/feature/tileentity/TileMelter.java @@ -1,13 +1,13 @@ -package knightminer.tcompliment.feature.tileentity; +package knightminer.tcomplement.feature.tileentity; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import knightminer.tcompliment.feature.client.GuiMelter; -import knightminer.tcompliment.feature.inventory.ContainerMelter; -import knightminer.tcompliment.feature.multiblock.MultiblockMelter; -import knightminer.tcompliment.library.TCompRegistry; -import knightminer.tcompliment.library.feature.MelterTank; +import knightminer.tcomplement.feature.client.GuiMelter; +import knightminer.tcomplement.feature.inventory.ContainerMelter; +import knightminer.tcomplement.feature.multiblock.MultiblockMelter; +import knightminer.tcomplement.library.TCompRegistry; +import knightminer.tcomplement.library.feature.MelterTank; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -40,7 +40,7 @@ public class TileMelter extends TileHeatingStructureFuelTank i protected static final int CAPACITY = Material.VALUE_Ingot * 16; public TileMelter() { - super("gui.melter.name", 3, 1); + super("gui.tcomplement.melter.name", 3, 1); setMultiblock(new MultiblockMelter(this)); tank = new MelterTank(CAPACITY, this); diff --git a/src/main/java/knightminer/tcompliment/library/IBlacklist.java b/src/main/java/knightminer/tcomplement/library/IBlacklist.java similarity index 73% rename from src/main/java/knightminer/tcompliment/library/IBlacklist.java rename to src/main/java/knightminer/tcomplement/library/IBlacklist.java index 34a198f..c837a77 100644 --- a/src/main/java/knightminer/tcompliment/library/IBlacklist.java +++ b/src/main/java/knightminer/tcomplement/library/IBlacklist.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.library; +package knightminer.tcomplement.library; import net.minecraft.item.ItemStack; diff --git a/src/main/java/knightminer/tcompliment/library/RecipeMatchBlacklist.java b/src/main/java/knightminer/tcomplement/library/RecipeMatchBlacklist.java similarity index 91% rename from src/main/java/knightminer/tcompliment/library/RecipeMatchBlacklist.java rename to src/main/java/knightminer/tcomplement/library/RecipeMatchBlacklist.java index 8150d67..c50dd17 100644 --- a/src/main/java/knightminer/tcompliment/library/RecipeMatchBlacklist.java +++ b/src/main/java/knightminer/tcomplement/library/RecipeMatchBlacklist.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.library; +package knightminer.tcomplement.library; import net.minecraft.item.ItemStack; import slimeknights.mantle.util.RecipeMatch; diff --git a/src/main/java/knightminer/tcompliment/library/TCompRegistry.java b/src/main/java/knightminer/tcomplement/library/TCompRegistry.java similarity index 98% rename from src/main/java/knightminer/tcompliment/library/TCompRegistry.java rename to src/main/java/knightminer/tcomplement/library/TCompRegistry.java index d38f553..17aca80 100644 --- a/src/main/java/knightminer/tcompliment/library/TCompRegistry.java +++ b/src/main/java/knightminer/tcomplement/library/TCompRegistry.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.library; +package knightminer.tcomplement.library; import java.util.List; diff --git a/src/main/java/knightminer/tcompliment/library/Util.java b/src/main/java/knightminer/tcomplement/library/Util.java similarity index 80% rename from src/main/java/knightminer/tcompliment/library/Util.java rename to src/main/java/knightminer/tcomplement/library/Util.java index 6267dc1..15850c8 100644 --- a/src/main/java/knightminer/tcompliment/library/Util.java +++ b/src/main/java/knightminer/tcomplement/library/Util.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.library; +package knightminer.tcomplement.library; import java.util.Locale; @@ -6,21 +6,21 @@ import org.apache.logging.log4j.Logger; import org.lwjgl.input.Keyboard; -import knightminer.tcompliment.TinkersCompliment; +import knightminer.tcomplement.TinkersComplement; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; @SuppressWarnings("deprecation") public class Util { public static String resource(String name) { - return String.format("%s:%s", TinkersCompliment.modID, name.toLowerCase(Locale.US)); + return String.format("%s:%s", TinkersComplement.modID, name.toLowerCase(Locale.US)); } public static String prefix(String name) { - return String.format("%s.%s", TinkersCompliment.modID, name.toLowerCase(Locale.US)); + return String.format("%s.%s", TinkersComplement.modID, name.toLowerCase(Locale.US)); } public static ResourceLocation getResource(String res) { - return new ResourceLocation(TinkersCompliment.modID, res); + return new ResourceLocation(TinkersComplement.modID, res); } /** @@ -45,7 +45,7 @@ public static boolean isShiftKeyDown() { } public static Logger getLogger(String type) { - String log = TinkersCompliment.modID; + String log = TinkersComplement.modID; return LogManager.getLogger(log + "-" + type); } diff --git a/src/main/java/knightminer/tcompliment/library/feature/MelterTank.java b/src/main/java/knightminer/tcomplement/library/feature/MelterTank.java similarity index 73% rename from src/main/java/knightminer/tcompliment/library/feature/MelterTank.java rename to src/main/java/knightminer/tcomplement/library/feature/MelterTank.java index 8fe61fa..39af001 100644 --- a/src/main/java/knightminer/tcompliment/library/feature/MelterTank.java +++ b/src/main/java/knightminer/tcomplement/library/feature/MelterTank.java @@ -1,8 +1,8 @@ -package knightminer.tcompliment.library.feature; +package knightminer.tcomplement.library.feature; -import knightminer.tcompliment.common.TCompNetwork; -import knightminer.tcompliment.feature.network.FluidUpdatePacket; -import knightminer.tcompliment.feature.tileentity.TileMelter; +import knightminer.tcomplement.common.TCompNetwork; +import knightminer.tcomplement.feature.network.FluidUpdatePacket; +import knightminer.tcomplement.feature.tileentity.TileMelter; import slimeknights.tconstruct.library.fluid.FluidTankAnimated; public class MelterTank extends FluidTankAnimated { diff --git a/src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsClientEvents.java b/src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsClientEvents.java similarity index 94% rename from src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsClientEvents.java rename to src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsClientEvents.java index c78e323..981a0b5 100644 --- a/src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsClientEvents.java +++ b/src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsClientEvents.java @@ -1,6 +1,6 @@ -package knightminer.tcompliment.plugin.ceramics; +package knightminer.tcomplement.plugin.ceramics; -import knightminer.tcompliment.library.Util; +import knightminer.tcomplement.library.Util; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; diff --git a/src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsPlugin.java b/src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsPlugin.java similarity index 86% rename from src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsPlugin.java rename to src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsPlugin.java index c33fdd9..4c34db3 100644 --- a/src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsPlugin.java +++ b/src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsPlugin.java @@ -1,12 +1,12 @@ -package knightminer.tcompliment.plugin.ceramics; +package knightminer.tcomplement.plugin.ceramics; import com.google.common.eventbus.Subscribe; -import knightminer.tcompliment.common.CommonProxy; -import knightminer.tcompliment.common.ModIds; -import knightminer.tcompliment.common.PulseBase; -import knightminer.tcompliment.library.TCompRegistry; -import knightminer.tcompliment.shared.ModuleCommons; +import knightminer.tcomplement.common.CommonProxy; +import knightminer.tcomplement.common.ModIds; +import knightminer.tcomplement.common.PulseBase; +import knightminer.tcomplement.library.TCompRegistry; +import knightminer.tcomplement.shared.ModuleCommons; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -29,7 +29,7 @@ public class CeramicsPlugin extends PulseBase { public static final String pulseID = "CeramicsPlugin"; - @SidedProxy(clientSide = "knightminer.tcompliment.plugin.ceramics.CeramicsPluginClientProxy", serverSide = "knightminer.tcompliment.common.CommonProxy") + @SidedProxy(clientSide = "knightminer.tcomplement.plugin.ceramics.CeramicsPluginClientProxy", serverSide = "knightminer.tcomplement.common.CommonProxy") public static CommonProxy proxy; public static Block porcelainCasting; diff --git a/src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsPluginClientProxy.java b/src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsPluginClientProxy.java similarity index 81% rename from src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsPluginClientProxy.java rename to src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsPluginClientProxy.java index 97f9c76..6a08d92 100644 --- a/src/main/java/knightminer/tcompliment/plugin/ceramics/CeramicsPluginClientProxy.java +++ b/src/main/java/knightminer/tcomplement/plugin/ceramics/CeramicsPluginClientProxy.java @@ -1,8 +1,8 @@ -package knightminer.tcompliment.plugin.ceramics; +package knightminer.tcomplement.plugin.ceramics; import static slimeknights.tconstruct.common.ModelRegisterUtil.registerItemBlockMeta; -import knightminer.tcompliment.common.ClientProxy; +import knightminer.tcomplement.common.ClientProxy; import net.minecraftforge.common.MinecraftForge; public class CeramicsPluginClientProxy extends ClientProxy { diff --git a/src/main/java/knightminer/tcompliment/plugin/exnihilo/ENPluginClientProxy.java b/src/main/java/knightminer/tcomplement/plugin/exnihilo/ENPluginClientProxy.java similarity index 89% rename from src/main/java/knightminer/tcompliment/plugin/exnihilo/ENPluginClientProxy.java rename to src/main/java/knightminer/tcomplement/plugin/exnihilo/ENPluginClientProxy.java index 24660e4..b58706c 100644 --- a/src/main/java/knightminer/tcompliment/plugin/exnihilo/ENPluginClientProxy.java +++ b/src/main/java/knightminer/tcomplement/plugin/exnihilo/ENPluginClientProxy.java @@ -1,6 +1,6 @@ -package knightminer.tcompliment.plugin.exnihilo; +package knightminer.tcomplement.plugin.exnihilo; -import knightminer.tcompliment.common.ClientProxy; +import knightminer.tcomplement.common.ClientProxy; import slimeknights.tconstruct.common.ModelRegisterUtil; import slimeknights.tconstruct.library.TinkerRegistryClient; import slimeknights.tconstruct.library.client.ToolBuildGuiInfo; diff --git a/src/main/java/knightminer/tcompliment/plugin/exnihilo/ENPluginEvents.java b/src/main/java/knightminer/tcomplement/plugin/exnihilo/ENPluginEvents.java similarity index 95% rename from src/main/java/knightminer/tcompliment/plugin/exnihilo/ENPluginEvents.java rename to src/main/java/knightminer/tcomplement/plugin/exnihilo/ENPluginEvents.java index e5bfd2b..3ce2003 100644 --- a/src/main/java/knightminer/tcompliment/plugin/exnihilo/ENPluginEvents.java +++ b/src/main/java/knightminer/tcomplement/plugin/exnihilo/ENPluginEvents.java @@ -1,4 +1,4 @@ -package knightminer.tcompliment.plugin.exnihilo; +package knightminer.tcomplement.plugin.exnihilo; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/knightminer/tcompliment/plugin/exnihilo/ExNihiloPlugin.java b/src/main/java/knightminer/tcomplement/plugin/exnihilo/ExNihiloPlugin.java similarity index 79% rename from src/main/java/knightminer/tcompliment/plugin/exnihilo/ExNihiloPlugin.java rename to src/main/java/knightminer/tcomplement/plugin/exnihilo/ExNihiloPlugin.java index 64acc08..9984a97 100644 --- a/src/main/java/knightminer/tcompliment/plugin/exnihilo/ExNihiloPlugin.java +++ b/src/main/java/knightminer/tcomplement/plugin/exnihilo/ExNihiloPlugin.java @@ -1,11 +1,11 @@ -package knightminer.tcompliment.plugin.exnihilo; +package knightminer.tcomplement.plugin.exnihilo; import com.google.common.eventbus.Subscribe; -import knightminer.tcompliment.common.CommonProxy; -import knightminer.tcompliment.common.PulseBase; -import knightminer.tcompliment.library.TCompRegistry; -import knightminer.tcompliment.plugin.exnihilo.items.SledgeHammer; +import knightminer.tcomplement.common.CommonProxy; +import knightminer.tcomplement.common.PulseBase; +import knightminer.tcomplement.library.TCompRegistry; +import knightminer.tcomplement.plugin.exnihilo.items.SledgeHammer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -21,7 +21,7 @@ public class ExNihiloPlugin extends PulseBase { public static final String pulseID = "ExNihiloPlugin"; - @SidedProxy(clientSide = "knightminer.tcompliment.plugin.exnihilo.ENPluginClientProxy", serverSide = "knightminer.tcompliment.common.CommonProxy") + @SidedProxy(clientSide = "knightminer.tcomplement.plugin.exnihilo.ENPluginClientProxy", serverSide = "knightminer.tcomplement.common.CommonProxy") public static CommonProxy proxy; public static ToolPart sledgeHead; diff --git a/src/main/java/knightminer/tcompliment/plugin/exnihilo/items/SledgeHammer.java b/src/main/java/knightminer/tcomplement/plugin/exnihilo/items/SledgeHammer.java similarity index 94% rename from src/main/java/knightminer/tcompliment/plugin/exnihilo/items/SledgeHammer.java rename to src/main/java/knightminer/tcomplement/plugin/exnihilo/items/SledgeHammer.java index d1387a0..5f7592b 100644 --- a/src/main/java/knightminer/tcompliment/plugin/exnihilo/items/SledgeHammer.java +++ b/src/main/java/knightminer/tcomplement/plugin/exnihilo/items/SledgeHammer.java @@ -1,11 +1,11 @@ -package knightminer.tcompliment.plugin.exnihilo.items; +package knightminer.tcomplement.plugin.exnihilo.items; import java.util.List; import exnihiloadscensio.items.tools.IHammer; import exnihiloadscensio.registries.HammerRegistry; -import knightminer.tcompliment.library.TCompRegistry; -import knightminer.tcompliment.plugin.exnihilo.ExNihiloPlugin; +import knightminer.tcomplement.library.TCompRegistry; +import knightminer.tcomplement.plugin.exnihilo.ExNihiloPlugin; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/knightminer/tcompliment/plugin/jei/JEIPlugin.java b/src/main/java/knightminer/tcomplement/plugin/jei/JEIPlugin.java similarity index 90% rename from src/main/java/knightminer/tcompliment/plugin/jei/JEIPlugin.java rename to src/main/java/knightminer/tcomplement/plugin/jei/JEIPlugin.java index 2d1bfb1..d146154 100644 --- a/src/main/java/knightminer/tcompliment/plugin/jei/JEIPlugin.java +++ b/src/main/java/knightminer/tcomplement/plugin/jei/JEIPlugin.java @@ -1,8 +1,8 @@ -package knightminer.tcompliment.plugin.jei; +package knightminer.tcomplement.plugin.jei; import com.google.common.collect.ImmutableList; -import knightminer.tcompliment.plugin.exnihilo.ExNihiloPlugin; +import knightminer.tcomplement.plugin.exnihilo.ExNihiloPlugin; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; diff --git a/src/main/java/knightminer/tcompliment/shared/CommonsClientProxy.java b/src/main/java/knightminer/tcomplement/shared/CommonsClientProxy.java similarity index 69% rename from src/main/java/knightminer/tcompliment/shared/CommonsClientProxy.java rename to src/main/java/knightminer/tcomplement/shared/CommonsClientProxy.java index 35fa528..1883acc 100644 --- a/src/main/java/knightminer/tcompliment/shared/CommonsClientProxy.java +++ b/src/main/java/knightminer/tcomplement/shared/CommonsClientProxy.java @@ -1,6 +1,6 @@ -package knightminer.tcompliment.shared; +package knightminer.tcomplement.shared; -import knightminer.tcompliment.common.ClientProxy; +import knightminer.tcomplement.common.ClientProxy; public class CommonsClientProxy extends ClientProxy { @Override diff --git a/src/main/java/knightminer/tcompliment/shared/ModuleCommons.java b/src/main/java/knightminer/tcomplement/shared/ModuleCommons.java similarity index 76% rename from src/main/java/knightminer/tcompliment/shared/ModuleCommons.java rename to src/main/java/knightminer/tcomplement/shared/ModuleCommons.java index fa7a483..6713acb 100644 --- a/src/main/java/knightminer/tcompliment/shared/ModuleCommons.java +++ b/src/main/java/knightminer/tcomplement/shared/ModuleCommons.java @@ -1,10 +1,10 @@ -package knightminer.tcompliment.shared; +package knightminer.tcomplement.shared; import com.google.common.eventbus.Subscribe; -import knightminer.tcompliment.common.CommonProxy; -import knightminer.tcompliment.common.PulseBase; -import knightminer.tcompliment.library.TCompRegistry; +import knightminer.tcomplement.common.CommonProxy; +import knightminer.tcomplement.common.PulseBase; +import knightminer.tcomplement.library.TCompRegistry; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -15,9 +15,9 @@ @Pulse(id = ModuleCommons.pulseID, description = "Core feature for all the modules", forced = true) public class ModuleCommons extends PulseBase { - public static final String pulseID = "KnightsCommons"; + public static final String pulseID = "ModuleCommons"; - @SidedProxy(clientSide = "knightminer.tcompliment.shared.CommonsClientProxy", serverSide = "knightminer.tcompliment.common.CommonProxy") + @SidedProxy(clientSide = "knightminer.tcomplement.shared.CommonsClientProxy", serverSide = "knightminer.tcomplement.common.CommonProxy") public static CommonProxy proxy; //public static ItemMetaDynamic materials; diff --git a/src/main/java/knightminer/tcompliment/TinkersCompliment.java b/src/main/java/knightminer/tcompliment/TinkersCompliment.java deleted file mode 100644 index c6cf543..0000000 --- a/src/main/java/knightminer/tcompliment/TinkersCompliment.java +++ /dev/null @@ -1,53 +0,0 @@ -package knightminer.tcompliment; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import knightminer.tcompliment.common.Config; -import knightminer.tcompliment.common.TCompNetwork; -import knightminer.tcompliment.feature.ModuleFeature; -import knightminer.tcompliment.plugin.ceramics.CeramicsPlugin; -import knightminer.tcompliment.plugin.exnihilo.ExNihiloPlugin; -import knightminer.tcompliment.shared.ModuleCommons; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import slimeknights.mantle.common.GuiHandler; -import slimeknights.mantle.pulsar.control.PulseManager; - -@Mod( - modid = TinkersCompliment.modID, - name = TinkersCompliment.modName, - version = TinkersCompliment.modVersion, - dependencies = "required-after:forge;" - + "required-after:mantle;" - + "required-after:tconstruct;" - + "after:exnihiloadscensio", - acceptedMinecraftVersions = "[1.11.2, 1.12)") -public class TinkersCompliment { - public static final String modID = "tcompliment"; - public static final String modVersion = "${version}"; - public static final String modName = "Tinkers' Compliment"; - - public static final Logger log = LogManager.getLogger(modID); - - @Mod.Instance(modID) - public static TinkersCompliment instance; - - public static PulseManager pulseManager = new PulseManager(Config.pulseConfig); - public static GuiHandler guiHandler = new GuiHandler(); - - static { - pulseManager.registerPulse(new ModuleCommons()); - pulseManager.registerPulse(new ModuleFeature()); - pulseManager.registerPulse(new ExNihiloPlugin()); - pulseManager.registerPulse(new CeramicsPlugin()); - } - - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - NetworkRegistry.INSTANCE.registerGuiHandler(instance, guiHandler); - - TCompNetwork.instance.setup(); - } -} diff --git a/src/main/resources/assets/tcompliment/blockstates/cast.json b/src/main/resources/assets/tcomplement/blockstates/cast.json similarity index 73% rename from src/main/resources/assets/tcompliment/blockstates/cast.json rename to src/main/resources/assets/tcomplement/blockstates/cast.json index 53d46a3..2591c45 100644 --- a/src/main/resources/assets/tcompliment/blockstates/cast.json +++ b/src/main/resources/assets/tcomplement/blockstates/cast.json @@ -5,6 +5,6 @@ "model": "forge:item-layer" }, "variants": { - "bucket": [{ "textures": { "layer0": "tcompliment:items/materials/cast_bucket" }}] + "bucket": [{ "textures": { "layer0": "tcomplement:items/materials/cast_bucket" }}] } } diff --git a/src/main/resources/assets/tcompliment/blockstates/fluid_block.json b/src/main/resources/assets/tcomplement/blockstates/fluid_block.json similarity index 100% rename from src/main/resources/assets/tcompliment/blockstates/fluid_block.json rename to src/main/resources/assets/tcomplement/blockstates/fluid_block.json diff --git a/src/main/resources/assets/tcompliment/blockstates/materials.json b/src/main/resources/assets/tcomplement/blockstates/materials.json similarity index 74% rename from src/main/resources/assets/tcompliment/blockstates/materials.json rename to src/main/resources/assets/tcomplement/blockstates/materials.json index cf69a5e..b0ccf27 100644 --- a/src/main/resources/assets/tcompliment/blockstates/materials.json +++ b/src/main/resources/assets/tcomplement/blockstates/materials.json @@ -5,6 +5,6 @@ "model": "forge:item-layer" }, "variants": { - "burnt_brick": [{ "textures": { "layer0": "tcompliment:items/materials/burnt_brick" }}] + "burnt_brick": [{ "textures": { "layer0": "tcomplement:items/materials/burnt_brick" }}] } } diff --git a/src/main/resources/assets/tcompliment/blockstates/melter.json b/src/main/resources/assets/tcomplement/blockstates/melter.json similarity index 69% rename from src/main/resources/assets/tcompliment/blockstates/melter.json rename to src/main/resources/assets/tcomplement/blockstates/melter.json index 736c60d..a26a54b 100644 --- a/src/main/resources/assets/tcompliment/blockstates/melter.json +++ b/src/main/resources/assets/tcomplement/blockstates/melter.json @@ -1,13 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "tcompliment:melter", + "model": "tcomplement:melter", "textures": { - "front": "tcompliment:blocks/melter/front_inactive", + "front": "tcomplement:blocks/melter/front_inactive", "top": "tconstruct:blocks/smeltery/seared_window_top", "brick": "tconstruct:blocks/smeltery/seared_brick", - "side": "tcompliment:blocks/melter/side", - "active": "tcompliment:blocks/melter/front_active" + "side": "tcomplement:blocks/melter/side", + "active": "tcomplement:blocks/melter/front_active" }, "uvlock": true }, diff --git a/src/main/resources/assets/tcomplement/blockstates/porcelain_casting.json b/src/main/resources/assets/tcomplement/blockstates/porcelain_casting.json new file mode 100644 index 0000000..01c7da6 --- /dev/null +++ b/src/main/resources/assets/tcomplement/blockstates/porcelain_casting.json @@ -0,0 +1,32 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block" + }, + "variants": { + "type": { + "table": { + "model": "tconstruct:casting_table", + "textures": { + "top": "tcomplement:blocks/porcelain/table_top", + "side": "tcomplement:blocks/porcelain/table_side", + "leg": "tcomplement:blocks/porcelain/table_side", + "legBottom": "tcomplement:blocks/porcelain/table_bottom", + "bottom": "tcomplement:blocks/porcelain/table_bottom", + "particle": "tcomplement:blocks/porcelain/table_top" + } + }, + "basin": { + "model": "tconstruct:casting_basin", + "textures": { + "top": "tcomplement:blocks/porcelain/basin_top", + "side": "tcomplement:blocks/porcelain/basin_side", + "leg": "tcomplement:blocks/porcelain/basin_side", + "bottom": "tcomplement:blocks/porcelain/basin_bottom", + "legBottom": "tcomplement:blocks/porcelain/basin_bottom", + "particle": "tcomplement:blocks/porcelain/basin_top" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tcompliment/blockstates/porcelain_melter.json b/src/main/resources/assets/tcomplement/blockstates/porcelain_melter.json similarity index 57% rename from src/main/resources/assets/tcompliment/blockstates/porcelain_melter.json rename to src/main/resources/assets/tcomplement/blockstates/porcelain_melter.json index 64ef15a..32a5733 100644 --- a/src/main/resources/assets/tcompliment/blockstates/porcelain_melter.json +++ b/src/main/resources/assets/tcomplement/blockstates/porcelain_melter.json @@ -1,13 +1,13 @@ { "forge_marker": 1, "defaults": { - "model": "tcompliment:melter", + "model": "tcomplement:melter", "textures": { - "front": "tcompliment:blocks/porcelain/melter_front_inactive", - "top": "tcompliment:blocks/porcelain/window_top", + "front": "tcomplement:blocks/porcelain/melter_front_inactive", + "top": "tcomplement:blocks/porcelain/window_top", "brick": "ceramics:blocks/porcelain_bricks", - "side": "tcompliment:blocks/porcelain/melter_side", - "active": "tcompliment:blocks/porcelain/melter_front_active" + "side": "tcomplement:blocks/porcelain/melter_side", + "active": "tcomplement:blocks/porcelain/melter_front_active" }, "uvlock": true }, diff --git a/src/main/resources/assets/tcompliment/blockstates/porcelain_tank.json b/src/main/resources/assets/tcomplement/blockstates/porcelain_tank.json similarity index 79% rename from src/main/resources/assets/tcompliment/blockstates/porcelain_tank.json rename to src/main/resources/assets/tcomplement/blockstates/porcelain_tank.json index b123b2e..d30537f 100644 --- a/src/main/resources/assets/tcompliment/blockstates/porcelain_tank.json +++ b/src/main/resources/assets/tcomplement/blockstates/porcelain_tank.json @@ -14,20 +14,20 @@ "type": { "tank": { "textures": { - "side": "tcompliment:blocks/porcelain/tank_side", + "side": "tcomplement:blocks/porcelain/tank_side", "top": "ceramics:blocks/porcelain_bricks" } }, "gauge": { "textures": { - "side": "tcompliment:blocks/porcelain/gauge_side", - "top": "tcompliment:blocks/porcelain/window_top" + "side": "tcomplement:blocks/porcelain/gauge_side", + "top": "tcomplement:blocks/porcelain/window_top" } }, "window": { "textures": { - "side": "tcompliment:blocks/porcelain/window_side", - "top": "tcompliment:blocks/porcelain/window_top" + "side": "tcomplement:blocks/porcelain/window_side", + "top": "tcomplement:blocks/porcelain/window_top" } } }, diff --git a/src/main/resources/assets/tcomplement/lang/en_us.lang b/src/main/resources/assets/tcomplement/lang/en_us.lang new file mode 100644 index 0000000..8f70a58 --- /dev/null +++ b/src/main/resources/assets/tcomplement/lang/en_us.lang @@ -0,0 +1,41 @@ +itemGroup.TCompGeneral=Tinkers' Complement + +################ +# Blocks # +################ + +tile.tcomplement.porcelain_casting.basin.name=Porcelain Casting Basin +tile.tcomplement.porcelain_casting.table.name=Porcelain Casting Table +tile.tcomplement.porcelain_casting.tooltip=Cast items using molten metals from a melter + +tile.tcomplement.melter.name=Melter +tile.tcomplement.melter.tooltip=Smaller version of a smeltery.\nCan melt metals but cannot make alloys. + +tile.tcomplement.porcelain_melter.name=Porcelain Melter +tile.tcomplement.porcelain_melter.tooltip=tile.tcomplement.melter.tooltip + +tile.tcomplement.porcelain_tank.tank.name=Porcelain Tank +tile.tcomplement.porcelain_tank.gauge.name=Porcelain Gauge +tile.tcomplement.porcelain_tank.window.name=Porcelain Window +tile.tcomplement.porcelain_tank.tooltip=Heart of the Melter\nRetains liquid when broken. + + +################ +# Items # +################ + +item.tcomplement.materials.burnt_brick.name=Burnt Brick + +item.tcomplement.cast.bucket.name=Bucket Cast + +item.tcomplement.sledge_head.name=Sledge Hammer Head +item.tcomplement.sledge_hammer.name=Sledge Hammer + + +################ +# GUI # +################ + +gui.tcomplement.melter.name=Melter +gui.tcomplement.melter.progress.no_space=Not enough free space in the melter +gui.tcomplement.melter.progress.wrong_fluid=Resulting fluid is different than fluid in melter \ No newline at end of file diff --git a/src/main/resources/assets/tcompliment/models/block/melter.json b/src/main/resources/assets/tcomplement/models/block/melter.json similarity index 100% rename from src/main/resources/assets/tcompliment/models/block/melter.json rename to src/main/resources/assets/tcomplement/models/block/melter.json diff --git a/src/main/resources/assets/tcompliment/models/item/parts/sledge_head.tmat.json b/src/main/resources/assets/tcomplement/models/item/parts/sledge_head.tmat.json similarity index 67% rename from src/main/resources/assets/tcompliment/models/item/parts/sledge_head.tmat.json rename to src/main/resources/assets/tcomplement/models/item/parts/sledge_head.tmat.json index ffa0941..c70c104 100644 --- a/src/main/resources/assets/tcompliment/models/item/parts/sledge_head.tmat.json +++ b/src/main/resources/assets/tcomplement/models/item/parts/sledge_head.tmat.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "tcompliment:items/sledge_hammer/head" + "layer0": "tcomplement:items/sledge_hammer/head" }, "offset": { "x": -3, diff --git a/src/main/resources/assets/tcomplement/models/item/tools/sledge_hammer.tcon.json b/src/main/resources/assets/tcomplement/models/item/tools/sledge_hammer.tcon.json new file mode 100644 index 0000000..837f7ba --- /dev/null +++ b/src/main/resources/assets/tcomplement/models/item/tools/sledge_hammer.tcon.json @@ -0,0 +1,9 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "tconstruct:items/pickaxe/handle", + "layer1": "tcomplement:items/sledge_hammer/head", + "layer2": "tcomplement:items/sledge_hammer/binding", + "broken1": "tcomplement:items/sledge_hammer/broken_head" + } +} diff --git a/src/main/resources/assets/tcompliment/textures/blocks/melter/front_active.png b/src/main/resources/assets/tcomplement/textures/blocks/melter/front_active.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/melter/front_active.png rename to src/main/resources/assets/tcomplement/textures/blocks/melter/front_active.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/melter/front_inactive.png b/src/main/resources/assets/tcomplement/textures/blocks/melter/front_inactive.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/melter/front_inactive.png rename to src/main/resources/assets/tcomplement/textures/blocks/melter/front_inactive.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/melter/side.png b/src/main/resources/assets/tcomplement/textures/blocks/melter/side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/melter/side.png rename to src/main/resources/assets/tcomplement/textures/blocks/melter/side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/basin_bottom.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/basin_bottom.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/basin_bottom.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/basin_bottom.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/basin_side.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/basin_side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/basin_side.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/basin_side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/basin_top.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/basin_top.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/basin_top.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/basin_top.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/gauge_side.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/gauge_side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/gauge_side.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/gauge_side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/melter_front_active.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/melter_front_active.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/melter_front_active.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/melter_front_active.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/melter_front_inactive.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/melter_front_inactive.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/melter_front_inactive.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/melter_front_inactive.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/melter_side.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/melter_side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/melter_side.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/melter_side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/table_bottom.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/table_bottom.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/table_bottom.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/table_bottom.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/table_side.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/table_side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/table_side.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/table_side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/table_top.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/table_top.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/table_top.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/table_top.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/tank_side.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/tank_side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/tank_side.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/tank_side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/window_side.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/window_side.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/window_side.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/window_side.png diff --git a/src/main/resources/assets/tcompliment/textures/blocks/porcelain/window_top.png b/src/main/resources/assets/tcomplement/textures/blocks/porcelain/window_top.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/blocks/porcelain/window_top.png rename to src/main/resources/assets/tcomplement/textures/blocks/porcelain/window_top.png diff --git a/src/main/resources/assets/tcompliment/textures/gui/melter.png b/src/main/resources/assets/tcomplement/textures/gui/melter.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/gui/melter.png rename to src/main/resources/assets/tcomplement/textures/gui/melter.png diff --git a/src/main/resources/assets/tcompliment/textures/items/materials/cast_bucket.png b/src/main/resources/assets/tcomplement/textures/items/materials/cast_bucket.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/materials/cast_bucket.png rename to src/main/resources/assets/tcomplement/textures/items/materials/cast_bucket.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding_cactus.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding_cactus.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding_cactus.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding_cactus.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding_contrast.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding_contrast.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding_contrast.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding_contrast.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding_paper.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding_paper.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/binding_paper.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/binding_paper.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head_cactus.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head_cactus.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head_cactus.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head_cactus.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head_contrast.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head_contrast.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head_contrast.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head_contrast.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head_paper.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head_paper.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/broken_head_paper.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/broken_head_paper.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head_cactus.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head_cactus.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head_cactus.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head_cactus.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head_contrast.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head_contrast.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head_contrast.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head_contrast.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head_paper.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head_paper.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/head_paper.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/head_paper.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_bane_spider.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_bane_spider.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_bane_spider.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_bane_spider.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_beheading.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_beheading.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_beheading.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_beheading.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_blasting.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_blasting.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_blasting.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_blasting.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_diamond.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_diamond.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_diamond.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_diamond.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_emerald.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_emerald.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_emerald.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_emerald.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_fiery.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_fiery.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_fiery.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_fiery.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_fortified.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_fortified.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_fortified.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_fortified.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_glowing.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_glowing.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_glowing.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_glowing.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_haste.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_haste.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_haste.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_haste.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_knockback.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_knockback.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_knockback.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_knockback.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_luck.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_luck.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_luck.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_luck.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_mending_moss.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_mending_moss.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_mending_moss.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_mending_moss.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_necrotic.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_necrotic.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_necrotic.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_necrotic.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_reinforced.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_reinforced.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_reinforced.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_reinforced.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_sharpness.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_sharpness.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_sharpness.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_sharpness.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_shulking.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_shulking.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_shulking.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_shulking.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_silk.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_silk.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_silk.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_silk.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_smite.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_smite.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_smite.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_smite.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_soulbound.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_soulbound.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_soulbound.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_soulbound.png diff --git a/src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_web.png b/src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_web.png similarity index 100% rename from src/main/resources/assets/tcompliment/textures/items/sledge_hammer/mod_web.png rename to src/main/resources/assets/tcomplement/textures/items/sledge_hammer/mod_web.png diff --git a/src/main/resources/assets/tcompliment/blockstates/porcelain_casting.json b/src/main/resources/assets/tcompliment/blockstates/porcelain_casting.json deleted file mode 100644 index 1a5a8c4..0000000 --- a/src/main/resources/assets/tcompliment/blockstates/porcelain_casting.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block" - }, - "variants": { - "type": { - "table": { - "model": "tconstruct:casting_table", - "textures": { - "top": "tcompliment:blocks/porcelain/table_top", - "side": "tcompliment:blocks/porcelain/table_side", - "leg": "tcompliment:blocks/porcelain/table_side", - "legBottom": "tcompliment:blocks/porcelain/table_bottom", - "bottom": "tcompliment:blocks/porcelain/table_bottom", - "particle": "tcompliment:blocks/porcelain/table_top" - } - }, - "basin": { - "model": "tconstruct:casting_basin", - "textures": { - "top": "tcompliment:blocks/porcelain/basin_top", - "side": "tcompliment:blocks/porcelain/basin_side", - "leg": "tcompliment:blocks/porcelain/basin_side", - "bottom": "tcompliment:blocks/porcelain/basin_bottom", - "legBottom": "tcompliment:blocks/porcelain/basin_bottom", - "particle": "tcompliment:blocks/porcelain/basin_top" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/tcompliment/lang/en_us.lang b/src/main/resources/assets/tcompliment/lang/en_us.lang deleted file mode 100644 index 68cd711..0000000 --- a/src/main/resources/assets/tcompliment/lang/en_us.lang +++ /dev/null @@ -1,41 +0,0 @@ -itemGroup.TCompGeneral=Tinkers' Compliment - -################ -# Blocks # -################ - -tile.tcompliment.porcelain_casting.basin.name=Porcelain Casting Basin -tile.tcompliment.porcelain_casting.table.name=Porcelain Casting Table -tile.tcompliment.porcelain_casting.tooltip=Cast items using molten metals from a melter - -tile.tcompliment.melter.name=Melter -tile.tcompliment.melter.tooltip=Smaller version of a smeltery.\nCan melt metals but cannot make alloys. - -tile.tcompliment.porcelain_melter.name=Porcelain Melter -tile.tcompliment.porcelain_melter.tooltip=tile.tcompliment.melter.tooltip - -tile.tcompliment.porcelain_tank.tank.name=Porcelain Tank -tile.tcompliment.porcelain_tank.gauge.name=Porcelain Gauge -tile.tcompliment.porcelain_tank.window.name=Porcelain Window -tile.tcompliment.porcelain_tank.tooltip=Heart of the Melter\nRetains liquid when broken. - - -################ -# Items # -################ - -item.tcompliment.materials.burnt_brick.name=Burnt Brick - -item.tcompliment.cast.bucket.name=Bucket Cast - -item.tcompliment.sledge_head.name=Sledge Hammer Head -item.tcompliment.sledge_hammer.name=Sledge Hammer - - -################ -# GUI # -################ - -gui.melter.name=Melter -gui.melter.progress.no_space=Not enough free space in the melter -gui.melter.progress.wrong_fluid=Resulting fluid is different than fluid in melter \ No newline at end of file diff --git a/src/main/resources/assets/tcompliment/models/item/tools/sledge_hammer.tcon.json b/src/main/resources/assets/tcompliment/models/item/tools/sledge_hammer.tcon.json deleted file mode 100644 index a680843..0000000 --- a/src/main/resources/assets/tcompliment/models/item/tools/sledge_hammer.tcon.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "tconstruct:items/pickaxe/handle", - "layer1": "tcompliment:items/sledge_hammer/head", - "layer2": "tcompliment:items/sledge_hammer/binding", - "broken1": "tcompliment:items/sledge_hammer/broken_head" - } -} diff --git a/src/main/resources/assets/tconstruct/models/item/modifiers/sledge_hammer.mod.json b/src/main/resources/assets/tconstruct/models/item/modifiers/sledge_hammer.mod.json index bd5e48d..f35b6f8 100644 --- a/src/main/resources/assets/tconstruct/models/item/modifiers/sledge_hammer.mod.json +++ b/src/main/resources/assets/tconstruct/models/item/modifiers/sledge_hammer.mod.json @@ -1,24 +1,24 @@ { "textures": { - "bane_spider": "kconstruct:items/sledge_hammer/mod_bane_spider", - "beheading": "kconstruct:items/sledge_hammer/mod_beheading", - "blasting": "kconstruct:items/sledge_hammer/mod_blasting", - "diamond": "kconstruct:items/sledge_hammer/mod_diamond", - "emerald": "kconstruct:items/sledge_hammer/mod_emerald", - "fiery": "kconstruct:items/sledge_hammer/mod_fiery", - "fortified": "kconstruct:items/sledge_hammer/mod_fortified", - "glowing": "kconstruct:items/sledge_hammer/mod_glowing", - "haste": "kconstruct:items/sledge_hammer/mod_haste", - "knockback": "kconstruct:items/sledge_hammer/mod_knockback", - "luck": "kconstruct:items/sledge_hammer/mod_luck", - "mending_moss": "kconstruct:items/sledge_hammer/mod_mending_moss", - "necrotic": "kconstruct:items/sledge_hammer/mod_necrotic", - "reinforced": "kconstruct:items/sledge_hammer/mod_reinforced", - "sharpness": "kconstruct:items/sledge_hammer/mod_sharpness", - "shulking": "kconstruct:items/sledge_hammer/mod_shulking", - "silk": "kconstruct:items/sledge_hammer/mod_silk", - "smite": "kconstruct:items/sledge_hammer/mod_smite", - "soulbound": "kconstruct:items/sledge_hammer/mod_soulbound", - "web": "kconstruct:items/sledge_hammer/mod_web" + "bane_spider": "tcomplement:items/sledge_hammer/mod_bane_spider", + "beheading": "tcomplement:items/sledge_hammer/mod_beheading", + "blasting": "tcomplement:items/sledge_hammer/mod_blasting", + "diamond": "tcomplement:items/sledge_hammer/mod_diamond", + "emerald": "tcomplement:items/sledge_hammer/mod_emerald", + "fiery": "tcomplement:items/sledge_hammer/mod_fiery", + "fortified": "tcomplement:items/sledge_hammer/mod_fortified", + "glowing": "tcomplement:items/sledge_hammer/mod_glowing", + "haste": "tcomplement:items/sledge_hammer/mod_haste", + "knockback": "tcomplement:items/sledge_hammer/mod_knockback", + "luck": "tcomplement:items/sledge_hammer/mod_luck", + "mending_moss": "tcomplement:items/sledge_hammer/mod_mending_moss", + "necrotic": "tcomplement:items/sledge_hammer/mod_necrotic", + "reinforced": "tcomplement:items/sledge_hammer/mod_reinforced", + "sharpness": "tcomplement:items/sledge_hammer/mod_sharpness", + "shulking": "tcomplement:items/sledge_hammer/mod_shulking", + "silk": "tcomplement:items/sledge_hammer/mod_silk", + "smite": "tcomplement:items/sledge_hammer/mod_smite", + "soulbound": "tcomplement:items/sledge_hammer/mod_soulbound", + "web": "tcomplement:items/sledge_hammer/mod_web" } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 5fcf303..10cc94b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,11 +1,11 @@ [ { - "modid": "tcompliment", - "name": "Tinkers' Compliment", + "modid": "tcomplement", + "name": "Tinkers' Complement", "description": "Addon for Tinkers Construct adding various features to complement those from Tinkers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://minecraft.curseforge.com/projects/tinkers-compliment", + "url": "https://minecraft.curseforge.com/projects/tinkers-complement", "updateUrl": "", "authorList": ["KnightMiner"], "credits": "", diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 8f48c83..c93ccf4 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 3, - "description": "Resources used for Knights Construct" + "description": "Resources used for Tinkers' Complement" } } \ No newline at end of file