Fix some issues with the solar panels

This commit is contained in:
modmuss50 2017-10-09 11:48:13 +01:00 committed by drcrazy
parent 3fe609e207
commit 0aa8974035
4 changed files with 62 additions and 36 deletions

View file

@ -24,8 +24,6 @@
package techreborn.blocks.generator.solarpanel;
import java.util.List;
import com.google.common.collect.Lists;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@ -47,11 +45,12 @@ import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseTileBlock;
import reborncore.common.util.ArrayUtils;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileSolarPanel;
import java.util.List;
/**
* Created by modmuss50 on 25/02/2016.
*/
@ -76,6 +75,7 @@ public class BlockSolarPanel extends BaseTileBlock {
public int getMetaFromState(IBlockState state) {
return state.getValue(TYPE).ordinal();
}
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, new IProperty[]{TYPE});
}
@ -87,7 +87,7 @@ public class BlockSolarPanel extends BaseTileBlock {
@Override
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileSolarPanel();
return new TileSolarPanel(getStateFromMeta(meta).getValue(TYPE));
}
@Override
@ -109,7 +109,5 @@ public class BlockSolarPanel extends BaseTileBlock {
for (EnumPanelType panelType : EnumPanelType.values()) {
list.add(new ItemStack(this, 1, panelType.ordinal()));
}
}
}

View file

@ -6,9 +6,9 @@ import reborncore.api.power.EnumPowerTier;
public enum EnumPanelType implements IStringSerializable {
Basic("basic", 1, 0, EnumPowerTier.MICRO),
Hybrid("hybrid", 16, 0, EnumPowerTier.LOW),
Advanced("advanced", 64, 6, EnumPowerTier.MEDIUM),
Ultimate("ultimate", 256, 26, EnumPowerTier.HIGH),
Quantum("quantum", 1024, 102, EnumPowerTier.EXTREME);
Advanced("advanced", 64, 2, EnumPowerTier.MEDIUM),
Ultimate("ultimate", 256, 16, EnumPowerTier.HIGH),
Quantum("quantum", 1024, 64, EnumPowerTier.EXTREME);
private int ID;
private String friendlyName;