Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let's keep it simple :)

Browse source
This commit is contained in:
LemADEC 2014-08-17 11:34:35 +02:00
parent e3e850848a
commit ae82ba885f
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/assets/warpdrive/lang/en_US.lang
View file

@ -7,9 +7,9 @@ item.warpdrive.crafting.ReactorCore.name=Reactor Core
item.warpdrive.crafting.InterfaceComputer.name=Computer Interface
item.warpdrive.crafting.InterfacePower.name=Power Interface
item.warpdrive.crafting.PowerCore.name=Energy Core
item.warpdrive.crafting.AirCanEmpty.name=Empty Air Canister
item.warpdrive.crafting.AirCanisterEmpty.name=Empty Air Canister
item.warpdrive.useful.AirCanFull.name=Air Canister
item.warpdrive.items.AirCanisterFull.name=Air Canister
item.warpdrive.armor.Helmet.name=Warp Helmet
tile.warpdrive.blocks.Air.name=Air Block

8
src/cr0s/WarpDrive/WarpDrive.java
View file

@ -97,7 +97,7 @@ public class WarpDrive implements LoadingCallback {
public static EnumArmorMaterial armorMaterial = EnumHelper.addArmorMaterial("WARP", 5, new int[]{1, 3, 2, 1}, 15);
public static ItemWarpArmor helmetItem;
public static ItemWarpAircan airCanItem;
public static ItemWarpAirCanister airCanisterItem;
public static BiomeGenBase spaceBiome;
public World space;
@ -109,7 +109,7 @@ public class WarpDrive implements LoadingCallback {
public static float normalFOV = 70.0F;
public static float normalSensitivity = 1.0F;
public static CreativeTabs warpdriveTab = new WarpDriveCreativeTab("Warpdrive","Warpdrive").setBackgroundImageName("warpdrive:creativeTab");
public static CreativeTabs warpdriveTab = new WarpDriveCreativeTab("Warpdrive", "Warpdrive").setBackgroundImageName("warpdrive:creativeTab");
@Instance("WarpDrive")
public static WarpDrive instance;
@ -321,8 +321,8 @@ public class WarpDrive implements LoadingCallback {
helmetItem = new ItemWarpArmor(WarpDriveConfig.helmetID, 0);
GameRegistry.registerItem(helmetItem, "helmet");
airCanItem = new ItemWarpAircan(WarpDriveConfig.aircanID);
GameRegistry.registerItem(airCanItem, "aircanFull");
airCanisterItem = new ItemWarpAirCanister(WarpDriveConfig.airCanisterID);
GameRegistry.registerItem(airCanisterItem, "airCanisterFull");
proxy.registerEntities();
ForgeChunkManager.setForcedChunkLoadingCallback(instance, instance);

8
src/cr0s/WarpDrive/WarpDriveConfig.java
View file

@ -22,7 +22,7 @@ public class WarpDriveConfig
private static Configuration config;
public static int coreID, controllerID, radarID, isolationID, airID, airgenID, gasID, laserID, miningLaserID, particleBoosterID, liftID, laserCamID, camID, monitorID, iridiumBlockID, shipScannerID, cloakCoreID, cloakCoilID;
public static int laserTreeFarmID, transporterID, transportBeaconID, reactorLaserFocusID, reactorMonitorID, powerReactorID, powerLaserID, powerStoreID, chunkLoaderID, componentID;
public static int helmetID, chestID, pantsID, bootsID, aircanID;
public static int helmetID, chestID, pantsID, bootsID, airCanisterID;
/*
* The variables which store whether or not individual mods are loaded
@ -158,8 +158,8 @@ public class WarpDriveConfig
public static int LE_BLOCK_HIT_CONSUME_ENERGY_PER_DISTANCE = 10;
// POWER REACTOR
public static int PR_MAX_ENERGY = 10000000;
public static int PR_TICK_TIME = 20;
public static int PR_MAX_ENERGY = 100000000;
public static int PR_TICK_TIME = 5;
public static int PR_MAX_LASERS = 3;
// POWER STORE
@ -381,7 +381,7 @@ public class WarpDriveConfig
reactorLaserFocusID = config.getItem("reactorLaserFocus", 8700).getInt();
componentID = config.getItem("component", 8701).getInt();
aircanID = config.getItem("aircanFull", 8706).getInt();
airCanisterID = config.getItem("airCanisterFull", 8706).getInt();
helmetID = config.getItem("helmet", 8702).getInt();
chestID = config.getItem("chest", 8703).getInt();
pantsID = config.getItem("pants", 8704).getInt();

12
src/cr0s/WarpDrive/item/ItemWarpAircan.java → src/cr0s/WarpDrive/item/ItemWarpAirCanister.java
View file

@ -9,20 +9,20 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
public class ItemWarpAircan extends Item implements IAirCanister {
public class ItemWarpAirCanister extends Item implements IAirCanister {
Icon icon;
public ItemWarpAircan(int id) {
public ItemWarpAirCanister(int id) {
super(id);
setMaxDamage(20);
setCreativeTab(WarpDrive.warpdriveTab);
setMaxStackSize(1);
setUnlocalizedName("warpdrive.useful.AirCanFull");
setUnlocalizedName("warpdrive.items.AirCanisterFull");
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister ir) {
icon = ir.registerIcon("warpdrive:aircanFull");
icon = ir.registerIcon("warpdrive:componentAirCanisterFull");
}
@Override
@ -38,12 +38,12 @@ public class ItemWarpAircan extends Item implements IAirCanister {
@Override
public ItemStack fullDrop(ItemStack can) {
return new ItemStack(WarpDrive.airCanItem,1);
return new ItemStack(WarpDrive.airCanisterItem,1);
}
@Override
public boolean canContainAir(ItemStack can) {
if (can != null && can.getItem() instanceof ItemWarpAircan) {
if (can != null && can.getItem() instanceof ItemWarpAirCanister) {
return can.getItemDamage() > 0;
}
return false;

12
src/cr0s/WarpDrive/item/ItemWarpComponent.java
View file

@ -35,7 +35,7 @@ public class ItemWarpComponent extends Item implements IAirCanister {
potentialUnlocalized[5] = "InterfaceComputer";
potentialUnlocalized[6] = "InterfacePower";
potentialUnlocalized[7] = "PowerCore";
potentialUnlocalized[8] = "AirCanEmpty";
potentialUnlocalized[8] = "AirCanisterEmpty";
potentialIcons = new Icon[potentialUnlocalized.length];
cachedIS = new ItemStack[potentialUnlocalized.length];
@ -151,23 +151,23 @@ public class ItemWarpComponent extends Item implements IAirCanister {
//For empty air cans
@Override
public ItemStack fullDrop(ItemStack is) {
if (doesMatch(is,"AirCanEmpty")) {
return WarpDrive.airCanItem.fullDrop(is);
if (doesMatch(is, "AirCanisterEmpty")) {
return WarpDrive.airCanisterItem.fullDrop(is);
}
return null;
}
@Override
public ItemStack emptyDrop(ItemStack is) {
if (doesMatch(is,"AirCanEmpty")) {
return WarpDrive.airCanItem.emptyDrop(is);
if (doesMatch(is, "AirCanisterEmpty")) {
return WarpDrive.airCanisterItem.emptyDrop(is);
}
return null;
}
@Override
public boolean canContainAir(ItemStack is) {
return doesMatch(is,"AirCanEmpty");
return doesMatch(is, "AirCanisterEmpty");
}
@Override