The great format and clean up. IMPORTANT: Read below.

All devs and contributors should use the provided formatter settings. 
If your IDE does not support the format, the rules are simple, it is the
default java formatting rules, with 200char line lengths and 1 extra
line after class definitions.
This commit is contained in:
tterrag1098 committed 2015-01-07 19:50:18 -05:00
1 parent 06c5f5930f
commit 82792ed22e
136 files changed
+10365 -11272

No files matched your search

File diff suppressed because it is too large. Load diff
@@ -5,42 +5,48 @@ import com.cricketcraft.chisel.Configurations;
import com.cricketcraft.chisel.entity.EntityBallOMoss;
import com.cricketcraft.chisel.entity.EntityCloudInABottle;
import com.cricketcraft.chisel.entity.EntitySmashingRock;
import com.cricketcraft.chisel.item.*;
import com.cricketcraft.chisel.item.ItemBallOMoss;
import com.cricketcraft.chisel.item.ItemChisel;
import com.cricketcraft.chisel.item.ItemCloudInABottle;
import com.cricketcraft.chisel.item.ItemSmashingRock;
import com.cricketcraft.chisel.item.ItemUpgrade;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
public class ModItems {
public static ItemChisel chisel;
public static ItemCloudInABottle itemCloudInABottle;
public static ItemBallOMoss itemBallOMoss;
public static ItemSmashingRock smashingRock;
public static ItemUpgrade upgrade;
public static void load() {
chisel = (ItemChisel) new ItemChisel().setCreativeTab(ModTabs.tabChisel);
GameRegistry.registerItem(chisel, "chisel");
public static ItemChisel chisel;
public static ItemCloudInABottle itemCloudInABottle;
public static ItemBallOMoss itemBallOMoss;
public static ItemSmashingRock smashingRock;
public static ItemUpgrade upgrade;
if (Configurations.featureEnabled("cloud")) {
itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle");
}
public static void load() {
chisel = (ItemChisel) new ItemChisel().setCreativeTab(ModTabs.tabChisel);
GameRegistry.registerItem(chisel, "chisel");
if (Configurations.featureEnabled("ballOfMoss")) {
itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(itemBallOMoss, "ballomoss");
}
if (Configurations.featureEnabled("cloud")) {
itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle");
}
if (Configurations.featureEnabled("smashingRock")) {
smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(smashingRock, "smashingrock");
}
if (Configurations.featureEnabled("ballOfMoss")) {
itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(itemBallOMoss, "ballomoss");
}
if(Configurations.featureEnabled("autoChiselUpgrades")){
upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ModTabs.tabChisel);
GameRegistry.registerItem(upgrade, upgrade.getUnlocalizedName());
}
}
if (Configurations.featureEnabled("smashingRock")) {
smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(ModTabs.tabChisel);
EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true);
GameRegistry.registerItem(smashingRock, "smashingrock");
}
if (Configurations.featureEnabled("autoChiselUpgrades")) {
upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ModTabs.tabChisel);
GameRegistry.registerItem(upgrade, upgrade.getUnlocalizedName());
}
}
}
@@ -1,73 +1,76 @@
package com.cricketcraft.chisel.init;
import com.cricketcraft.chisel.Chisel;
import cpw.mods.fml.common.Loader;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import com.cricketcraft.chisel.Chisel;
import cpw.mods.fml.common.Loader;
public class ModTabs {
private static boolean atLeastOneModIsLoaded = false;
private static boolean atLeastOneModIsLoaded = false;
public static CreativeTabs tabChisel;
public static CreativeTabs tabStoneChiselBlocks, tabWoodChiselBlocks,tabMetalChiselBlocks, tabOtherChiselBlocks, tabModdedChiselBlocks;
public static CreativeTabs tabChisel;
public static CreativeTabs tabStoneChiselBlocks, tabWoodChiselBlocks, tabMetalChiselBlocks, tabOtherChiselBlocks, tabModdedChiselBlocks;
public static void load(){
public static void load() {
tabChisel = new CreativeTabs("tabChisel")
{
@Override
public Item getTabIconItem() {
return ModItems.chisel;
}
};
tabChisel = new CreativeTabs("tabChisel") {
for(String s : Chisel.modsSupported){
if(Loader.isModLoaded(s)){
atLeastOneModIsLoaded = true;
}
}
@Override
public Item getTabIconItem() {
return ModItems.chisel;
}
};
if(atLeastOneModIsLoaded){
tabModdedChiselBlocks = new CreativeTabs("tabModdedChiselBlocks") {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.arcane);
}
};
}
for (String s : Chisel.modsSupported) {
if (Loader.isModLoaded(s)) {
atLeastOneModIsLoaded = true;
}
}
tabStoneChiselBlocks = new CreativeTabs("tabStoneChiselBlocks") {
@Override
public Item getTabIconItem()
{
return Item.getItemFromBlock(ModBlocks.holystone);
}
};
if (atLeastOneModIsLoaded) {
tabModdedChiselBlocks = new CreativeTabs("tabModdedChiselBlocks") {
tabWoodChiselBlocks = new CreativeTabs("tabWoodChiselBlocks") {
@Override
public Item getTabIconItem()
{
return Item.getItemFromBlock(Blocks.bookshelf);
}
};
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.arcane);
}
};
}
tabMetalChiselBlocks = new CreativeTabs("tabMetalChiselBlocks") {
@Override
public Item getTabIconItem()
{
return Item.getItemFromBlock(ModBlocks.technical);
}
};
tabStoneChiselBlocks = new CreativeTabs("tabStoneChiselBlocks") {
tabOtherChiselBlocks = new CreativeTabs("tabOtherChiselBlocks") {
@Override
public Item getTabIconItem()
{
return Item.getItemFromBlock(ModBlocks.jackolantern[0]);
}
};
}
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.holystone);
}
};
tabWoodChiselBlocks = new CreativeTabs("tabWoodChiselBlocks") {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(Blocks.bookshelf);
}
};
tabMetalChiselBlocks = new CreativeTabs("tabMetalChiselBlocks") {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.technical);
}
};
tabOtherChiselBlocks = new CreativeTabs("tabOtherChiselBlocks") {
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.jackolantern[0]);
}
};
}
}