Update forge

This commit is contained in:
Vincent Lee committed 2016-04-03 18:47:31 -05:00
1 parent 5f3172bd5d
commit 69db133091
197 files changed
+524 -830

No files matched your search

@@ -947,7 +947,7 @@ public final class ModelHandler {
}
private static void registerItemModel(Item i,int meta) {
ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i);
ResourceLocation loc = i.getRegistryName();
ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory"));
}
@@ -136,7 +136,7 @@ public final class MultiblockRenderHandler {
if(!didAny) {
setMultiblock(null);
player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setChatStyle(new Style().setColor(TextFormatting.GREEN)));
player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setStyle(new Style().setColor(TextFormatting.GREEN)));
}
}
}
@@ -214,7 +214,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
tutorial.poll();
positionTutorialArrow();
if(tutorial.isEmpty()) {
mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new Style().setColor(TextFormatting.RED)));
mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setStyle(new Style().setColor(TextFormatting.RED)));
hasTutorialArrow = false;
}
}
@@ -87,14 +87,14 @@ public class Botania {
EntityPlayer player = evt.player;
ITextComponent message = new TextComponentTranslation("botaniamisc.unofficial.nag");
message.setChatStyle(new Style().setColor(TextFormatting.RED));
message.setStyle(new Style().setColor(TextFormatting.RED));
ITextComponent message2 = new TextComponentTranslation("botaniamisc.unofficial.report");
message2.setChatStyle(new Style().setColor(TextFormatting.YELLOW));
message2.setStyle(new Style().setColor(TextFormatting.YELLOW));
ITextComponent url = new TextComponentString("https://github.com/williewillus/Botania/issues");
url.getChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues"));
url.getChatStyle().setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK")));
url.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/williewillus/Botania/issues"));
url.getStyle().setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponentString("CLICK")));
player.addChatComponentMessage(message);
@@ -34,10 +34,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable {
public BlockAlfPortal() {
super(Material.wood);
super(Material.wood, LibBlockNames.ALF_PORTAL);
setHardness(10F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.ALF_PORTAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF));
}
@@ -44,10 +44,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockAltGrass extends BlockMod implements ILexiconable {
public BlockAltGrass() {
super(Material.grass);
super(Material.grass, LibBlockNames.ALT_GRASS);
setHardness(0.6F);
setSoundType(SoundType.PLANT);
setUnlocalizedName(LibBlockNames.ALT_GRASS);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY));
setTickRandomly(true);
}
@@ -73,14 +72,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -61,11 +61,9 @@ public class BlockAltar extends BlockMod implements ILexiconable {
private final Random random = new Random();
protected BlockAltar() {
super(Material.rock);
super(Material.rock, LibBlockNames.ALTAR);
setHardness(3.5F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.ALTAR);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT)
);
@@ -113,14 +111,8 @@ public class BlockAltar extends BlockMod implements ILexiconable {
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -46,10 +46,9 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
private final Random random = new Random();
protected BlockAvatar() {
super(Material.wood);
super(Material.wood, LibBlockNames.AVATAR);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.AVATAR);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH));
}
@@ -36,8 +36,7 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockBifrost extends BlockMod implements ILexiconable {
public BlockBifrost() {
super(Material.glass);
setUnlocalizedName(LibBlockNames.BIFROST);
super(Material.glass, LibBlockNames.BIFROST);
setLightOpacity(0);
setLightLevel(1F);
setBlockUnbreakable();
@@ -32,8 +32,7 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockBifrostPerm extends BlockMod implements ILexiconable {
public BlockBifrostPerm() {
super(Material.glass);
setUnlocalizedName(LibBlockNames.BIFROST_PERM);
super(Material.glass, LibBlockNames.BIFROST_PERM);
setLightOpacity(0);
setHardness(0.3F);
setLightLevel(1F);
@@ -31,8 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockCacophonium extends BlockMod {
protected BlockCacophonium() {
super(Material.wood);
setUnlocalizedName(LibBlockNames.CACOPHONIUM);
super(Material.wood, LibBlockNames.CACOPHONIUM);
setHardness(0.8F);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@@ -30,8 +30,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public abstract class BlockCamo extends BlockMod {
protected BlockCamo(Material par2Material) {
super(par2Material);
protected BlockCamo(Material par2Material, String name) {
super(par2Material, name);
}
public static boolean isValidBlock(IBlockState state) {
@@ -31,8 +31,7 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockCell extends BlockMod implements ILexiconable {
public BlockCell() {
super(Material.gourd);
setUnlocalizedName(LibBlockNames.CELL_BLOCK);
super(Material.gourd, LibBlockNames.CELL_BLOCK);
setSoundType(SoundType.CLOTH);
}
@@ -38,11 +38,10 @@ public class BlockCocoon extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 0.125, 0.875, 0.125);
protected BlockCocoon() {
super(Material.cloth);
super(Material.cloth, LibBlockNames.COCOON);
setHardness(3.0F);
setResistance(50.0F);
setSoundType(SoundType.CLOTH);
setUnlocalizedName(LibBlockNames.COCOON);
}
@Override
@@ -17,8 +17,8 @@ public class BlockDreamwood extends BlockLivingwood {
}
@Override
void register(String name) {
GameRegistry.registerBlock(this, ItemBlockDreamwood.class, name);
public void registerItemForm() {
GameRegistry.register(new ItemBlockDreamwood(this), getRegistryName());
}
@Override
@@ -33,10 +33,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockEnchantedSoil extends BlockMod implements ILexiconable {
public BlockEnchantedSoil() {
super(Material.grass);
super(Material.grass, LibBlockNames.ENCHANTED_SOIL);
setHardness(0.6F);
setSoundType(SoundType.PLANT);
setUnlocalizedName(LibBlockNames.ENCHANTED_SOIL);
}
@Override
@@ -31,11 +31,10 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockEnderEye extends BlockMod implements ILexiconable {
protected BlockEnderEye() {
super(Material.iron);
super(Material.iron, LibBlockNames.ENDER_EYE_BLOCK);
setHardness(3F);
setResistance(10F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.ENDER_EYE_BLOCK);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@@ -36,8 +36,7 @@ public class BlockFakeAir extends BlockMod {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
public BlockFakeAir() {
super(Material.air);
setUnlocalizedName(LibBlockNames.FAKE_AIR);
super(Material.air, LibBlockNames.FAKE_AIR);
setTickRandomly(true);
}
@@ -52,15 +51,7 @@ public class BlockFakeAir extends BlockMod {
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, null, par1Str);
return super.setUnlocalizedName(par1Str);
}
public void registerItemForm() {}
@Override
public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) {
@@ -38,8 +38,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned";
public BlockFelPumpkin() {
super(Material.gourd);
setUnlocalizedName(LibBlockNames.FEL_PUMPKIN);
super(Material.gourd, LibBlockNames.FEL_PUMPKIN);
setHardness(1F);
setSoundType(SoundType.WOOD);
MinecraftForge.EVENT_BUS.register(this);
@@ -192,8 +192,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
}
@Override
protected void register(String name) {
GameRegistry.registerBlock(this, ItemBlockFloatingSpecialFlower.class, name);
public void registerItemForm() {
GameRegistry.register(new ItemBlockFloatingSpecialFlower(this), getRegistryName());
}
@Override
@@ -31,11 +31,10 @@ public class BlockForestEye extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75);
public BlockForestEye() {
super(Material.iron);
super(Material.iron, LibBlockNames.FOREST_EYE);
setHardness(5.0F);
setResistance(10.0F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.FOREST_EYE);
}
@Override
@@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.tileentity.TileEntitySkull;
import net.minecraft.util.math.RayTraceResult;
@@ -32,20 +33,16 @@ import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.common.lib.LibMisc;
public class BlockGaiaHead extends BlockSkull {
public BlockGaiaHead() {
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD));
setUnlocalizedName(LibBlockNames.GAIA_HEAD);
setHardness(1.0F);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, null, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(ModItems.gaiaHead);
@@ -18,6 +18,7 @@ import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
@@ -32,6 +33,7 @@ import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockGhostRail extends BlockRailBase implements ILexiconable {
@@ -40,8 +42,10 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable {
public BlockGhostRail() {
super(true);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
MinecraftForge.EVENT_BUS.register(this);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL));
GameRegistry.register(new ItemBlockMod(this), getRegistryName());
setUnlocalizedName(LibBlockNames.GHOST_RAIL);
MinecraftForge.EVENT_BUS.register(this);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH));
}
@@ -60,12 +64,6 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.byMetadata(meta));
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@SubscribeEvent
public void onMinecartUpdate(MinecartUpdateEvent event) {
BlockPos entPos = new BlockPos(event.getEntity());
@@ -52,8 +52,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
private final Random random = new Random();
protected BlockHourglass() {
super(Material.iron);
setUnlocalizedName(LibBlockNames.HOURGLASS);
super(Material.iron, LibBlockNames.HOURGLASS);
setHardness(2.0F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
@@ -39,8 +39,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.125, 0, 0.375, 0.875, 1/16.0, 0.625);
protected BlockIncensePlate() {
super(Material.wood);
setUnlocalizedName(LibBlockNames.INCENSE_PLATE);
super(Material.wood, LibBlockNames.INCENSE_PLATE);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
@@ -42,10 +42,9 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1);
public BlockLightLauncher() {
super(Material.wood);
super(Material.wood, LibBlockNames.LIGHT_LAUNCHER);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.LIGHT_LAUNCHER);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@@ -96,7 +95,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
world.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false), 4);
}
public void pickUpEntities(World world, BlockPos pos) {
private void pickUpEntities(World world, BlockPos pos) {
List<TileLightRelay> relays = new ArrayList<>();
for(EnumFacing dir : EnumFacing.HORIZONTALS) {
TileEntity tile = world.getTileEntity(pos.offset(dir));
@@ -45,9 +45,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
private static final AxisAlignedBB AABB = new AxisAlignedBB(5.0/16, 5.0/16, 5.0/16, 11.0/16, 11.0/16, 11.0/16);
protected BlockLightRelay() {
super(Material.glass);
float f = 5F / 16F;
setUnlocalizedName(LibBlockNames.LIGHT_RELAY);
super(Material.glass, LibBlockNames.LIGHT_RELAY);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false));
}
@@ -80,13 +78,8 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
}
@Override
public Block setUnlocalizedName(String par1Str) {
register(par1Str);
return super.setUnlocalizedName(par1Str);
}
void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -100,11 +93,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
return state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DEFAULT ? 0 : 1;
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) {
return false;
@@ -36,11 +36,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockLivingrock extends BlockMod implements ILexiconable {
public BlockLivingrock() {
super(Material.rock);
super(Material.rock, LibBlockNames.LIVING_ROCK);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.LIVING_ROCK);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT));
}
@@ -62,20 +61,14 @@ public class BlockLivingrock extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.values()[meta]);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -41,10 +41,9 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
}
public BlockLivingwood(String name) {
super(Material.wood);
super(Material.wood, name);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(name);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT));
}
@@ -66,24 +65,14 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.values()[meta]);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
register(par1Str);
return super.setUnlocalizedName(par1Str);
}
void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -32,10 +32,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconable, ICraftAchievement {
public BlockManaBomb() {
super(Material.wood);
super(Material.wood, LibBlockNames.MANA_BOMB);
setHardness(12.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.MANA_BOMB);
}
@Override
@@ -12,31 +12,29 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockElven;
import vazkii.botania.common.item.block.ItemBlockMod;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockMod extends Block {
public int originalLight;
protected int originalLight;
public BlockMod(Material par2Material) {
public BlockMod(Material par2Material, String name) {
super(par2Material);
setUnlocalizedName(name);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
registerItemForm();
if(registerInCreative())
setCreativeTab(BotaniaCreativeTab.INSTANCE);
}
@Override
public Block setUnlocalizedName(String par1Str) {
if(shouldRegisterInNameSet())
GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemBlockMod.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
protected boolean shouldRegisterInNameSet() {
return true;
public void registerItemForm() {
GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName());
}
@Override
@@ -28,6 +28,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.StatList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.RayTraceResult;
@@ -43,6 +44,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import java.util.ArrayList;
import java.util.List;
@@ -59,7 +61,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
this.setHardness(0.0F);
this.setSoundType(SoundType.PLANT);
offset = second ? 8 : 0;
setUnlocalizedName(LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1));
String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
setUnlocalizedName(name);
setHardness(0F);
setTickRandomly(false);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
@@ -74,13 +79,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
@Override
public abstract IBlockState getStateFromMeta(int meta);
@Override
public Block setUnlocalizedName(String par1Str) {
if(!par1Str.equals("doublePlant"))
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return null;
@@ -27,6 +27,7 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@@ -43,6 +44,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable {
@@ -55,8 +57,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
}
protected BlockModFlower(String name) {
super();
setUnlocalizedName(name);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
registerItemForm();
setHardness(0F);
setSoundType(SoundType.PLANT);
setTickRandomly(false);
@@ -64,6 +67,10 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY));
}
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
return AABB;
@@ -107,12 +114,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
par3List.add(new ItemStack(par1, 1, i));
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
@@ -55,10 +55,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
Random random;
public BlockOpenCrate() {
super(Material.wood);
super(Material.wood, LibBlockNames.OPEN_CRATE);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.OPEN_CRATE);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)
.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE));
@@ -96,14 +95,8 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -63,8 +63,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
private static final TObjectIntHashMap<DimWithPos> coordsToCheck = new TObjectIntHashMap<>(10, 0.5F, -1);
public BlockPistonRelay() {
super(Material.gourd);
setUnlocalizedName(LibBlockNames.PISTON_RELAY);
super(Material.gourd, LibBlockNames.PISTON_RELAY);
setHardness(2F);
setResistance(10F);
setSoundType(SoundType.METAL);
@@ -48,11 +48,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable {
public BlockPlatform() {
super(Material.wood);
super(Material.wood, LibBlockNames.PLATFORM);
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.PLATFORM);
setDefaultState(((IExtendedBlockState) blockState.getBaseState())
.withProperty(BotaniaStateProps.HELD_STATE, null)
.withProperty(BotaniaStateProps.HELD_WORLD, null)
@@ -97,10 +96,6 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable
return true;
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
@@ -108,9 +103,8 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -46,10 +46,9 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 21.0/16, 0.875);
public BlockPylon() {
super(Material.iron);
super(Material.iron, LibBlockNames.PYLON);
setHardness(5.5F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.PYLON);
setLightLevel(0.5F);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA));
@@ -79,14 +78,8 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -29,10 +29,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockRoot extends BlockMod implements ILexiconable {
public BlockRoot() {
super(Material.plants);
super(Material.plants, LibBlockNames.ROOT);
setHardness(1.2F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.ROOT);
}
@@ -19,6 +19,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -29,6 +30,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockSolidVines extends BlockVine implements ILexiconable {
@@ -38,6 +40,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable {
protected static final AxisAlignedBB LADDER_NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D);
public BlockSolidVines() {
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE));
setUnlocalizedName(LibBlockNames.SOLID_VINE);
setHardness(0.5F);
setSoundType(SoundType.PLANT);
@@ -64,12 +67,6 @@ public class BlockSolidVines extends BlockVine implements ILexiconable {
// NO-OP
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, null, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) {
return false;
@@ -44,11 +44,10 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
private final Random random = new Random();
public BlockSparkChanger() {
super(Material.rock);
super(Material.rock, LibBlockNames.SPARK_CHANGER);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.SPARK_CHANGER);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true));
}
@@ -34,6 +34,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
@@ -63,6 +64,7 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD {
@@ -120,6 +122,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
protected BlockSpecialFlower() {
super();
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER));
GameRegistry.register(new ItemBlockSpecialFlower(this), getRegistryName());
setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER);
setHardness(0.1F);
setSoundType(SoundType.PLANT);
@@ -204,12 +208,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
return BlockRenderLayer.CUTOUT;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
for(String s : BotaniaAPI.subtilesForCreativeMenu) {
@@ -36,11 +36,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockStorage extends BlockMod implements ILexiconable {
public BlockStorage() {
super(Material.iron);
super(Material.iron, LibBlockNames.STORAGE);
setHardness(3F);
setResistance(10F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.STORAGE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL));
}
@@ -69,9 +68,8 @@ public class BlockStorage extends BlockMod implements ILexiconable {
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockStorage.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockStorage(this), getRegistryName());
}
@Override
@@ -79,11 +77,6 @@ public class BlockStorage extends BlockMod implements ILexiconable {
return getMetaFromState(state);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beaconPos) {
return true;
@@ -37,9 +37,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75);
public BlockTeruTeruBozu() {
super(Material.cloth);
setUnlocalizedName(LibBlockNames.TERU_TERU_BOZU);
float f = 0.25F;
super(Material.cloth, LibBlockNames.TERU_TERU_BOZU);
}
@Override
@@ -70,15 +68,15 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
return false;
}
public boolean isSunflower(ItemStack stack) {
private boolean isSunflower(ItemStack stack) {
return stack.getItem() == Item.getItemFromBlock(Blocks.double_plant) && stack.getItemDamage() == 0;
}
public boolean isBlueOrchid(ItemStack stack) {
private boolean isBlueOrchid(ItemStack stack) {
return stack.getItem() == Item.getItemFromBlock(Blocks.red_flower) && stack.getItemDamage() == 1;
}
public boolean removeRain(World world) {
private boolean removeRain(World world) {
if(world.isRaining()) {
world.getWorldInfo().setRaining(false);
return true;
@@ -86,7 +84,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable {
return false;
}
public boolean startRain(World world) {
private boolean startRain(World world) {
if(!world.isRaining()) {
if(world.rand.nextInt(10) == 0)
world.getWorldInfo().setRaining(true);
@@ -31,12 +31,10 @@ public class BlockTinyPlanet extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16);
protected BlockTinyPlanet() {
super(Material.rock);
super(Material.rock, LibBlockNames.TINY_PLANET);
setHardness(20F);
setResistance(100F);
setSoundType(SoundType.STONE);
float size = 3F / 16F;
setUnlocalizedName(LibBlockNames.TINY_PLANET);
}
@Override
@@ -29,13 +29,10 @@ import vazkii.botania.common.block.tile.TileSimpleInventory;
public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchievement {
Random random;
private final Random random = new Random();
public BlockCorporeaBase(Material material, String name) {
super(material);
setUnlocalizedName(name);
random = new Random();
super(material, name);
}
@Override
@@ -35,10 +35,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICraftAchievement {
public BlockCorporeaRetainer() {
super(Material.iron);
super(Material.iron, LibBlockNames.CORPOREA_RETAINER);
setHardness(5.5F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.CORPOREA_RETAINER);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@@ -37,11 +37,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class Block18Stone extends BlockMod implements ILexiconable {
public Block18Stone() {
super(Material.rock);
super(Material.rock, LibBlockNames.STONE);
setHardness(1.5F);
setResistance(10F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FUTURESTONE_VARIANT, FutureStoneVariant.ANDESITE));
}
@@ -69,20 +68,14 @@ public class Block18Stone extends BlockMod implements ILexiconable {
list.add(new ItemStack(item, 1, i));
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -31,12 +31,11 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler {
public BlockBlaze() {
super(Material.iron);
super(Material.iron, LibBlockNames.BLAZE_BLOCK);
setHardness(3F);
setResistance(10F);
setSoundType(SoundType.METAL);
setLightLevel(1F);
setUnlocalizedName(LibBlockNames.BLAZE_BLOCK);
GameRegistry.registerFuelHandler(this);
}
@@ -37,11 +37,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockCustomBrick extends BlockMod implements ILexiconable {
public BlockCustomBrick() {
super(Material.rock);
super(Material.rock, LibBlockNames.CUSTOM_BRICK);
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.CUSTOM_BRICK);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK));
}
@@ -63,20 +62,14 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.values()[meta]);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -46,11 +46,10 @@ public class BlockDirtPath extends BlockMod implements ILexiconable {
private static final AttributeModifier speedBoost = new AttributeModifier(speedBoostUuid, "Trodden dirt speed boost", 0.55, 2).setSaved(false);
public BlockDirtPath() {
super(Material.ground);
super(Material.ground, LibBlockNames.DIRT_PATH);
setLightOpacity(255);
setHardness(0.6F);
setSoundType(SoundType.GROUND);
setUnlocalizedName(LibBlockNames.DIRT_PATH);
useNeighborBrightness = true;
MinecraftForge.EVENT_BUS.register(this);
}
@@ -37,11 +37,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockEndStoneBrick extends BlockMod implements ILexiconable {
public BlockEndStoneBrick() {
super(Material.rock);
super(Material.rock, LibBlockNames.END_STONE_BRICK);
setHardness(1.5F);
setResistance(10F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.END_STONE_BRICK);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENDBRICK_VARIANT, EndBrickVariant.END_STONE_BRICKS));
}
@@ -69,20 +68,14 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable {
list.add(new ItemStack(item, 1, i));
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -74,8 +74,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu
}
public BlockFloatingFlower(String name) {
super(Material.ground);
setUnlocalizedName(name);
super(Material.ground, name);
setHardness(0.5F);
setSoundType(SoundType.GROUND);
setLightLevel(1F);
@@ -166,18 +165,8 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
register(par1Str);
return super.setUnlocalizedName(par1Str);
}
protected void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -42,12 +42,10 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16);
public BlockManaBeacon() {
super(Material.iron);
super(Material.iron, LibBlockNames.MANA_BEACON);
setHardness(5.0F);
setResistance(10.0F);
setSoundType(SoundType.METAL);
float size = 3F / 16F;
setUnlocalizedName(LibBlockNames.MANA_BEACON);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@@ -81,14 +79,8 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable {
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
}
@Override
@@ -43,9 +43,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75);
public BlockManaFlame() {
super(Material.cloth);
setUnlocalizedName(LibBlockNames.MANA_FLAME);
float f = 0.25F;
super(Material.cloth, LibBlockNames.MANA_FLAME);
setSoundType(SoundType.CLOTH);
setLightLevel(1F);
}
@@ -34,11 +34,10 @@ public class BlockManaGlass extends BlockMod implements ILexiconable {
}
public BlockManaGlass(String name) {
super(Material.glass);
super(Material.glass, name);
setHardness(0.3F);
setSoundType(SoundType.GLASS);
setLightLevel(1.0F);
setUnlocalizedName(name);
}
@Override
@@ -25,6 +25,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
@@ -44,14 +45,17 @@ import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true)
public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8);
public int originalLight;
private int originalLight;
public BlockModMushroom() {
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM));
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
setUnlocalizedName(LibBlockNames.MUSHROOM);
setLightLevel(0.2F);
setHardness(0F);
@@ -106,12 +110,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis
par3List.add(new ItemStack(par1, 1, i));
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);
@@ -36,11 +36,10 @@ public class BlockPavement extends BlockMod {
public static final int TYPES = 6;
public BlockPavement() {
super(Material.rock);
super(Material.rock, LibBlockNames.PAVEMENT);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.PAVEMENT);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE));
}
@@ -81,20 +80,14 @@ public class BlockPavement extends BlockMod {
return getDefaultState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, color);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -37,10 +37,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockPetalBlock extends BlockMod implements ILexiconable {
public BlockPetalBlock() {
super(Material.plants);
super(Material.plants, LibBlockNames.PETAL_BLOCK);
setHardness(0.4F);
setSoundType(SoundType.PLANT);
setUnlocalizedName(LibBlockNames.PETAL_BLOCK);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@@ -69,14 +68,8 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
}
@Override
@@ -39,11 +39,10 @@ public class BlockPrismarine extends BlockMod implements ILexiconable {
private static final int TYPES = 3;
public BlockPrismarine() {
super(Material.rock);
super(Material.rock, LibBlockNames.PRISMARINE);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.PRISMARINE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.PRISMARINE));
}
@@ -65,20 +64,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.PRISMARINE_VARIANT, PrismarineVariant.values()[meta]);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -19,6 +19,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
@@ -30,6 +31,7 @@ import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockReeds extends BlockRotatedPillar implements ILexiconable {
@@ -37,6 +39,8 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable {
super(Material.wood);
setHardness(1.0F);
setSoundType(SoundType.WOOD);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.REED_BLOCK));
GameRegistry.register(new ItemBlockMod(this), getRegistryName());
setUnlocalizedName(LibBlockNames.REED_BLOCK);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.AXIS_FACING, EnumFacing.Axis.Y));
@@ -74,12 +78,6 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable {
return getStateFromMeta(meta).withProperty(BotaniaStateProps.AXIS_FACING, facing.getAxis());
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
@@ -28,16 +28,15 @@ import net.minecraftforge.fml.common.Optional;
public class BlockSeaLamp extends BlockMod implements ILexiconable {
private int coloredLight = -1;
public BlockSeaLamp() {
super(Material.glass);
super(Material.glass, LibBlockNames.SEA_LAMP);
setHardness(0.3F);
setSoundType(SoundType.GLASS);
setLightLevel(1.0F);
setUnlocalizedName(LibBlockNames.SEA_LAMP);
}
int coloredLight = -1;
@Override
@Optional.Method(modid = "easycoloredlights")
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) {
@@ -25,11 +25,10 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockShimmerrock extends BlockMod implements ILexiconable {
public BlockShimmerrock() {
super(Material.rock);
super(Material.rock, LibBlockNames.SHIMMERROCK);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.SHIMMERROCK);
}
@Override
@@ -25,10 +25,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable {
public BlockShimmerwoodPlanks() {
super(Material.wood);
super(Material.wood, LibBlockNames.SHIMMERWOOD_PLANKS);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.SHIMMERWOOD_PLANKS);
}
@Override
@@ -35,11 +35,10 @@ public class BlockStarfield extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1);
public BlockStarfield() {
super(Material.iron);
super(Material.iron, LibBlockNames.STARFIELD);
setHardness(5F);
setResistance(2000F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.STARFIELD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@@ -25,10 +25,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockThatch extends BlockMod implements ILexiconable {
public BlockThatch() {
super(Material.grass);
super(Material.grass, LibBlockNames.THATCH);
setHardness(1.0F);
setSoundType(SoundType.PLANT);
setUnlocalizedName(LibBlockNames.THATCH);
}
@Override
@@ -45,10 +45,8 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0, 0.375, 0.625, 0.375, 0.625);
public BlockTinyPotato() {
super(Material.cloth);
super(Material.cloth, LibBlockNames.TINY_POTATO);
setHardness(0.25F);
setUnlocalizedName(LibBlockNames.TINY_POTATO);
float f = 1F / 16F * 6F;
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)
);
@@ -91,16 +89,9 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName());
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) {
TileEntity tile = par1World.getTileEntity(pos);
@@ -47,11 +47,10 @@ public class BlockUnstable extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75);
public BlockUnstable() {
super(Material.iron);
super(Material.iron, LibBlockNames.UNSTABLE_BLOCK);
setHardness(5.0F);
setResistance(10.0F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@@ -85,14 +84,8 @@ public class BlockUnstable extends BlockMod implements ILexiconable {
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
}
@Override
@@ -33,11 +33,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockBiomeStone extends BlockMod implements ILexiconable {
public BlockBiomeStone(String name) {
super(Material.rock);
super(Material.rock, name);
setHardness(1.5F);
setResistance(10F);
setSoundType(SoundType.STONE);
setUnlocalizedName(name);
}
@Override
@@ -46,20 +45,14 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable {
list.add(new ItemStack(item, 1, i));
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -15,6 +15,7 @@ import net.minecraft.block.BlockPane;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
@@ -22,15 +23,20 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockMod;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockModPane extends BlockPane {
Block source;
private final Block source;
public BlockModPane(Block source) {
super(Material.glass, false);
this.source = source;
setUnlocalizedName(source.getUnlocalizedName().replaceAll("tile.", "") + "Pane");
// Backward compat don't kill me
String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane";
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
GameRegistry.register(new ItemBlockMod(this), getRegistryName());
setUnlocalizedName(name);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
setHardness(0.3F);
setSoundType(SoundType.GLASS);
@@ -38,12 +44,6 @@ public class BlockModPane extends BlockPane {
useNeighborBrightness = true;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess iblockaccess, BlockPos pos, EnumFacing side) {
return false;
@@ -41,11 +41,10 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
public final String type;
public BlockSpecialQuartz(String type) {
super(Material.rock);
super(Material.rock, "quartzType" + type);
this.type = type;
setHardness(0.8F);
setResistance(10F);
setUnlocalizedName("quartzType" + type);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL));
}
@@ -68,14 +67,8 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
public void registerItemForm() {
GameRegistry.register(new ItemBlockSpecialQuartz(this), getRegistryName());
}
public String[] getNames() {
@@ -1,10 +1,10 @@
package vazkii.botania.common.block.decor.stairs;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
@@ -13,22 +13,19 @@ import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockModStairs extends BlockStairs implements ILexiconable {
public BlockModStairs(IBlockState state, String name) {
super(state);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
GameRegistry.register(new ItemBlockMod(this), getRegistryName());
setUnlocalizedName(name);
setCreativeTab(BotaniaCreativeTab.INSTANCE);
useNeighborBrightness = true;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
@@ -16,6 +16,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -25,6 +26,7 @@ import vazkii.botania.api.state.enums.FutureStoneVariant;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
@@ -57,7 +59,8 @@ public class Block18StoneWall extends BlockModWall {
@Override
public void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -16,6 +16,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -25,6 +26,7 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
@@ -57,7 +59,8 @@ public class BlockBiomeStoneWall extends BlockModWall {
@Override
public void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@@ -28,15 +29,19 @@ import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public abstract class BlockModWall extends BlockWall implements ILexiconable {
Block block;
private final Block block;
public BlockModWall(Block block, int meta) {
super(block);
this.block = block;
setUnlocalizedName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall");
// For backward compat don't kill me
String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall";
register(name);
setUnlocalizedName(name);
setDefaultState(blockState.getBaseState()
.withProperty(UP, false)
.withProperty(NORTH, false)
@@ -77,14 +82,9 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable {
return true;
}
@Override
public Block setUnlocalizedName(String par1Str) {
register(par1Str);
return super.setUnlocalizedName(par1Str);
}
public void register(String name) {
GameRegistry.registerBlock(this, ItemBlockMod.class, name);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
GameRegistry.register(new ItemBlockMod(this), getRegistryName());
}
@Override
@@ -34,11 +34,10 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo
}
public BlockAlchemyCatalyst(String name) {
super(Material.rock);
super(Material.rock, name);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(name);
}
@Override
@@ -39,12 +39,9 @@ public class BlockBellows extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1875, 0, 0.1875, 1-0.1875, 10.0 / 16, 1-0.1875);
public BlockBellows() {
super(Material.wood);
super(Material.wood, LibBlockNames.BELLOWS);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.BELLOWS);
float f = (1F - 10 / 16F) / 2F;
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@@ -47,9 +47,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
private final Random random = new Random();
public BlockBrewery() {
super(Material.rock);
float f = 6F / 16F;
setUnlocalizedName(LibBlockNames.BREWERY);
super(Material.rock, LibBlockNames.BREWERY);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
@@ -28,11 +28,10 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockDistributor extends BlockMod implements ILexiconable {
public BlockDistributor() {
super(Material.rock);
super(Material.rock, LibBlockNames.DISTRIBUTOR);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.DISTRIBUTOR);
}
@Override
@@ -44,17 +44,15 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD {
Random random;
private final Random random = new Random();
public BlockEnchanter() {
super(Material.rock);
super(Material.rock, LibBlockNames.ENCHANTER);
setHardness(3.0F);
setResistance(5.0F);
setLightLevel(1.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.ENCHANTER);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X));
random = new Random();
}
@Override
@@ -53,10 +53,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
private static final AxisAlignedBB AABB = new AxisAlignedBB(3/16.0, 0, 3/16.0, 13/16.0, 14/16.0, 13/16.0);
public BlockForestDrum() {
super(Material.wood);
super(Material.wood, LibBlockNames.FOREST_DRUM);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.FOREST_DRUM);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD));
}
@@ -84,14 +83,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -38,11 +38,10 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockManaDetector extends BlockMod implements ILexiconable {
public BlockManaDetector() {
super(Material.rock);
super(Material.rock, LibBlockNames.MANA_DETECTOR);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.MANA_DETECTOR);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@@ -33,11 +33,10 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider {
public BlockManaVoid() {
super(Material.rock);
super(Material.rock, LibBlockNames.MANA_VOID);
setHardness(2.0F);
setResistance(2000F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.MANA_VOID);
}
@Override
@@ -56,17 +56,14 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1);
boolean lastFragile = false;
private boolean lastFragile = false;
public BlockPool() {
super(Material.rock);
super(Material.rock, LibBlockNames.POOL);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.POOL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT));
BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
}
@@ -94,14 +91,8 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockPool.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockPool(this), getRegistryName());
}
@Override
@@ -50,12 +50,10 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
private final Random random = new Random();
public BlockPrism() {
super(Material.glass);
super(Material.glass, LibBlockNames.PRISM);
setHardness(0.3F);
setSoundType(SoundType.GLASS);
setLightLevel(1.0F);
setUnlocalizedName(LibBlockNames.PRISM);
float f = 0.25F;
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.POWERED, false)
.withProperty(BotaniaStateProps.HAS_LENS, false)
@@ -41,11 +41,10 @@ public class BlockPump extends BlockMod implements ILexiconable {
private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.25, 0, 0, 0.75, 0.5, 1);
public BlockPump() {
super(Material.rock);
super(Material.rock, LibBlockNames.PUMP);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.PUMP);
setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@@ -30,11 +30,10 @@ import net.minecraftforge.fml.common.Optional;
public class BlockRFGenerator extends BlockMod implements ILexiconable {
public BlockRFGenerator() {
super(Material.rock);
super(Material.rock, LibBlockNames.RF_GENERATOR);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.RF_GENERATOR);
}
@Override
@@ -43,11 +43,10 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable
private final Random random = new Random();
public BlockRuneAltar() {
super(Material.rock);
super(Material.rock, LibBlockNames.RUNE_ALTAR);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(LibBlockNames.RUNE_ALTAR);
BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
}
@@ -36,9 +36,8 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 1/16.0, 0.875);
public BlockSpawnerClaw() {
super(Material.iron);
super(Material.iron, LibBlockNames.SPAWNER_CLAW);
setHardness(3.0F);
setUnlocalizedName(LibBlockNames.SPAWNER_CLAW);
}
@Override
@@ -54,15 +54,13 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider {
Random random;
private final Random random = new Random();
public BlockSpreader() {
super(Material.wood);
super(Material.wood, LibBlockNames.SPREADER);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.SPREADER);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA));
random = new Random();
}
@Override
@@ -84,14 +82,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str);
return super.setUnlocalizedName(par1Str);
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
}
@Override
@@ -39,13 +39,10 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1);
public BlockTerraPlate() {
super(Material.iron);
super(Material.iron, LibBlockNames.TERRA_PLATE);
setHardness(3F);
setResistance(10F);
setSoundType(SoundType.METAL);
setUnlocalizedName(LibBlockNames.TERRA_PLATE);
BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
}
@@ -33,10 +33,9 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable {
public BlockTurntable() {
super(Material.wood);
super(Material.wood, LibBlockNames.TURNTABLE);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setUnlocalizedName(LibBlockNames.TURNTABLE);
}
@Override
@@ -31,11 +31,10 @@ import vazkii.botania.common.lexicon.LexiconData;
public abstract class BlockRedString extends BlockMod implements ILexiconable {
public BlockRedString(String name) {
super(Material.rock);
super(Material.rock, name);
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setUnlocalizedName(name);
}
@Override
@@ -199,7 +199,7 @@ public class TileLightRelay extends TileMod implements IWandBindable {
protected void entityInit() {
setSize(0F, 0F);
noClip = true;
dataWatcher.register(EXIT_POS, BlockPos.ORIGIN);
dataManager.register(EXIT_POS, BlockPos.ORIGIN);
}
@Override
@@ -283,11 +283,11 @@ public class TileLightRelay extends TileMod implements IWandBindable {
}
public BlockPos getExitPos() {
return dataWatcher.get(EXIT_POS);
return dataManager.get(EXIT_POS);
}
public void setExit(BlockPos pos) {
dataWatcher.set(EXIT_POS, pos);
dataManager.set(EXIT_POS, pos);
}
}
@@ -268,7 +268,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ
index.doCorporeaRequest(name, count, spark);
event.getPlayer().addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE)));
event.getPlayer().addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE)));
if(CorporeaHelper.lastRequestExtractions >= 50000)
event.getPlayer().addStat(ModAchievements.superCorporeaRequest, 1);
}
@@ -19,6 +19,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.client.lib.LibResources;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.common.lib.LibMisc;
public class PotionMod extends Potion {
@@ -26,7 +27,7 @@ public class PotionMod extends Potion {
public PotionMod(String name, boolean badEffect, int color, int iconIndex) {
super(badEffect, color);
GameData.getPotionRegistry().register(-1, new ResourceLocation("botania", name), this);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
setPotionName("botania.potion." + name);
setIconIndex(iconIndex % 8, iconIndex / 8);
}
@@ -36,13 +36,13 @@ public class CommandDownloadLatest extends CommandBase {
@Override
public void execute(MinecraftServer server, ICommandSender var1, String[] var2) {
if(!ENABLED)
var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setChatStyle(new Style().setColor(TextFormatting.RED)));
var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED)));
else if(var2.length == 1)
if(VersionChecker.downloadedFile)
var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setChatStyle(new Style().setColor(TextFormatting.RED)));
var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setStyle(new Style().setColor(TextFormatting.RED)));
else if(VersionChecker.startedDownload)
var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setChatStyle(new Style().setColor(TextFormatting.RED)));
var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setStyle(new Style().setColor(TextFormatting.RED)));
else new ThreadDownloadMod("Botania " + var2[0] + ".jar");
}
@@ -42,7 +42,7 @@ public class CommandOpen extends CommandBase {
if(stack != null) {
ItemLexicon.setForcedPage(stack, args[0]);
ItemLexicon.setQueueTicks(stack, 5);
} else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setChatStyle(new Style().setColor(TextFormatting.RED)));
} else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setStyle(new Style().setColor(TextFormatting.RED)));
}
}
@@ -395,9 +395,9 @@ public final class ConfigHandler {
if(changes.size() == 0)
return;
player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setChatStyle(new Style().setColor(TextFormatting.GOLD)));
player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setStyle(new Style().setColor(TextFormatting.GOLD)));
for(String change : changes)
player.addChatMessage(new TextComponentString(change).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE)));
player.addChatMessage(new TextComponentString(change).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE)));
}
public void addMappingInt(int version, String key, int val) {
@@ -1,7 +1,9 @@
package vazkii.botania.common.core.handler;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import vazkii.botania.common.lib.LibObfuscation;
@@ -11,52 +13,54 @@ import java.lang.reflect.Method;
public final class ModSounds {
public static void init() {
try {
Method m = ReflectionHelper.findMethod(SoundEvent.class, null, LibObfuscation.REGISTER_SOUND, String.class);
m.invoke(null, "botania:airRod");
m.invoke(null, "botania:agricarnation");
m.invoke(null, "botania:altarCraft");
m.invoke(null, "botania:babylonAttack");
m.invoke(null, "botania:babylonSpawn");
m.invoke(null, "botania:bellows");
m.invoke(null, "botania:bifrostRod");
m.invoke(null, "botania:blackLotus");
m.invoke(null, "botania:dash");
m.invoke(null, "botania:ding");
m.invoke(null, "botania:divaCharm");
m.invoke(null, "botania:divinationRod");
m.invoke(null, "botania:doit");
m.invoke(null, "botania:enchanterBlock");
m.invoke(null, "botania:enchanterEnchant");
m.invoke(null, "botania:endoflame");
m.invoke(null, "botania:equipBauble");
m.invoke(null, "botania:gaiaTrap");
m.invoke(null, "botania:goldenLaurel");
m.invoke(null, "botania:holyCloak");
m.invoke(null, "botania:laputaStart");
m.invoke(null, "botania:lexiconOpen");
m.invoke(null, "botania:lexiconPage");
m.invoke(null, "botania:lightRelay");
m.invoke(null, "botania:manaBlaster");
m.invoke(null, "botania:manaPoolCraft");
m.invoke(null, "botania:missile");
m.invoke(null, "botania:orechid");
m.invoke(null, "botania:potionCreate");
m.invoke(null, "botania:runeAltarCraft");
m.invoke(null, "botania:runeAltarStart");
m.invoke(null, "botania:spreaderFire");
m.invoke(null, "botania:starcaller");
m.invoke(null, "botania:terraBlade");
m.invoke(null, "botania:terraformRod");
m.invoke(null, "botania:terraPickMode");
m.invoke(null, "botania:terrasteelCraft");
m.invoke(null, "botania:thermalily");
m.invoke(null, "botania:unholyCloak");
m.invoke(null, "botania:way");
m.invoke(null, "botania:music.gaia1");
m.invoke(null, "botania:music.gaia2");
} catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
String[] sounds = {
"botania:airRod",
"botania:agricarnation",
"botania:altarCraft",
"botania:babylonAttack",
"botania:babylonSpawn",
"botania:bellows",
"botania:bifrostRod",
"botania:blackLotus",
"botania:dash",
"botania:ding",
"botania:divaCharm",
"botania:divinationRod",
"botania:doit",
"botania:enchanterBlock",
"botania:enchanterEnchant",
"botania:endoflame",
"botania:equipBauble",
"botania:gaiaTrap",
"botania:goldenLaurel",
"botania:holyCloak",
"botania:laputaStart",
"botania:lexiconOpen",
"botania:lexiconPage",
"botania:lightRelay",
"botania:manaBlaster",
"botania:manaPoolCraft",
"botania:missile",
"botania:orechid",
"botania:potionCreate",
"botania:runeAltarCraft",
"botania:runeAltarStart",
"botania:spreaderFire",
"botania:starcaller",
"botania:terraBlade",
"botania:terraformRod",
"botania:terraPickMode",
"botania:terrasteelCraft",
"botania:thermalily",
"botania:unholyCloak",
"botania:way",
"botania:music.gaia1",
"botania:music.gaia2"
};
for (String s : sounds) {
ResourceLocation loc = new ResourceLocation(s);
GameRegistry.register(new SoundEvent(loc), loc);
}
}
@@ -82,7 +82,7 @@ public class ThreadDownloadMod extends Thread {
f.renameTo(f1);
if(Minecraft.getMinecraft().thePlayer != null)
Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setChatStyle(new Style().setColor(TextFormatting.GREEN)));
Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setStyle(new Style().setColor(TextFormatting.GREEN)));
Desktop.getDesktop().open(dir);
VersionChecker.downloadedFile = true;
@@ -101,6 +101,6 @@ public class ThreadDownloadMod extends Thread {
private void sendError() {
if(Minecraft.getMinecraft().thePlayer != null)
Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setChatStyle(new Style().setColor(TextFormatting.RED)));
Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setStyle(new Style().setColor(TextFormatting.RED)));
}
}
Loaded 100 of 197 files, more files were not shown because too many files have changed in this diff. Show more