Continue to make sense of things... this mod's a mess lol
This commit is contained in:
parent
d98802ee1b
commit
0b963dcda9
171 changed files with 269 additions and 234 deletions
|
@ -31,10 +31,10 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.init.TRItems;
|
||||
|
||||
public class ItemRechargeableBattery extends ItemBattery {
|
||||
public class ItemRedCellBattery extends ItemBattery {
|
||||
|
||||
// 40k FE capacity with 100 FE\t charge rate
|
||||
public ItemRechargeableBattery() {
|
||||
public ItemRedCellBattery() {
|
||||
super(40_000, 100);
|
||||
}
|
||||
|
||||
|
@ -44,7 +44,7 @@ public class ItemRechargeableBattery extends ItemBattery {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.RECHARGEABLE_BATTERY);
|
||||
ItemStack stack = new ItemStack(TRItems.RED_CELL_BATTERY);
|
||||
// ItemStack charged = stack.copy();
|
||||
//IEnergyStorage capEnergy = charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
//capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.advanced;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -33,11 +33,12 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemChainsaw;
|
||||
|
||||
public class ItemDiamondChainsaw extends ItemChainsaw {
|
||||
public class ItemAdvancedChainsaw extends ItemChainsaw {
|
||||
|
||||
// 400k max charge with 1k charge rate
|
||||
public ItemDiamondChainsaw() {
|
||||
public ItemAdvancedChainsaw() {
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondChainsawCharge, 1.0F);
|
||||
this.cost = 250;
|
||||
this.transferLimit = 1000;
|
||||
|
@ -49,7 +50,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.DIAMOND_CHAINSAW);
|
||||
ItemStack stack = new ItemStack(TRItems.ADVANCED_CHAINSAW);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.advanced;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -33,11 +33,12 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemDrill;
|
||||
|
||||
public class ItemDiamondDrill extends ItemDrill {
|
||||
public class ItemAdvancedDrill extends ItemDrill {
|
||||
|
||||
// 400k max charge with 1k charge rate
|
||||
public ItemDiamondDrill() {
|
||||
public ItemAdvancedDrill() {
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondDrillCharge, 0.5F, 15F);
|
||||
this.cost = 250;
|
||||
this.transferLimit = 1000;
|
||||
|
@ -49,7 +50,7 @@ public class ItemDiamondDrill extends ItemDrill {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.DIAMOND_DRILL);
|
||||
ItemStack stack = new ItemStack(TRItems.ADVANCED_DRILL);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.advanced;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -31,21 +31,21 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemJackhammer;
|
||||
|
||||
public class ItemAdvancedJackhammer extends ItemJackhammer {
|
||||
|
||||
// 4M FE max charge with 1k charge rate
|
||||
// 400k max charge with 1k charge rate
|
||||
public ItemAdvancedJackhammer() {
|
||||
super(ToolMaterial.IRON, ConfigTechReborn.AdvancedJackhammerCharge);
|
||||
this.cost = 250;
|
||||
this.efficiency = 60F;
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondJackhammerCharge);
|
||||
this.cost = 100;
|
||||
this.efficiency = 16F;
|
||||
this.transferLimit = 1000;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
|
||||
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
|
||||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.advanced;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -47,7 +47,6 @@ import reborncore.common.powerSystem.PoweredItemCapabilityProvider;
|
|||
import reborncore.common.util.ItemUtils;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.utils.InitUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Random;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.basic;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -33,10 +33,11 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemChainsaw;
|
||||
|
||||
public class ItemSteelChainsaw extends ItemChainsaw {
|
||||
public class ItemBasicChainsaw extends ItemChainsaw {
|
||||
|
||||
public ItemSteelChainsaw() {
|
||||
public ItemBasicChainsaw() {
|
||||
super(ToolMaterial.IRON, ConfigTechReborn.SteelChainsawCharge, 0.5F);
|
||||
this.cost = 50;
|
||||
}
|
||||
|
@ -48,7 +49,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.STEEL_CHAINSAW);
|
||||
ItemStack stack = new ItemStack(TRItems.BASIC_CHAINSAW);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.basic;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -33,10 +33,11 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemDrill;
|
||||
|
||||
public class ItemSteelDrill extends ItemDrill {
|
||||
public class ItemBasicDrill extends ItemDrill {
|
||||
|
||||
public ItemSteelDrill() {
|
||||
public ItemBasicDrill() {
|
||||
super(ToolMaterial.IRON, ConfigTechReborn.SteelDrillCharge, 0.5F, 10F);
|
||||
this.cost = 50;
|
||||
}
|
||||
|
@ -48,7 +49,7 @@ public class ItemSteelDrill extends ItemDrill {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.STEEL_DRILL);
|
||||
ItemStack stack = new ItemStack(TRItems.BASIC_DRILL);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.basic;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -31,10 +31,11 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemJackhammer;
|
||||
|
||||
public class ItemSteelJackhammer extends ItemJackhammer {
|
||||
public class ItemBasicJackhammer extends ItemJackhammer {
|
||||
|
||||
public ItemSteelJackhammer() {
|
||||
public ItemBasicJackhammer() {
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.SteelJackhammerCharge);
|
||||
this.cost = 50;
|
||||
this.efficiency = 12F;
|
||||
|
@ -46,7 +47,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.STEEL_JACKHAMMER);
|
||||
ItemStack stack = new ItemStack(TRItems.BASIC_JACKHAMMER);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.basic;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.industrial;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
@ -39,11 +39,12 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemChainsaw;
|
||||
|
||||
public class ItemAdvancedChainsaw extends ItemChainsaw {
|
||||
public class ItemIndustrialChainsaw extends ItemChainsaw {
|
||||
|
||||
// 4M FE max charge with 1k charge rate
|
||||
public ItemAdvancedChainsaw() {
|
||||
public ItemIndustrialChainsaw() {
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedChainsawCharge, 1.0F);
|
||||
this.cost = 250;
|
||||
this.transferLimit = 1000;
|
||||
|
@ -55,7 +56,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.ADVANCED_CHAINSAW);
|
||||
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_CHAINSAW);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.industrial;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
|
@ -41,16 +41,17 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemDrill;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class ItemAdvancedDrill extends ItemDrill {
|
||||
public class ItemIndustrialDrill extends ItemDrill {
|
||||
|
||||
// 4M FE max charge with 1k charge rate
|
||||
public ItemAdvancedDrill() {
|
||||
public ItemIndustrialDrill() {
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.AdvancedDrillCharge, 2.0F, 10F);
|
||||
this.cost = 250;
|
||||
this.transferLimit = 1000;
|
||||
|
@ -154,7 +155,7 @@ public class ItemAdvancedDrill extends ItemDrill {
|
|||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.ADVANCED_DRILL);
|
||||
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_DRILL);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.industrial;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -31,24 +31,26 @@ import net.minecraftforge.fml.relauncher.Side;
|
|||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.items.tool.ItemJackhammer;
|
||||
|
||||
public class ItemDiamondJackhammer extends ItemJackhammer {
|
||||
public class ItemIndustrialJackhammer extends ItemJackhammer {
|
||||
|
||||
// 400k max charge with 1k charge rate
|
||||
public ItemDiamondJackhammer() {
|
||||
super(ToolMaterial.DIAMOND, ConfigTechReborn.DiamondJackhammerCharge);
|
||||
this.cost = 100;
|
||||
this.efficiency = 16F;
|
||||
// 4M FE max charge with 1k charge rate
|
||||
public ItemIndustrialJackhammer() {
|
||||
super(ToolMaterial.IRON, ConfigTechReborn.AdvancedJackhammerCharge);
|
||||
this.cost = 250;
|
||||
this.efficiency = 60F;
|
||||
this.transferLimit = 1000;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
|
||||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRItems.DIAMOND_JACKHAMMER);
|
||||
ItemStack stack = new ItemStack(TRItems.INDUSTRIAL_JACKHAMMER);
|
||||
// ItemStack charged = stack.copy();
|
||||
// ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
// capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.industrial;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.industrial;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
|
@ -49,7 +49,6 @@ import reborncore.common.util.ItemUtils;
|
|||
import reborncore.common.util.TorchHelper;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.TRItems;
|
||||
import techreborn.utils.InitUtils;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.vanilla;
|
||||
|
||||
import net.minecraft.item.ItemAxe;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.vanilla;
|
||||
|
||||
import net.minecraft.item.ItemHoe;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.vanilla;
|
||||
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.vanilla;
|
||||
|
||||
import net.minecraft.item.ItemSpade;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -22,7 +22,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package techreborn.items.tools;
|
||||
package techreborn.items.tool.vanilla;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
Loading…
Add table
Add a link
Reference in a new issue