Begin code cleanup for generics, types, warnings, nulls, and spelling

This commit is contained in:
mezz committed 2016-02-25 19:11:29 -08:00
1 parent c9b2f7bd3e
commit 406392e7f7
98 files changed
+472 -314

No files matched your search

@@ -10,12 +10,12 @@
******************************************************************************/
package forestry.apiculture.blocks;
import com.google.common.collect.Maps;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import com.google.common.collect.Maps;
import net.minecraft.block.Block;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
@@ -31,8 +31,10 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.IStringSerializable;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.Tabs;
@@ -274,7 +276,6 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister
String s = String.format("%s:%s",
Block.blockRegistry.getNameForObject(state.getBlock()).getResourceDomain(),
"apiculture/alveary_" + TYPE.getName((Enum) linkedhashmap.remove(TYPE)));
;
return new ModelResourceLocation(s, this.getPropertyString(linkedhashmap));
}