Skip to content

Commit 6863fc9

Browse files
committed
Multicore Solar Panels. Missing the recipe though.
1 parent f323fec commit 6863fc9

15 files changed

+593
-21
lines changed

assets/levelstorage/lang/en_US.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ tile.blockMassInfuser.name=Mass Infuser
88
tile.blockAdvMiner.name=Advanced Miner
99
tile.blockMolHeater.name=Molecular Heater
1010
tile.blockAtomicReplicator.name=Atomic Replicator
11+
tile.blockMulticoreSolarPanel.name=Multicore Solar Panel
1112
# items
1213
item.itemLevelStorageBook.name=XP Tome
1314
item.itemAdvScanner.name=Advanced OV-Scanner
426 Bytes
Loading
426 Bytes
Loading
342 Bytes
Loading
330 Bytes
Loading

makmods/levelstorage/LSBlockItemList.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import makmods.levelstorage.block.BlockAdvancedMiner;
99
import makmods.levelstorage.block.BlockCableSuperconductor;
1010
import makmods.levelstorage.block.BlockMolecularHeater;
11+
import makmods.levelstorage.block.BlockMulticoreSolarPanel;
1112
import makmods.levelstorage.block.BlockWirelessConductor;
1213
import makmods.levelstorage.block.BlockWirelessPowerSynchronizer;
1314
import makmods.levelstorage.block.BlockXpCharger;
@@ -49,6 +50,7 @@ public class LSBlockItemList {
4950
// public static BlockMassInfuser blockMassInfuser;
5051
public static BlockAdvancedMiner blockAdvMiner;
5152
public static BlockMolecularHeater blockMolHeater;
53+
public static BlockMulticoreSolarPanel blockMulticoreSolarPanel;
5254

5355
// Items
5456
public static ItemLevelStorageBook itemLevelStorageBook;

makmods/levelstorage/armor/ArmorFunctions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ public static void jumpBooster(World world, EntityPlayer player,
339339
if ((IC2Access.instance.isKeyDown("Jump", player) && (IC2Access.instance
340340
.isKeyDown("Boost", player)))) {
341341
if (jumpCharge == 2.0F) {
342-
player.motionX *= 3.5D;
343-
player.motionZ *= 3.5D;
342+
player.motionX *= 5.0D;
343+
player.motionZ *= 5.0D;
344344
}
345345

346346
player.motionY += jumpCharge * 0.3F;

makmods/levelstorage/block/BlockMolecularHeater.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ public Icon getBlockTexture(IBlockAccess access, int x, int y, int z,
152152
public void registerIcons(IconRegister iconRegister) {
153153
BlockTextureRegistry.instance.registerIcons(iconRegister,
154154
ClientProxy.MOLECULAR_HEATER_TEXTURE);
155-
facing = iconRegister.registerIcon(ClientProxy.MOLECULAR_HEATER_FACING);
156155
}
157156

158157
@Override
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
package makmods.levelstorage.block;
2+
3+
import java.util.Random;
4+
5+
import makmods.levelstorage.LevelStorageCreativeTab;
6+
import makmods.levelstorage.lib.IC2Items;
7+
import makmods.levelstorage.logic.util.Helper;
8+
import makmods.levelstorage.proxy.ClientProxy;
9+
import makmods.levelstorage.registry.BlockTextureRegistry;
10+
import makmods.levelstorage.tileentity.TileEntityMulticoreSolarPanel;
11+
import net.minecraft.block.Block;
12+
import net.minecraft.block.BlockContainer;
13+
import net.minecraft.block.material.Material;
14+
import net.minecraft.client.renderer.texture.IconRegister;
15+
import net.minecraft.entity.player.EntityPlayer;
16+
import net.minecraft.item.EnumRarity;
17+
import net.minecraft.item.ItemStack;
18+
import net.minecraft.tileentity.TileEntity;
19+
import net.minecraft.util.Icon;
20+
import net.minecraft.world.World;
21+
import cpw.mods.fml.common.FMLCommonHandler;
22+
import cpw.mods.fml.relauncher.Side;
23+
import cpw.mods.fml.relauncher.SideOnly;
24+
25+
public class BlockMulticoreSolarPanel extends BlockContainer {
26+
27+
public BlockMulticoreSolarPanel(int id) {
28+
super(id, Material.iron);
29+
if (FMLCommonHandler.instance().getSide().isClient()) {
30+
this.setCreativeTab(LevelStorageCreativeTab.instance);
31+
}
32+
this.setStepSound(Block.soundMetalFootstep);
33+
this.setHardness(3.0F);
34+
}
35+
36+
public static void addCraftingRecipe() {
37+
// TODO: add recipe
38+
}
39+
40+
@Override
41+
public int idDropped(int par1, Random par2Random, int par3) {
42+
return IC2Items.ADV_MACHINE.itemID;
43+
}
44+
45+
@Override
46+
public int damageDropped(int par1) {
47+
return IC2Items.ADV_MACHINE.getItemDamage();
48+
}
49+
50+
@Override
51+
public void breakBlock(World world, int x, int y, int z, int par5, int par6) {
52+
Helper.dropBlockItems(world, x, y, z);
53+
super.breakBlock(world, x, y, z, par5, par6);
54+
}
55+
56+
@Override
57+
public boolean onBlockActivated(World world, int x, int y, int z,
58+
EntityPlayer player, int par6, float par7, float par8, float par9) {
59+
return Helper.handleMachineRightclick(world, x, y, z, player);
60+
}
61+
62+
@Override
63+
@SideOnly(Side.CLIENT)
64+
public Icon getIcon(int side, int par2) {
65+
return BlockTextureRegistry.instance.getIcon(side,
66+
ClientProxy.MULTICORE_SOLAR_PANEL_TEXTURE);
67+
}
68+
69+
@Override
70+
@SideOnly(Side.CLIENT)
71+
public void registerIcons(IconRegister iconRegister) {
72+
BlockTextureRegistry.instance.registerIcons(iconRegister,
73+
ClientProxy.MULTICORE_SOLAR_PANEL_TEXTURE);
74+
}
75+
76+
@Override
77+
public TileEntity createNewTileEntity(World world) {
78+
return new TileEntityMulticoreSolarPanel();
79+
}
80+
81+
}

makmods/levelstorage/init/ModTileEntities.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import makmods.levelstorage.tileentity.TileEntityAdvancedMiner;
77
import makmods.levelstorage.tileentity.TileEntityMassInfuser;
88
import makmods.levelstorage.tileentity.TileEntityMolecularHeater;
9+
import makmods.levelstorage.tileentity.TileEntityMulticoreSolarPanel;
910
import makmods.levelstorage.tileentity.TileEntitySuperconductorCable;
1011
import makmods.levelstorage.tileentity.TileEntityWirelessConductor;
1112
import makmods.levelstorage.tileentity.TileEntityWirelessPowerSynchronizer;
@@ -42,6 +43,7 @@ public class ModTileEntities {
4243
tileEntities.put(TileEntityMassInfuser.class, "tileMassInfuser");
4344
tileEntities.put(TileEntityAdvancedMiner.class, "tileAdvMiner");
4445
tileEntities.put(TileEntityMolecularHeater.class, "tileMolHeater");
46+
tileEntities.put(TileEntityMulticoreSolarPanel.class, "tileMulticoreSolarPanel");
4547
}
4648

4749
private ModTileEntities() {

0 commit comments

Comments
 (0)