mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-20 03:59:36 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
c312069d28
commit
6bdb2c0b96
100 files changed
+3171
-3401
No files matched your search
@@ -1,10 +1,5 @@
|
||||
package emt.block;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileEntityEMT;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -15,6 +10,12 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import emt.EMT;
|
||||
import emt.tile.TileEntityEMT;
|
||||
|
||||
public abstract class BlockBaseContainer extends BlockContainer {
|
||||
|
||||
public int instance;
|
||||
@@ -27,18 +28,13 @@ public abstract class BlockBaseContainer extends BlockContainer {
|
||||
this(unlocName, material, soundType, 1, hardness);
|
||||
}
|
||||
|
||||
public BlockBaseContainer(
|
||||
String unlocName, Material material, SoundType soundType, int countOfMetas, float hardness) {
|
||||
public BlockBaseContainer(String unlocName, Material material, SoundType soundType, int countOfMetas,
|
||||
float hardness) {
|
||||
this(unlocName, material, soundType, countOfMetas, 0, hardness);
|
||||
}
|
||||
|
||||
public BlockBaseContainer(
|
||||
String unlocName,
|
||||
Material material,
|
||||
SoundType soundType,
|
||||
int countOfMetas,
|
||||
int curInstance,
|
||||
float hardness) {
|
||||
public BlockBaseContainer(String unlocName, Material material, SoundType soundType, int countOfMetas,
|
||||
int curInstance, float hardness) {
|
||||
super(material);
|
||||
this.setBlockName(EMT.MOD_ID + "." + unlocName);
|
||||
this.setCreativeTab(EMT.TAB);
|
||||
@@ -154,6 +150,7 @@ public abstract class BlockBaseContainer extends BlockContainer {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static class IconSet {
|
||||
|
||||
public IIcon top;
|
||||
public IIcon bottom;
|
||||
public IIcon side;
|
||||
|
||||
Reference in new issue
Block a user