diff --git a/build.gradle b/build.gradle index e3e40f7c8..dbc016c70 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ minecraft { version = "${config.mc_version}-${config.forge_version}" runDir = "eclipse/assets" - mappings = "snapshot_20160318" + mappings = "snapshot_20160402" //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ replace 'GRADLE:BUILD', config.build_number @@ -68,7 +68,7 @@ dependencies { //compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev" //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev" - deobfCompile "mezz.jei:jei_1.9:3.1.0.170" + deobfCompile "mezz.jei:jei_1.9:3.2.3.176" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/build.properties b/build.properties index 2e46a4718..ef8b75489 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat Mar 12 17:00:04 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.16.0.1811-1.9 +forge_version=12.16.0.1833-1.9 mc_version=1.9 dir_repo=./ build_number=300-ALPHA diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 8475c55cd..a240c8775 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -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")); } diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index c838006e7..d15a9f959 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -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))); } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 8bab0d91d..743fd7d46 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -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; } } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 671935ca4..1035ec2ed 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 853c7ee2e..c5fca7b7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index ec648f938..d97f0ac35 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a7f813a7a..13d8b974d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 249f29f4b..268a082a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 459e5ed34..716f28442 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -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(); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 64eabf358..62c9045d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index d303f65d0..d3da585e3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 4340fbcba..7c322d072 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -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) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 63d378f47..367fffef4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 2ff704596..cb7a49247 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 479a3d1c6..f7ec45a20 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index fbf629b1c..b98c13e05 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index b106619cf..cb44bd880 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 089db2146..e1e2dc10b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -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) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 80d51f0ed..94ca71afc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index af6140032..ddac026ba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 6346bf141..42130f47b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 8c4e228f4..490eb1b81 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index f2cfdcd40..bdf022d47 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -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()); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index ca27e1bfb..851691205 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -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)); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index abac456a2..7752e0823 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -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)); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index bba9a2f8e..33079b69a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -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 relays = new ArrayList<>(); for(EnumFacing dir : EnumFacing.HORIZONTALS) { TileEntity tile = world.getTileEntity(pos.offset(dir)); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index e649e75ec..f41e42ff8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 1a5ab7550..5925ae9a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 3474b39c2..23aa16c90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index d38383186..b79373b76 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 7d6325e4e..57c37c502 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 82cd5536b..82211babc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 704251eb1..69f008b19 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index e4fe6011d..68d059758 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 5e2912bb0..9612332e4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -63,8 +63,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl private static final TObjectIntHashMap 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); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 9d4f18502..3a9676e62 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index e9b1a2f76..5a6589464 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index e504ad123..edf03c04a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index bcb25de25..ae0534cf5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index e4cc332b0..d835e5b3f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 860cf3458..ee92bebe9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -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 par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 08a495375..7419af45c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 4179dc91a..b55479ccc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index a8c2078ea..da2af91e9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index e55750ede..956cee0a0 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 30d267ab5..26dfe65bd 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index fa9dacfc5..4080171ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index ab64386b5..02b111f23 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 4a423b4df..08fbf25e0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 516a8c18f..04e35b154 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index b6c327dc2..b2037424e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 7a8416211..0b8c91d08 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 0078670c7..df2386428 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 98e87c52b..c36174362 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 2bf35ebad..189bdf11b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index fa4942d29..686f84db5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 79369f89e..5d46d6150 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 028787441..a3a73c7eb 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index ac111c0b3..e78ba8455 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index eac050269..cdf4ae7f9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index b10bf9923..603cf3bcc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -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) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index bc7450207..00f029673 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index 955a672ad..5a4580e90 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index c65e5bee3..e47176e31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java index 41831e680..113f9c092 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index c7bcd46a8..5331a515d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index dcff7bda0..7a0cd1fb1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index bdb0845fb..016a8c21e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index da331ba99..e59ad616b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index a14741554..b2c49e8c3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -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() { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 7746176ce..ee0072f3b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index d12e7d6f0..06a90d1a9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index a339d5969..3f85ebb4d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 04e8cf9e7..e23061e06 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 8961018ec..4a269f1f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 5884f56d6..1fe8d4a6c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 058bedc8a..bf4cc9350 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 077a15d1a..7e967a0ff 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index c3f49a7d4..166d9d117 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index e464657b3..6923d9252 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 0ffb3c193..3d3836874 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 48b3dbce2..b9c92fa0b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 21f9c025a..83bf2a955 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 5f82b2be3..c83e4b32a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -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) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 640cf8384..7ce8fc048 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -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)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 1c1fa7f72..020eb5405 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 43368594c..4b137e010 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 5d81e1dfb..bba2bb083 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index ba33dd12c..115555b8e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index bbd0f13f2..04aab93a7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index d5af0c5c1..3a41515af 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 6ecc66a8f..298388a57 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 34e48f92c..a7c555c28 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -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); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 7855936a8..8f6e80363 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 2d55a594c..2c6bdb883 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index a7976a1c5..91992a069 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -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"); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 31d4a778f..cc655838f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -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))); } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index cd80212ad..dde676629 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -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) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 5f4bbc715..1fb1eaea6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -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); } } diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index 183154826..027baa949 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -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))); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 265c4a6aa..4c3dce299 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -48,7 +48,7 @@ public final class VersionChecker { int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 23053701b..d3cae814f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -62,12 +62,12 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { super.entityInit(); setSize(0F, 0F); - dataWatcher.register(CHARGING, false); - dataWatcher.register(VARIETY, 0); - dataWatcher.register(CHARGE_TICKS, 0); - dataWatcher.register(LIVE_TICKS, 0); - dataWatcher.register(DELAY, 0); - dataWatcher.register(ROTATION, 0F); + dataManager.register(CHARGING, false); + dataManager.register(VARIETY, 0); + dataManager.register(CHARGE_TICKS, 0); + dataManager.register(LIVE_TICKS, 0); + dataManager.register(DELAY, 0); + dataManager.register(ROTATION, 0F); } @Override @@ -191,51 +191,51 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { } public boolean isCharging() { - return dataWatcher.get(CHARGING); + return dataManager.get(CHARGING); } public void setCharging(boolean charging) { - dataWatcher.set(CHARGING, charging); + dataManager.set(CHARGING, charging); } public int getVariety() { - return dataWatcher.get(VARIETY); + return dataManager.get(VARIETY); } public void setVariety(int var) { - dataWatcher.set(VARIETY, var); + dataManager.set(VARIETY, var); } public int getChargeTicks() { - return dataWatcher.get(CHARGE_TICKS); + return dataManager.get(CHARGE_TICKS); } public void setChargeTicks(int ticks) { - dataWatcher.set(CHARGE_TICKS, ticks); + dataManager.set(CHARGE_TICKS, ticks); } public int getLiveTicks() { - return dataWatcher.get(LIVE_TICKS); + return dataManager.get(LIVE_TICKS); } public void setLiveTicks(int ticks) { - dataWatcher.set(LIVE_TICKS, ticks); + dataManager.set(LIVE_TICKS, ticks); } public int getDelay() { - return dataWatcher.get(DELAY); + return dataManager.get(DELAY); } public void setDelay(int delay) { - dataWatcher.set(DELAY, delay); + dataManager.set(DELAY, delay); } public float getRotation() { - return dataWatcher.get(ROTATION); + return dataManager.get(ROTATION); } public void setRotation(float rot) { - dataWatcher.set(ROTATION, rot); + dataManager.set(ROTATION, rot); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index a4aa8299d..a30f31894 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -65,11 +65,11 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.register(INVISIBILITY, 0); - dataWatcher.register(MASTER, false); - dataWatcher.register(NETWORK, 0); - dataWatcher.register(ITEM_DISPLAY_TICKS, 0); - dataWatcher.register(DISPLAY_STACK, Optional.absent()); + dataManager.register(INVISIBILITY, 0); + dataManager.register(MASTER, false); + dataManager.register(NETWORK, 0); + dataManager.register(ITEM_DISPLAY_TICKS, 0); + dataManager.register(DISPLAY_STACK, Optional.absent()); } @Override @@ -228,37 +228,37 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } public void setMaster(boolean master) { - dataWatcher.set(MASTER, master); + dataManager.set(MASTER, master); } @Override public boolean isMaster() { - return dataWatcher.get(MASTER); + return dataManager.get(MASTER); } public void setNetwork(EnumDyeColor network) { - dataWatcher.set(NETWORK, network.getMetadata()); + dataManager.set(NETWORK, network.getMetadata()); } @Override public EnumDyeColor getNetwork() { - return EnumDyeColor.byMetadata(dataWatcher.get(NETWORK)); + return EnumDyeColor.byMetadata(dataManager.get(NETWORK)); } public int getItemDisplayTicks() { - return dataWatcher.get(ITEM_DISPLAY_TICKS); + return dataManager.get(ITEM_DISPLAY_TICKS); } public void setItemDisplayTicks(int ticks) { - dataWatcher.set(ITEM_DISPLAY_TICKS, ticks); + dataManager.set(ITEM_DISPLAY_TICKS, ticks); } public Optional getDisplayedItem() { - return dataWatcher.get(DISPLAY_STACK); + return dataManager.get(DISPLAY_STACK); } public void setDisplayedItem(ItemStack stack) { - dataWatcher.set(DISPLAY_STACK, Optional.fromNullable(stack)); + dataManager.set(DISPLAY_STACK, Optional.fromNullable(stack)); } @Override @@ -297,8 +297,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.get(INVISIBILITY); - dataWatcher.set(INVISIBILITY, ~invis & 1); + int invis = dataManager.get(INVISIBILITY); + dataManager.set(INVISIBILITY, ~invis & 1); return true; } @@ -309,14 +309,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { protected void readEntityFromNBT(NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); - dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); + dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); - cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); + cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index d77a93001..f3622c3ef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -165,7 +165,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(par3World.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) { if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setStyle(new Style().setColor(TextFormatting.RED))); return false; } @@ -176,7 +176,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi Block blockat = state.getBlock(); if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); return false; } } @@ -195,7 +195,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } if(!par3World.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setChatStyle(new Style().setColor(TextFormatting.RED))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); return false; } @@ -265,69 +265,69 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(INVUL_TIME, 0); - dataWatcher.register(AGGRO, false); - dataWatcher.register(TP_DELAY, 0); - dataWatcher.register(SOURCE, BlockPos.ORIGIN); - dataWatcher.register(DATA_MOB_SPAWN_TICKS, 0); - dataWatcher.register(HARD_MODE, false); - dataWatcher.register(PLAYER_COUNT, 0); + dataManager.register(INVUL_TIME, 0); + dataManager.register(AGGRO, false); + dataManager.register(TP_DELAY, 0); + dataManager.register(SOURCE, BlockPos.ORIGIN); + dataManager.register(DATA_MOB_SPAWN_TICKS, 0); + dataManager.register(HARD_MODE, false); + dataManager.register(PLAYER_COUNT, 0); } public int getInvulTime() { - return dataWatcher.get(INVUL_TIME); + return dataManager.get(INVUL_TIME); } public boolean isAggored() { - return dataWatcher.get(AGGRO); + return dataManager.get(AGGRO); } public int getTPDelay() { - return dataWatcher.get(TP_DELAY); + return dataManager.get(TP_DELAY); } public BlockPos getSource() { - return dataWatcher.get(SOURCE); + return dataManager.get(SOURCE); } public int getMobSpawnTicks() { - return dataWatcher.get(DATA_MOB_SPAWN_TICKS); + return dataManager.get(DATA_MOB_SPAWN_TICKS); } public boolean isHardMode() { - return dataWatcher.get(HARD_MODE); + return dataManager.get(HARD_MODE); } public int getPlayerCount() { - return dataWatcher.get(PLAYER_COUNT); + return dataManager.get(PLAYER_COUNT); } public void setInvulTime(int time) { - dataWatcher.set(INVUL_TIME, time); + dataManager.set(INVUL_TIME, time); } public void setAggroed(boolean aggored) { - dataWatcher.set(AGGRO, aggored); + dataManager.set(AGGRO, aggored); } public void setTPDelay(int delay) { - dataWatcher.set(TP_DELAY, delay); + dataManager.set(TP_DELAY, delay); } public void setSource(BlockPos pos) { - dataWatcher.set(SOURCE, pos); + dataManager.set(SOURCE, pos); } public void setMobSpawnTicks(int ticks) { - dataWatcher.set(DATA_MOB_SPAWN_TICKS, ticks); + dataManager.set(DATA_MOB_SPAWN_TICKS, ticks); } public void setHardMode(boolean hardMode) { - dataWatcher.set(HARD_MODE, hardMode); + dataManager.set(HARD_MODE, hardMode); } public void setPlayerCount(int count) { - dataWatcher.set(PLAYER_COUNT, count); + dataManager.set(PLAYER_COUNT, count); } @Override @@ -816,7 +816,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(flag1) { setPosition(posX, posY, posZ); - if(worldObj.getCubes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) + if(worldObj.getCollisionBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.isAnyLiquid(getEntityBoundingBox())) flag = true; // Prevent out of bounds teleporting diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index f120f24ea..9c2922e97 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -56,24 +56,24 @@ public class EntityMagicMissile extends EntityThrowable { @Override protected void entityInit() { - dataWatcher.register(EVIL, false); - dataWatcher.register(TARGET, 0); + dataManager.register(EVIL, false); + dataManager.register(TARGET, 0); } public void setEvil(boolean evil) { - dataWatcher.set(EVIL, evil); + dataManager.set(EVIL, evil); } public boolean isEvil() { - return dataWatcher.get(EVIL); + return dataManager.get(EVIL); } public void setTarget(EntityLivingBase e) { - dataWatcher.set(TARGET, e == null ? -1 : e.getEntityId()); + dataManager.set(TARGET, e == null ? -1 : e.getEntityId()); } public EntityLivingBase getTargetEntity() { - int id = dataWatcher.get(TARGET); + int id = dataManager.get(TARGET); Entity e = worldObj.getEntityByID(id); if(e != null && e instanceof EntityLivingBase) return (EntityLivingBase) e; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index c1a8b460c..b490268ce 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -103,14 +103,14 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(COLOR, 0); - dataWatcher.register(MANA, 0); - dataWatcher.register(START_MANA, 0); - dataWatcher.register(MIN_MANA_LOSS, 0); - dataWatcher.register(MANA_LOSS_PER_TICK, 0F); - dataWatcher.register(GRAVITY, 0F); - dataWatcher.register(SOURCE_COORDS, BlockPos.ORIGIN); - dataWatcher.register(SOURCE_LENS, Optional.absent()); + dataManager.register(COLOR, 0); + dataManager.register(MANA, 0); + dataManager.register(START_MANA, 0); + dataManager.register(MIN_MANA_LOSS, 0); + dataManager.register(MANA_LOSS_PER_TICK, 0F); + dataManager.register(GRAVITY, 0F); + dataManager.register(SOURCE_COORDS, BlockPos.ORIGIN); + dataManager.register(SOURCE_LENS, Optional.absent()); } public EntityManaBurst(IManaSpreader spreader, boolean fake) { @@ -695,77 +695,77 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public int getColor() { - return dataWatcher.get(COLOR); + return dataManager.get(COLOR); } @Override public void setColor(int color) { - dataWatcher.set(COLOR, color); + dataManager.set(COLOR, color); } @Override public int getMana() { - return dataWatcher.get(MANA); + return dataManager.get(MANA); } @Override public void setMana(int mana) { - dataWatcher.set(MANA, mana); + dataManager.set(MANA, mana); } @Override public int getStartingMana() { - return dataWatcher.get(START_MANA); + return dataManager.get(START_MANA); } @Override public void setStartingMana(int mana) { - dataWatcher.set(START_MANA, mana); + dataManager.set(START_MANA, mana); } @Override public int getMinManaLoss() { - return dataWatcher.get(MIN_MANA_LOSS); + return dataManager.get(MIN_MANA_LOSS); } @Override public void setMinManaLoss(int minManaLoss) { - dataWatcher.set(MIN_MANA_LOSS, minManaLoss); + dataManager.set(MIN_MANA_LOSS, minManaLoss); } @Override public float getManaLossPerTick() { - return dataWatcher.get(MANA_LOSS_PER_TICK); + return dataManager.get(MANA_LOSS_PER_TICK); } @Override public void setManaLossPerTick(float mana) { - dataWatcher.set(MANA_LOSS_PER_TICK, mana); + dataManager.set(MANA_LOSS_PER_TICK, mana); } @Override public float getGravity() { - return dataWatcher.get(GRAVITY); + return dataManager.get(GRAVITY); } @Override public void setGravity(float gravity) { - dataWatcher.set(GRAVITY, gravity); + dataManager.set(GRAVITY, gravity); } @Override public BlockPos getBurstSourceBlockPos() { - return dataWatcher.get(SOURCE_COORDS); + return dataManager.get(SOURCE_COORDS); } @Override public void setBurstSourceCoords(BlockPos pos) { - dataWatcher.set(SOURCE_COORDS, pos); + dataManager.set(SOURCE_COORDS, pos); } @Override public ItemStack getSourceLens() { - Optional stack = dataWatcher.get(SOURCE_LENS); + Optional stack = dataManager.get(SOURCE_LENS); if(!stack.isPresent()) return new ItemStack(Blocks.stone, 0, 0); // todo 1.9 refact later else return stack.get(); @@ -773,7 +773,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public void setSourceLens(ItemStack lens) { - dataWatcher.set(SOURCE_LENS, lens == null ? Optional.absent() : Optional.of(lens)); + dataManager.set(SOURCE_LENS, lens == null ? Optional.absent() : Optional.of(lens)); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 2ee61d8cf..77088c978 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -37,7 +37,7 @@ public class EntityPixie extends EntityFlyingCreature { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(TYPE, 0); + dataManager.register(TYPE, 0); } @Override @@ -47,11 +47,11 @@ public class EntityPixie extends EntityFlyingCreature { } public void setType(int type) { - dataWatcher.set(TYPE, type); + dataManager.set(TYPE, type); } public int getType() { - return dataWatcher.get(TYPE); + return dataManager.get(TYPE); } public void setProps(EntityLivingBase target, EntityLivingBase summoner, int type, float damage) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 6c5fd201d..ea621a786 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -50,7 +50,7 @@ public class EntityPoolMinecart extends EntityMinecart { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(MANA, 0); + dataManager.register(MANA, 0); } @Override @@ -157,11 +157,11 @@ public class EntityPoolMinecart extends EntityMinecart { } public int getMana() { - return dataWatcher.get(MANA); + return dataManager.get(MANA); } public void setMana(int mana) { - dataWatcher.set(MANA, mana); + dataManager.set(MANA, mana); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 5326e95d0..7d21973b8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -32,7 +32,7 @@ public class EntitySignalFlare extends Entity { @Override protected void entityInit() { - dataWatcher.register(COLOR, 0); + dataManager.register(COLOR, 0); } @Override @@ -74,11 +74,11 @@ public class EntitySignalFlare extends Entity { } public void setColor(int color) { - dataWatcher.set(COLOR, color); + dataManager.set(COLOR, color); } public int getColor() { - return dataWatcher.get(COLOR); + return dataManager.get(COLOR); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 45793d568..65d6a3692 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -65,8 +65,8 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataWatcher.register(INVISIBILITY, 0); - dataWatcher.register(UPGRADE, 0); + dataManager.register(INVISIBILITY, 0); + dataManager.register(UPGRADE, 0); } @Override @@ -290,8 +290,8 @@ public class EntitySpark extends Entity implements ISparkEntity { public boolean doPhantomInk(ItemStack stack) { if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataWatcher.get(INVISIBILITY); - dataWatcher.set(INVISIBILITY, ~invis & 1); + int invis = dataManager.get(INVISIBILITY); + dataManager.set(INVISIBILITY, ~invis & 1); return true; } @@ -301,13 +301,13 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readEntityFromNBT(NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); - dataWatcher.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); + dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); } @Override protected void writeEntityToNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); - cmp.setInteger(TAG_INVIS, dataWatcher.get(INVISIBILITY)); + cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); } @Override @@ -369,12 +369,12 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public SparkUpgradeType getUpgrade() { - return SparkUpgradeType.values()[dataWatcher.get(UPGRADE)]; + return SparkUpgradeType.values()[dataManager.get(UPGRADE)]; } @Override public void setUpgrade(SparkUpgradeType upgrade) { - dataWatcher.set(UPGRADE, upgrade.ordinal()); + dataManager.set(UPGRADE, upgrade.ordinal()); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index ba122aa6b..d40591a99 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -54,8 +54,8 @@ public class EntityThornChakram extends EntityThrowable { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(BOUNCES, 0); - dataWatcher.register(FLARE, false); + dataManager.register(BOUNCES, 0); + dataManager.register(FLARE, false); } @Override @@ -155,19 +155,19 @@ public class EntityThornChakram extends EntityThrowable { } public int getTimesBounced() { - return dataWatcher.get(BOUNCES); + return dataManager.get(BOUNCES); } public void setTimesBounced(int times) { - dataWatcher.set(BOUNCES, times); + dataManager.set(BOUNCES, times); } public boolean isFire() { - return dataWatcher.get(FLARE); + return dataManager.get(FLARE); } public void setFire(boolean fire) { - dataWatcher.set(FLARE, fire); + dataManager.set(FLARE, fire); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 18ec609c7..b63f5850c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -47,7 +47,7 @@ public class EntityVineBall extends EntityThrowable { @Override protected void entityInit() { super.entityInit(); - dataWatcher.register(GRAVITY, gravity ? 0.03F : 0F); + dataManager.register(GRAVITY, gravity ? 0.03F : 0F); } @Override @@ -79,7 +79,7 @@ public class EntityVineBall extends EntityThrowable { @Override protected float getGravityVelocity() { - return dataWatcher.get(GRAVITY); + return dataManager.get(GRAVITY); } } diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 9108fbcb3..2c8331bbe 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -20,9 +20,8 @@ import net.minecraft.item.ItemStack; public class Item16Colors extends ItemMod implements IColorable { public Item16Colors(String name) { - super(); + super(name); setHasSubtypes(true); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index a9f4e1cac..54896d24a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -28,7 +28,7 @@ public class ItemAncientWill extends ItemMod { private static final int SUBTYPES = 6; public ItemAncientWill() { - setUnlocalizedName(LibItemNames.ANCIENT_WILL); + super(LibItemNames.ANCIENT_WILL); setHasSubtypes(true); setMaxStackSize(1); diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 160c90f7c..7fa64f914 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -29,7 +29,7 @@ public class ItemBaubleBox extends ItemMod { private static final String TAG_SLOT = "Slot"; public ItemBaubleBox() { - setUnlocalizedName(LibItemNames.BAUBLE_BOX); + super(LibItemNames.BAUBLE_BOX); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index aeff364ec..397d09761 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -51,7 +51,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { private static final String TAG_BLOCK_COUNT = "blockCount"; public ItemBlackHoleTalisman() { - setUnlocalizedName(LibItemNames.BLACK_HOLE_TALISMAN); + super(LibItemNames.BLACK_HOLE_TALISMAN); setMaxStackSize(1); setHasSubtypes(true); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 8f9f3f06c..8b0612321 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -32,7 +32,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { private static final int MANA_PER_T2 = 100000; public ItemBlackLotus() { - setUnlocalizedName(LibItemNames.BLACK_LOTUS); + super(LibItemNames.BLACK_LOTUS); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 2ac342592..144d961ad 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -44,7 +44,7 @@ public class ItemBottledMana extends ItemMod { private static final String TAG_SEED = "randomSeed"; public ItemBottledMana() { - setUnlocalizedName(LibItemNames.MANA_BOTTLE); + super(LibItemNames.MANA_BOTTLE); setMaxStackSize(1); setMaxDamage(6); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 805d47f81..5c9f6fca3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -50,8 +50,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { private static final String TAG_HAS_SOUND = "hasSound"; public ItemCacophonium() { + super(LibItemNames.CACOPHONIUM); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.CACOPHONIUM); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemClip.java b/src/main/java/vazkii/botania/common/item/ItemClip.java index 6f3ac2b50..b8f0e34b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemClip.java +++ b/src/main/java/vazkii/botania/common/item/ItemClip.java @@ -15,8 +15,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemClip extends ItemMod { public ItemClip() { + super(LibItemNames.CLIP); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.CLIP); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 8dc631252..2e80f6afc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCorporeaSpark extends ItemMod { public ItemCorporeaSpark() { - setUnlocalizedName(LibItemNames.CORPOREA_SPARK); + super(LibItemNames.CORPOREA_SPARK); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 58cad146e..3d41b027d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -28,8 +28,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemCraftPattern extends ItemMod { public ItemCraftPattern() { + super(LibItemNames.CRAFT_PATTERN); setHasSubtypes(true); - setUnlocalizedName(LibItemNames.CRAFT_PATTERN); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index cafdea64a..8659bf70d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -82,7 +82,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } public ItemCraftingHalo(String name) { - setUnlocalizedName(name); + super(name); setMaxStackSize(1); } @@ -264,7 +264,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { // Screw the way minecraft handles rotation // Really... private static float getCheckingAngle(EntityLivingBase player, float base) { - float yaw = MathHelper.wrapAngleTo180_float(player.rotationYaw) + 90F; + float yaw = MathHelper.wrapDegrees(player.rotationYaw) + 90F; int angles = 360; int segAngles = angles / SEGMENTS; float shift = segAngles / 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index decaf4f03..0c4a4a433 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -34,8 +34,8 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv private static final int COST_OTHER = 5000; public ItemEnderHand() { + super(LibItemNames.ENDER_HAND); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.ENDER_HAND); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index a9f424c44..6bd46d54f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -29,8 +29,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemFertilizer extends ItemMod { public ItemFertilizer() { - super(); - setUnlocalizedName(LibItemNames.FERTILIZER); + super(LibItemNames.FERTILIZER); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 98bab499d..f26384d0f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -44,7 +44,7 @@ public class ItemFlowerBag extends ItemMod { private static final String TAG_SLOT = "Slot"; public ItemFlowerBag() { - setUnlocalizedName(LibItemNames.FLOWER_BAG); + super(LibItemNames.FLOWER_BAG); setMaxStackSize(1); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index b010b3c4d..4f3642b37 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { - setUnlocalizedName(LibItemNames.GAIA_HEAD); + super(LibItemNames.GAIA_HEAD); } // Copied from vanila skull itemBlock. Relevant edits are indicated. diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 3697d80e9..68c8112b5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -45,9 +45,8 @@ public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; public ItemGrassHorn() { - super(); + super(LibItemNames.GRASS_HORN); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.GRASS_HORN); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 7a7da993a..497623552 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -60,8 +60,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private static final int SUBTYPES = 9; public ItemGrassSeeds() { - super(); - setUnlocalizedName(LibItemNames.GRASS_SEEDS); + super(LibItemNames.GRASS_SEEDS); setHasSubtypes(true); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 42ea56175..cdb694c12 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -38,7 +38,7 @@ public class ItemKeepIvy extends ItemMod { private static final String TAG_DROP_PREFIX = "dropPrefix"; public ItemKeepIvy() { - setUnlocalizedName(LibItemNames.KEEP_IVY); + super(LibItemNames.KEEP_IVY); GameRegistry.addRecipe(new KeepIvyRecipe()); RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 2f174b9af..ddd30b2c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -61,7 +61,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet private static final int BASE_OFFSET = 42; public ItemLaputaShard() { - setUnlocalizedName(LibItemNames.LAPUTA_SHARD); + super(LibItemNames.LAPUTA_SHARD); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3f0a773e4..853c3df8f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -55,9 +55,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { boolean skipSound = false; public ItemLexicon() { - super(); + super(LibItemNames.LEXICON); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.LEXICON); } @Override @@ -136,7 +135,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { LexiconEntry entry = getEntryFromForce(par1ItemStack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setChatStyle(new Style().setColor(TextFormatting.RED))); + else par3EntityPlayer.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setStyle(new Style().setColor(TextFormatting.RED))); setForcedPage(par1ItemStack, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index dafc64901..3f8a2130b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -17,12 +17,14 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManaCookie extends ItemFood { @@ -30,6 +32,7 @@ public class ItemManaCookie extends ItemFood { super(0, 0.1F, false); setPotionEffect(new PotionEffect(MobEffects.saturation, 1, 0), 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); setUnlocalizedName(LibItemNames.MANA_COOKIE); } @@ -39,12 +42,6 @@ public class ItemManaCookie extends ItemFood { p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index c91d862a4..e43d954da 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -63,11 +63,10 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { private static final int COOLDOWN = 30; public ItemManaGun() { - super(); + super(LibItemNames.MANA_GUN); setMaxDamage(COOLDOWN); setMaxStackSize(1); setNoRepair(); - setUnlocalizedName(LibItemNames.MANA_GUN); GameRegistry.addRecipe(new ManaGunLensRecipe()); GameRegistry.addRecipe(new ManaGunRemoveLensRecipe()); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index c984f36ff..f4b101dc8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -46,10 +46,9 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte private static final DummyPool fallbackPool = new DummyPool(); public ItemManaMirror() { - super(); + super(LibItemNames.MANA_MIRROR); setMaxStackSize(1); setMaxDamage(1000); - setUnlocalizedName(LibItemNames.MANA_MIRROR); setNoRepair(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index a9aa9b347..be2f91a37 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -35,10 +35,9 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP private static final String TAG_ONE_USE = "oneUse"; public ItemManaTablet() { - super(); + super(LibItemNames.MANA_TABLET); setMaxStackSize(1); setMaxDamage(1000); - setUnlocalizedName(LibItemNames.MANA_TABLET); setNoRepair(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 0617b8b95..6d93f2150 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -12,21 +12,23 @@ package vazkii.botania.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; -public class ItemMod extends Item { +public abstract class ItemMod extends Item { - public ItemMod() { - super(); + public ItemMod(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); + if(shouldRegister()) + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); + setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + protected boolean shouldRegister() { + return true; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index e607e4120..5962bdd18 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -31,8 +31,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemObedienceStick extends ItemMod { public ItemObedienceStick() { + super(LibItemNames.OBEDIENCE_STICK); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.OBEDIENCE_STICK); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index eac6546e7..ea78c18c7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -25,8 +25,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemOpenBucket extends ItemMod { public ItemOpenBucket() { + super(LibItemNames.OPEN_BUCKET); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.OPEN_BUCKET); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index 001944730..5178d647f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -27,7 +27,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemOvergrowthSeed extends ItemMod { public ItemOvergrowthSeed() { - setUnlocalizedName(LibItemNames.OVERGROWTH_SEED); + super(LibItemNames.OVERGROWTH_SEED); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index c125c2f0b..94e1c922e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemPhantomInk extends ItemMod { public ItemPhantomInk() { - setUnlocalizedName(LibItemNames.PHANTOM_INK); + super(LibItemNames.PHANTOM_INK); GameRegistry.addRecipe(new PhantomInkRecipe()); RecipeSorter.register("botania:phantomInk", PhantomInkRecipe.class, Category.SHAPELESS, ""); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index ecfdb936c..bb1d66beb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -30,7 +30,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemPinkinator extends ItemMod { public ItemPinkinator() { - setUnlocalizedName(LibItemNames.PINKINATOR); + super(LibItemNames.PINKINATOR); setMaxStackSize(1); setFull3D(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 2b4f78f9b..584c901cf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -35,8 +35,8 @@ import net.minecraftforge.fml.common.Optional; public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMinecartItem { public ItemPoolMinecart() { + super(LibItemNames.POOL_MINECART); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.POOL_MINECART); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index a0a84b808..6ec98a4a4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -31,7 +31,7 @@ public class ItemRegenIvy extends ItemMod { private static final int MANA_PER_DAMAGE = 200; public ItemRegenIvy() { - setUnlocalizedName(LibItemNames.REGEN_IVY); + super(LibItemNames.REGEN_IVY); GameRegistry.addRecipe(new RegenIvyRecipe()); RecipeSorter.register("botania:regenIvy", RegenIvyRecipe.class, Category.SHAPELESS, ""); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index b03407acb..b915d78d6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -48,7 +48,7 @@ public class ItemSextant extends ItemMod { private static final String TAG_SOURCE_Z = "sourceZ"; public ItemSextant() { - setUnlocalizedName(LibItemNames.SEXTANT); + super(LibItemNames.SEXTANT); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 5654a168d..efae288ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -42,11 +42,10 @@ public class ItemSignalFlare extends ItemMod implements IColorable { private static final String TAG_COLOR = "color"; public ItemSignalFlare() { - super(); + super(LibItemNames.SIGNAL_FLARE); setMaxStackSize(1); setNoRepair(); setMaxDamage(200); - setUnlocalizedName(LibItemNames.SIGNAL_FLARE); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 87b9fa0ad..701a30e08 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -20,7 +20,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSlimeBottle extends ItemMod { public ItemSlimeBottle() { - setUnlocalizedName(LibItemNames.SLIME_BOTTLE); + super(LibItemNames.SLIME_BOTTLE); setMaxStackSize(1); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 5046e62f1..de172706e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -29,8 +29,8 @@ public class ItemSlingshot extends ItemMod { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall; public ItemSlingshot() { + super(LibItemNames.SLINGSHOT); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.SLINGSHOT); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 133238d5b..51f8f2138 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGivingItem { public ItemSpark() { - setUnlocalizedName(LibItemNames.SPARK); + super(LibItemNames.SPARK); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 95169e6f2..4dca48283 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -22,7 +22,7 @@ public class ItemSparkUpgrade extends ItemMod { public static final int VARIANTS = 4; public ItemSparkUpgrade() { - setUnlocalizedName(LibItemNames.SPARK_UPGRADE); + super(LibItemNames.SPARK_UPGRADE); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 060baab70..1c5d2b768 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -41,7 +41,7 @@ public class ItemSpawnerMover extends ItemMod { private static final String TAG_PLACE_DELAY = "placeDelay"; public ItemSpawnerMover() { - setUnlocalizedName(LibItemNames.SPAWNER_MOVER); + super(LibItemNames.SPAWNER_MOVER); setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "full"), new IItemPropertyGetter() { @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index 1e6a2ef68..d6ccf77bc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -24,10 +24,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemSpellCloth extends ItemMod implements IColorable { public ItemSpellCloth() { + super(LibItemNames.SPELL_CLOTH); setMaxDamage(35); setMaxStackSize(1); setNoRepair(); - setUnlocalizedName(LibItemNames.SPELL_CLOTH); GameRegistry.addRecipe(new SpellClothRecipe()); RecipeSorter.register("botania:spellCloth", SpellClothRecipe.class, Category.SHAPELESS, ""); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 7a5843db9..adf4b3f00 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemTemperanceStone extends ItemMod { public ItemTemperanceStone() { - setUnlocalizedName(LibItemNames.TEMPERANCE_STONE); + super(LibItemNames.TEMPERANCE_STONE); setMaxStackSize(1); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 8956e606b..ec15d7238 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -31,7 +31,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemThornChakram extends ItemMod implements ICraftAchievement { public ItemThornChakram() { - setUnlocalizedName(LibItemNames.THORN_CHAKRAM); + super(LibItemNames.THORN_CHAKRAM); setMaxStackSize(6); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 5fcfb96db..f295efd5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -24,7 +24,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemVineBall extends ItemMod { public ItemVineBall() { - setUnlocalizedName(LibItemNames.VINE_BALL); + super(LibItemNames.VINE_BALL); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 38f1b7678..45ff70d9e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -41,7 +41,7 @@ public class ItemVirus extends ItemMod { private static final int SUBTYPES = 2; public ItemVirus() { - setUnlocalizedName(LibItemNames.VIRUS); + super(LibItemNames.VIRUS); setHasSubtypes(true); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index a7ac12b04..6c3cae147 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -22,8 +22,8 @@ public class ItemWaterBowl extends ItemMod implements IFluidContainerItem { private static final FluidStack STACK = new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME); public ItemWaterBowl() { + super(LibItemNames.WATER_BOWL); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.WATER_BOWL); } // Needed for rendering water dynamic model diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index a07252519..fef032232 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -26,7 +26,7 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemWorldSeed extends ItemMod { public ItemWorldSeed() { - setUnlocalizedName(LibItemNames.WORLD_SEED); + super(LibItemNames.WORLD_SEED); } @Override @@ -38,7 +38,7 @@ public class ItemWorldSeed extends ItemMod { player.rotationYaw = 0F; player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCubes(player, player.getEntityBoundingBox()).isEmpty()) + while(!world.getCollisionBoxes(player, player.getEntityBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.PLAYERS, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index f0f18a0c7..8d37749ee 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -47,13 +47,14 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; - String name; - String texName; - int swigs; - int drinkSpeed; - ItemStack baseItem; + private String name; + private String texName; + private int swigs; + private int drinkSpeed; + private ItemStack baseItem; public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) { + super(name); this.name = name; this.texName = texName; this.swigs = swigs; @@ -61,7 +62,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup this.baseItem = baseItem; setMaxStackSize(1); setMaxDamage(swigs); - setUnlocalizedName(name); setNoRepair(); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 2e0b95b3f..c3bd5b015 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -38,7 +38,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain public static final int TIME_MULTIPLIER = 60; public ItemIncenseStick() { - setUnlocalizedName(LibItemNames.INCENSE_STICK); + super(LibItemNames.INCENSE_STICK); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index e257763e7..e20cf889c 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -28,8 +28,8 @@ public class ItemVial extends ItemMod implements IBrewContainer { } public ItemVial(String name) { + super(name); setHasSubtypes(true); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 2961c8a28..a615a193b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -24,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; @@ -44,6 +45,7 @@ import net.minecraftforge.fml.common.Optional; 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; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor { @@ -63,15 +65,10 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan super(mat, 0, type); this.type = type; setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 69f1ad390..41612d15a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -50,9 +50,8 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt private static final String TAG_PHANTOM_INK = "phantomInk"; public ItemBauble(String name) { - super(); + super(name); setMaxStackSize(1); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 96034757a..3d3942ec7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -42,6 +42,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; import java.util.function.Predicate; @@ -56,6 +57,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { public ItemLivingwoodBow(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); setMaxDamage(500); addPropertyOverride(new ResourceLocation("minecraft:pull"), new IItemPropertyGetter() { @@ -74,12 +76,6 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { }); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 87911b83f..c83aa3051 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -40,6 +41,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISortableTool { @@ -55,6 +57,7 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta super(mat, ImmutableSet.of()); // todo attack speed and set setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } @@ -63,12 +66,6 @@ public class ItemManasteelAxe extends ItemTool implements IManaUsingItem, ISorta return ImmutableSet.of("axe"); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 5d7392fa3..f7a3fc7a9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -23,6 +23,7 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -37,6 +38,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { @@ -51,15 +53,10 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS public ItemManasteelPick(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index e11d6acc7..f3f63c38d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -26,6 +26,7 @@ import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -38,6 +39,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { @@ -50,15 +52,10 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { public ItemManasteelShears(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 343f247a6..3b4e73db2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; @@ -38,6 +39,7 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { @@ -50,15 +52,10 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS public ItemManasteelShovel(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 71e9add70..44091405a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -31,6 +31,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { @@ -43,6 +44,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { public ItemManasteelSword(ToolMaterial mat, String name) { super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); addPropertyOverride(new ResourceLocation("botania", "elucidator"), new IItemPropertyGetter() { @Override @@ -52,12 +54,6 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { }); } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index fb8ab01cd..151db0c80 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -34,7 +34,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools private static final String TAG_MANA = "mana"; public ItemManaInkwell() { - setUnlocalizedName(LibItemNames.MANA_INKWELL); + super(LibItemNames.MANA_INKWELL); setMaxDamage(USES); setMaxStackSize(1); setNoRepair(); diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index c615afc9d..d8f3396f5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -134,8 +134,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens private static final String TAG_COMPOSITE_LENS = "compositeLens"; public ItemLens() { - super(); - setUnlocalizedName(LibItemNames.LENS); + super(LibItemNames.LENS); setMaxStackSize(1); setHasSubtypes(true); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 9f9066cb6..193523236 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -54,8 +54,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve final int types = 24; public ItemManaResource() { - super(); - setUnlocalizedName(LibItemNames.MANA_RESOURCE); + super(LibItemNames.MANA_RESOURCE); setHasSubtypes(true); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index 125964056..a5d7c844b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -16,10 +16,9 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemPestleAndMortar extends ItemMod { public ItemPestleAndMortar() { - super(); + super(LibItemNames.PESTLE_AND_MORTAR); setMaxStackSize(1); setContainerItem(this); - setUnlocalizedName(LibItemNames.PESTLE_AND_MORTAR); } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 2bbab22f0..8bcf87739 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -25,7 +25,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { private static final int SUBTYPES = 7; public ItemQuartz() { - setUnlocalizedName(LibItemNames.QUARTZ); + super(LibItemNames.QUARTZ); setHasSubtypes(true); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index d7c658ff6..3810f9bf8 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -29,9 +29,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement { public ItemRune() { - super(); + super(LibItemNames.RUNE); setHasSubtypes(true); - setUnlocalizedName(LibItemNames.RUNE); } @Override diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 65f84b9a7..ca9be465e 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -19,6 +19,7 @@ import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; +import vazkii.botania.common.lib.LibMisc; public class ItemModRecord extends ItemRecord { @@ -27,16 +28,11 @@ public class ItemModRecord extends ItemRecord { public ItemModRecord(String record, SoundEvent sound, String name) { super("botania:" + record, sound); setCreativeTab(BotaniaCreativeTab.INSTANCE); + GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name)); setUnlocalizedName(name); file = "botania:music." + record; } - @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); - } - @Override public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 94998a50a..2798ede3d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -45,7 +45,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, ICraftAchievement { - Multimap attributes = HashMultimap.create(); + private final Multimap attributes = HashMultimap.create(); public ItemAesirRing() { super(LibItemNames.AESIR_RING); @@ -121,7 +121,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IExtendedWireframe } - void fillModifiers(Multimap attributes, ItemStack stack) { + private void fillModifiers(Multimap attributes, ItemStack stack) { attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 1f7864f7f..d1b74727e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -74,12 +74,12 @@ public class ItemDice extends ItemRelic { world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); if(hasRelicAlready(player, relic)) { - player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); stack.stackSize--; return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); return ActionResult.newResult(EnumActionResult.SUCCESS, relicStacks[relic].copy()); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 07ae78c30..5e915bcd3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -88,7 +88,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { weapon.rotationYaw = living.rotationYaw; weapon.setVariety(rand.nextInt(WEAPON_TYPES)); weapon.setDelay(spawned); - weapon.setRotation(MathHelper.wrapAngleTo180_float(-living.rotationYaw + 180)); + weapon.setRotation(MathHelper.wrapDegrees(-living.rotationYaw + 180)); living.worldObj.spawnEntityInWorld(weapon); weapon.playSound(BotaniaSoundEvents.babylonSpawn, 1F, 1F + living.worldObj.rand.nextFloat() * 3F); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 30e075bae..48cbaeb33 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -35,9 +35,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { - public static List damageNegations = new ArrayList<>(); + private static List damageNegations = new ArrayList<>(); - Multimap attributes = HashMultimap.create(); + private Multimap attributes = HashMultimap.create(); public ItemOdinRing() { super(LibItemNames.ODIN_RING); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 2d503d439..45d9d8aab 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -38,7 +38,7 @@ public class ItemRelic extends ItemMod implements IRelic { Achievement achievement; public ItemRelic(String name) { - setUnlocalizedName(name); + super(name); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index e3b13ca4b..837a1f3b6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -28,8 +28,11 @@ import vazkii.botania.common.item.equipment.bauble.ItemBauble; public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; - private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff. If we had traits this would mixed in. - @Override public Item setUnlocalizedName(String ignored) { return this; } // Don't register to the game + private ItemRelic dummy = new ItemRelic("dummy") { // Delegate for relic stuff + @Override + protected boolean shouldRegister() { + return false; + } }; public ItemRelicBauble(String name) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 6f1e29ddd..7fe9cf87e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -30,8 +30,8 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv static final int COST = 150; public ItemCobbleRod() { + super(LibItemNames.COBBLE_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.COBBLE_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 3e2e835aa..8eef228fb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -41,9 +41,8 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev } public ItemDirtRod(String name) { - super(); + super(name); setMaxStackSize(1); - setUnlocalizedName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 29cb4bdc8..a5535ba44 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -43,8 +43,8 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW static final int COST = 3000; public ItemDiviningRod() { + super(LibItemNames.DIVINING_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.DIVINING_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 89dd8f644..dfb95d677 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -66,8 +66,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra private static final String TAG_EXTRA_RANGE = "extraRange"; public ItemExchangeRod() { + super(LibItemNames.EXCHANGE_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.EXCHANGE_ROD); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index 68e4abb0b..3f67f2712 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -40,7 +40,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield private static final int COOLDOWN = 1200; public ItemFireRod() { - setUnlocalizedName(LibItemNames.FIRE_ROD); + super(LibItemNames.FIRE_ROD); setMaxStackSize(1); setMaxDamage(COOLDOWN); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 654daccec..0cc783720 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -51,8 +51,8 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { private static final String TAG_DIST = "dist"; public ItemGravityRod() { + super(LibItemNames.GRAVITY_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.GRAVITY_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 1935b39bf..daf71277c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -40,9 +40,8 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final int COST_AVATAR = 40; public ItemMissileRod() { - super(); + super(LibItemNames.MISSILE_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.MISSILE_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index fa502806e..3109a87a5 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -47,8 +47,8 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final int TIME = 600; public ItemRainbowRod() { + super(LibItemNames.RAINBOW_ROD); setMaxDamage(TIME); - setUnlocalizedName(LibItemNames.RAINBOW_ROD); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 6281f6ec6..b5450412c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -45,7 +45,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { public static Map playerData = new WeakHashMap<>(); public ItemSmeltRod() { - setUnlocalizedName(LibItemNames.SMELT_ROD); + super(LibItemNames.SMELT_ROD); setMaxStackSize(1); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 52db2797d..0d7838c94 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -77,9 +77,8 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP ); public ItemTerraformRod() { - super(); + super(LibItemNames.TERRAFORM_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.TERRAFORM_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 05cee2fca..d9d3b9d90 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -52,8 +52,8 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi private static final String TAG_FLYING = "flying"; public ItemTornadoRod() { + super(LibItemNames.TORNADO_ROD); setMaxDamage(MAX_DAMAGE); - setUnlocalizedName(LibItemNames.TORNADO_ROD); setMaxStackSize(1); addPropertyOverride(new ResourceLocation("botania", "flying"), new IItemPropertyGetter() { @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 9c8713ebf..15bc3c3d3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -21,9 +21,8 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { public static final int COST = 75; public ItemWaterRod() { - super(); + super(LibItemNames.WATER_ROD); setMaxStackSize(1); - setUnlocalizedName(LibItemNames.WATER_ROD); } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index 436071738..afa78b145 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -67,7 +67,7 @@ public class PageTutorial extends PageText { if(button == buttonText) { GuiLexicon.startTutorial(); Minecraft.getMinecraft().displayGuiScreen(new GuiLexicon()); - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setChatStyle(new Style().setColor(TextFormatting.GREEN))); + Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN))); } else if(button == buttonVideo && Desktop.isDesktopSupported()) { try { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI"));