BrassGoggledCoders
/
SteamCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put the tools back in the creative tab where they belong.

dev
Arona Jones 2015-08-13 21:56:02 +01:00
parent e972295fe3
commit b0b5d838b1
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/steamcraft/common/init/InitItems.java
View File

@ -620,20 +620,30 @@ public class InitItems
RegistryHelper.registerToolSet(swordSteam, shovelSteam, pickaxeSteam, axeSteam, hoeSteam, "Steam", ModInfo.ID); RegistryHelper.registerToolSet(swordSteam, shovelSteam, pickaxeSteam, axeSteam, hoeSteam, "Steam", ModInfo.ID);
// Etherium // Etherium
pickaxeEtherium = new BasePickaxe(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemPickaxeEtherium"); pickaxeEtherium = new BasePickaxe(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemPickaxeEtherium")
swordEtherium = new BaseSword(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemSwordEtherium"); .setCreativeTab(Steamcraft.tabSC2);
shovelEtherium = new BaseShovel(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemShovelEtherium"); swordEtherium = new BaseSword(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemSwordEtherium")
axeEtherium = new BaseAxe(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemAxeEtherium"); .setCreativeTab(Steamcraft.tabSC2);
hoeEtherium = new BaseHoe(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemHoeEtherium"); shovelEtherium = new BaseShovel(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemShovelEtherium")
.setCreativeTab(Steamcraft.tabSC2);
axeEtherium = new BaseAxe(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemAxeEtherium")
.setCreativeTab(Steamcraft.tabSC2);
hoeEtherium = new BaseHoe(InitMaterials.TOOL_ETHERIUM, ModInfo.PREFIX).setUnlocalizedName("itemHoeEtherium")
.setCreativeTab(Steamcraft.tabSC2);
RegistryHelper.registerToolSet(swordEtherium, shovelEtherium, pickaxeEtherium, axeEtherium, hoeEtherium, "Etherium", ModInfo.ID); RegistryHelper.registerToolSet(swordEtherium, shovelEtherium, pickaxeEtherium, axeEtherium, hoeEtherium, "Etherium", ModInfo.ID);
// Obsidian // Obsidian
pickaxeObsidian = new BasePickaxe(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemPickaxeObsidian"); pickaxeObsidian = new BasePickaxe(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemPickaxeObsidian")
swordObsidian = new BaseSword(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemSwordObsidian"); .setCreativeTab(Steamcraft.tabSC2);
shovelObsidian = new BaseShovel(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemShovelObsidian"); swordObsidian = new BaseSword(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemSwordObsidian")
axeObsidian = new BaseAxe(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemAxeObsidian"); .setCreativeTab(Steamcraft.tabSC2);
hoeObsidian = new BaseHoe(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemHoeObsidian"); shovelObsidian = new BaseShovel(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemShovelObsidian")
.setCreativeTab(Steamcraft.tabSC2);
axeObsidian = new BaseAxe(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemAxeObsidian")
.setCreativeTab(Steamcraft.tabSC2);
hoeObsidian = new BaseHoe(InitMaterials.TOOL_OBSIDIAN, ModInfo.PREFIX).setUnlocalizedName("itemHoeObsidian")
.setCreativeTab(Steamcraft.tabSC2);
RegistryHelper.registerToolSet(swordObsidian, shovelObsidian, pickaxeObsidian, axeObsidian, hoeObsidian, "Obsidian", ModInfo.ID); RegistryHelper.registerToolSet(swordObsidian, shovelObsidian, pickaxeObsidian, axeObsidian, hoeObsidian, "Obsidian", ModInfo.ID);

2
src/main/java/steamcraft/common/items/electric/ItemElectricTool.java
View File

@ -23,6 +23,7 @@ import net.minecraft.world.World;
import boilerplate.api.IEnergyItem; import boilerplate.api.IEnergyItem;
import boilerplate.common.baseclasses.tools.BaseTool; import boilerplate.common.baseclasses.tools.BaseTool;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo; import steamcraft.common.lib.ModInfo;
public class ItemElectricTool extends BaseTool implements IEnergyItem public class ItemElectricTool extends BaseTool implements IEnergyItem
@ -34,6 +35,7 @@ public class ItemElectricTool extends BaseTool implements IEnergyItem
protected ItemElectricTool(float damage, ToolMaterial toolMat, int maxEnergy, int maxReceive) protected ItemElectricTool(float damage, ToolMaterial toolMat, int maxEnergy, int maxReceive)
{ {
super(damage, toolMat, ModInfo.PREFIX); super(damage, toolMat, ModInfo.PREFIX);
this.setCreativeTab(Steamcraft.tabSC2);
this.maxEnergy = maxEnergy * 1000; this.maxEnergy = maxEnergy * 1000;
this.maxReceive = (short) maxReceive; this.maxReceive = (short) maxReceive;
this.setMaxStackSize(1); this.setMaxStackSize(1);

2
src/main/java/steamcraft/common/items/tools/steam/ItemSteamDrill.java
View File

@ -27,7 +27,6 @@ import net.minecraft.world.World;
import boilerplate.client.ClientHelper; import boilerplate.client.ClientHelper;
import boilerplate.common.utils.PlayerUtils; import boilerplate.common.utils.PlayerUtils;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo; import steamcraft.common.lib.ModInfo;
/** /**
@ -39,7 +38,6 @@ public class ItemSteamDrill extends ItemSteamTool
public ItemSteamDrill(ToolMaterial mat) public ItemSteamDrill(ToolMaterial mat)
{ {
super(1); super(1);
this.setCreativeTab(Steamcraft.tabSC2);
this.setHarvestLevel("pickaxe", mat.getHarvestLevel()); this.setHarvestLevel("pickaxe", mat.getHarvestLevel());
this.setHarvestLevel("shovel", mat.getHarvestLevel()); this.setHarvestLevel("shovel", mat.getHarvestLevel());
} }

2
src/main/java/steamcraft/common/items/tools/steam/ItemSteamTool.java
View File

@ -16,6 +16,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.tools.BaseTool; import boilerplate.common.baseclasses.tools.BaseTool;
import steamcraft.common.Steamcraft;
import steamcraft.common.init.InitItems; import steamcraft.common.init.InitItems;
import steamcraft.common.init.InitMaterials; import steamcraft.common.init.InitMaterials;
import steamcraft.common.items.ItemCanister; import steamcraft.common.items.ItemCanister;
@ -26,6 +27,7 @@ public class ItemSteamTool extends BaseTool
public ItemSteamTool(float damage) public ItemSteamTool(float damage)
{ {
super(damage, InitMaterials.TOOL_STEAM, ModInfo.PREFIX); super(damage, InitMaterials.TOOL_STEAM, ModInfo.PREFIX);
this.setCreativeTab(Steamcraft.tabSC2);
} }
@SuppressWarnings("all") @SuppressWarnings("all")