Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,15 @@ Desktop.ini
*.iml
*.ipr
*.iws

# eclipse
.classpath
.project
.settings/*
bin/*

# gradle
.gradle/*

# other
build.bat
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ filename=EasyCrafting
version=2.0.1

version_mc=1.7.10
version_forge=10.13.0.1208
version_forge=10.13.2.1235

#ftp_location=ftp://localhost/maven/
ftp_location=ftp://lepko.net/domains/lepko.net/public_html/mods/maven/
Expand Down
79 changes: 41 additions & 38 deletions src/main/java/net/lepko/easycrafting/EasyCrafting.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,54 @@
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.relauncher.Side;
import net.lepko.easycrafting.core.block.ModBlocks;
import net.lepko.easycrafting.core.config.ConfigHandler;
import net.lepko.easycrafting.core.config.KeyBindings;
import net.lepko.easycrafting.core.network.PacketHandler;
import net.lepko.easycrafting.core.recipe.RecipeManager;
import net.lepko.easycrafting.core.util.ItemMap;

@Mod(modid = Ref.MOD_ID, useMetadata = true)
public class EasyCrafting {

//TODO: block.shouldCheckWeakPower()
//block.onNeighbourTileChange()
//RIGHT CLICK SEARCH BAR DELETES ALL TEXT
//CREDIT ElementalRobot50 for Auto Crafting Table textures


@Instance(Ref.MOD_ID)
public static EasyCrafting INSTANCE;

@EventHandler
public void preInit(FMLPreInitializationEvent event) {
Ref.init();
ConfigHandler.initialize(event.getSuggestedConfigurationFile());

ModBlocks.setupBlocks();
}

@EventHandler
public void init(FMLInitializationEvent event) {
Ref.PROXY.registerHandlers();
Ref.PROXY.registerCommands();

PacketHandler.init();
}

@EventHandler
public void postInit(FMLPostInitializationEvent event) {
ModBlocks.setupRecipes();
//XXX: VersionHelper.performCheck();
}

@EventHandler
public void available(FMLLoadCompleteEvent event) {
ItemMap.build();

// This fires after the recipes are sorted by forge; Mods should not add/remove recipes after this point!!
RecipeManager.scanRecipes();
}
// TODO: block.shouldCheckWeakPower()
// block.onNeighbourTileChange()
// CREDIT ElementalRobot50 for Auto Crafting Table textures

@Instance(Ref.MOD_ID)
public static EasyCrafting INSTANCE;

@EventHandler
public void preInit(FMLPreInitializationEvent event) {
if (event.getSide() == Side.CLIENT)
KeyBindings.init();
Ref.init();
ConfigHandler.initialize(event.getSuggestedConfigurationFile());

ModBlocks.setupBlocks();
}

@EventHandler
public void init(FMLInitializationEvent event) {
Ref.PROXY.registerHandlers();
Ref.PROXY.registerCommands();

PacketHandler.init();
}

@EventHandler
public void postInit(FMLPostInitializationEvent event) {
ModBlocks.setupRecipes();
// XXX: VersionHelper.performCheck();
}

@EventHandler
public void available(FMLLoadCompleteEvent event) {
ItemMap.build();

// This fires after the recipes are sorted by forge; Mods should not
// add/remove recipes after this point!!
RecipeManager.scanRecipes();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public BlockTable() {
setStepSound(soundTypeWood);
setBlockName(Ref.addDomain("table"));
setBlockTextureName(Ref.addDomain("table"));
setCreativeTab(CreativeTabs.tabDecorations);
}

@Override
Expand Down Expand Up @@ -82,7 +81,7 @@ public void getSubBlocks(Item item, CreativeTabs tab, List list) {
list.add(new ItemStack(item, 1, meta));
}
}

@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
TileEntity te = world.getTileEntity(x, y, z);
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/net/lepko/easycrafting/core/block/ItemBlockTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@

public class ItemBlockTable extends ItemBlock {

public ItemBlockTable(Block block) {
super(block);
setUnlocalizedName(Ref.addDomain("table"));
setHasSubtypes(true);
}
public ItemBlockTable(Block block) {
super(block);
setUnlocalizedName(Ref.addDomain("table"));
setHasSubtypes(true);
}

@Override
public int getMetadata(int meta) {
return meta;
}
@Override
public int getMetadata(int meta) {
return meta;
}

@Override
public String getUnlocalizedName(ItemStack stack) {
int meta = stack.getItemDamage();
if (meta >= 0 && meta < BlockTable.names.length) {
return this.getUnlocalizedName() + "." + BlockTable.names[meta];
}
return "missingno";
}
@Override
public String getUnlocalizedName(ItemStack stack) {
int meta = stack.getItemDamage();
if (meta >= 0 && meta < BlockTable.names.length) {
return this.getUnlocalizedName() + "." + BlockTable.names[meta];
}
return "missingno";
}
}
15 changes: 15 additions & 0 deletions src/main/java/net/lepko/easycrafting/core/block/ModBlocks.java
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
package net.lepko.easycrafting.core.block;

import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.lepko.easycrafting.Ref;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

@GameRegistry.ObjectHolder(Ref.MOD_ID)
public class ModBlocks {

public static CreativeTabs easyCraftingTab = new CreativeTabs("easyCrafting") {
@Override
@SideOnly(Side.CLIENT)
public Item getTabIconItem() {
return get("easyCraftingTable").getItem();
}
};

public static final Block table = new BlockTable();

public static void setupBlocks() {
GameRegistry.registerBlock(table, ItemBlockTable.class, "table");

GameRegistry.registerCustomItemStack("easyCraftingTable", new ItemStack(table, 1, 0));
GameRegistry.registerCustomItemStack("autoCraftingTable", new ItemStack(table, 1, 1));

GameRegistry.registerTileEntity(TileEntityEasyCrafting.class, "EasyCraftingTableTE");
GameRegistry.registerTileEntity(TileEntityAutoCrafting.class, "AutoCraftingTableTE");

table.setCreativeTab(easyCraftingTab);
}

public static void setupRecipes() {
Expand Down
28 changes: 28 additions & 0 deletions src/main/java/net/lepko/easycrafting/core/config/KeyBindings.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package net.lepko.easycrafting.core.config;

import net.minecraft.client.settings.KeyBinding;

import org.lwjgl.input.Keyboard;

import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class KeyBindings {

public static KeyBinding focusSearch;

public static void init() {
// Define the "focus" binding, with (unlocalized) name "key.focus" and
// the category with (unlocalized) name "key.categories.EasyCrafting"
// and
// key code 33 ("F", LWJGL constant: Keyboard.KEY_F)
focusSearch = new KeyBinding("key.focus", Keyboard.KEY_F,
"key.categories.easycrafting");

// Register KeyBinding to the ClientRegistry
ClientRegistry.registerKeyBinding(focusSearch);
}

}
Loading