mise à jour 1.7

assets/modtutoriel/lang/en_US.lang

@@ -1,16 +1,16 @@
 #en_US - master lang file
 
 #Commands
-commands.tutoriel.usage=Usage : /tutoriel <subcommand> <value>
+commands.tutoriel.usage=§4Usage : /tutoriel <subcommand> <value>
 commands.tutoriel.help=Available commands is creeper (Enable or disable creeper) and fire (burn a player)
 commands.tutoriel.creeper.enable=Creeper enabled
 commands.tutoriel.creeper.disable=Creeper disabled
-commands.tutoriel.creeper.usage=- creeper <value> : Enable or disable creeper. <value> is "enable" or "disable"
-commands.tutoriel.creeper.invalid=Invalid argument.
+commands.tutoriel.creeper.usage=§4- creeper <value> : Enable or disable creeper. <value> is "enable" or "disable"
+commands.tutoriel.creeper.invalid=§4Invalid argument.
 commands.tutoriel.fire.success=%1$s burn for %2$s secondes
 commands.tutoriel.fire.failure=Player no found
-commands.tutoriel.fire.usage.1=- fire <seconds> : burn you for <seconds>
-commands.tutoriel.fire.usage.2=- fire <player> <seconds> : burn <player> for <seconds>
+commands.tutoriel.fire.usage.1=§4- fire <seconds> : burn you for <seconds>
+commands.tutoriel.fire.usage.2=§4- fire <player> <seconds> : burn <player> for <seconds>
 
 #Block
 tile.BlockTutorial.name=Tutorial Block
@@ -55,9 +55,14 @@ item.TutorialShovel.name=Tutorial Shovel
 item.TutorialHoe.name=Tutorial Hoe
 item.bucketTutorial.name=Tutorial Bucket
 
+item.record.cd.desc=Tutorial record
+
 #CreativeTabs
 itemGroup.TutorialCreativeTabs=Tutorial Creative Table
 
 #Container
 container.bigchest=Big Chest
-container.cupboard=Cupboard
+container.cupboard=Cupboard
+
+#Other
+last.users=Last users : %s

assets/modtutoriel/lang/fr_FR.lang

@@ -1,16 +1,16 @@
 #fr_FR - by robin4002
 
 #Commands
-commands.tutoriel.usage=Utilisation : /tutoriel <sous-commande> <valeur>
+commands.tutoriel.usage=§4Utilisation : /tutoriel <sous-commande> <valeur>
 commands.tutoriel.help=Les commandes disponibles sont creeper (active ou désactive les creeper) et fire (brûle un joueur)
 commands.tutoriel.creeper.enable=Creeper activé
 commands.tutoriel.creeper.disable=Creeper désactivé
-commands.tutoriel.creeper.usage=- creeper <valeur> : Active ou désactive les creeper. <valeur> est soit "enable", soit "disable"
-commands.tutoriel.creeper.invalid=Argument invalide.
+commands.tutoriel.creeper.usage=§4- creeper <valeur> : Active ou désactive les creeper. <valeur> est soit "enable", soit "disable"
+commands.tutoriel.creeper.invalid=§4Argument invalide.
 commands.tutoriel.fire.success=%1$s brûle pendant %2$s secondes
 commands.tutoriel.fire.failure=Joueur non trouvé
-commands.tutoriel.fire.usage.1=- fire <secondes> : Vous brûles pendant <secondes>
-commands.tutoriel.fire.usage.2=- fire <joueur> <secondes> : brûle <joueur> pendant <secondes>
+commands.tutoriel.fire.usage.1=§4- fire <secondes> : Vous brûles pendant <secondes>
+commands.tutoriel.fire.usage.2=§4- fire <joueur> <secondes> : brûle <joueur> pendant <secondes>
 
 #Block
 tile.BlockTutorial.name=Bloc Tutoriel
@@ -55,9 +55,14 @@ item.TutorialShovel.name=Pelle tutoriel
 item.TutorialHoe.name=Houe tutoriel
 item.bucketTutorial.name=Seau tutoriel
 
+item.record.cd.desc=Cd disque
+
 #CreativeTabs
 itemGroup.TutorialCreativeTabs=Tutoriel Table Créative
 
 #Container
 container.bigchest=Grand coffre
-container.cupboard=Placard
+container.cupboard=Placard
+
+#Other
+last.users=Derniers utilisateurs : %s

assets/modtutoriel/sounds.json

@@ -0,0 +1,19 @@
+{
+  "explosion": {
+    "category": "player",
+    "sounds": [
+      "explosion1",
+      "explosion2",
+      "explosion3"
+    ]
+  },
+  "records.tuto": {
+    "category": "record",
+    "sounds": [
+      {
+        "name": "records/tuto",
+        "stream": true
+      }
+    ]
+  }
+}

tutoriel/client/GuiBigChest.java

@@ -26,8 +26,8 @@ public GuiBigChest(InventoryPlayer inventory, TileEntityBigChest tileEntity)
 
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
     {
-        this.fontRenderer.drawString(this.playerInventory.isInvNameLocalized() ? this.playerInventory.getInvName() : I18n.getString(this.playerInventory.getInvName()), 8, 129, 0);
-        this.fontRenderer.drawString(this.bigChest.isInvNameLocalized() ? this.bigChest.getInvName() : I18n.getString(this.bigChest.getInvName()), 8, 7, 0);
+        this.fontRendererObj.drawString(this.playerInventory.hasCustomInventoryName() ? this.playerInventory.getInventoryName() : I18n.format(this.playerInventory.getInventoryName()), 8, 129, 0);
+        this.fontRendererObj.drawString(this.bigChest.hasCustomInventoryName() ? this.bigChest.getInventoryName() : I18n.format(this.bigChest.getInventoryName()), 8, 7, 0);
     }
 
 	@Override

tutoriel/client/GuiCupboard.java

@@ -27,8 +27,8 @@ public GuiCupboard(InventoryPlayer playerInv, TileEntityCupboard tileCupboard)
 
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
     {
-        this.fontRenderer.drawString(this.playerInventory.isInvNameLocalized() ? this.playerInventory.getInvName() : I18n.getString(this.playerInventory.getInvName()), 8, 129, 0);
-        this.fontRenderer.drawString(this.cupboard.isInvNameLocalized() ? this.cupboard.getInvName() : I18n.getString(this.cupboard.getInvName()), 8, 7, 0);
+        this.fontRendererObj.drawString(this.playerInventory.hasCustomInventoryName() ? this.playerInventory.getInventoryName() : I18n.format(this.playerInventory.getInventoryName()), 8, 129, 0);
+        this.fontRendererObj.drawString(this.cupboard.hasCustomInventoryName() ? this.cupboard.getInventoryName() : I18n.format(this.cupboard.getInventoryName()), 8, 7, 0);
     }
 
 	@Override

tutoriel/client/RenderMobTutorialHealthBar.java

@@ -9,7 +9,7 @@
 
 public class RenderMobTutorialHealthBar extends RenderLiving
 {
-	protected static final ResourceLocation texture = new ResourceLocation("ModID:texture.png");
+	protected static final ResourceLocation texture = new ResourceLocation("modtutoriel:textures/entity/boss.png");
 
 	public RenderMobTutorialHealthBar()
 	{
@@ -29,7 +29,7 @@ protected ResourceLocation getEntityTexture(Entity par1Entity)
 	public void renderHealtBar(MobTutorialHealthBar mob, double x, double y, double z, float par8, float par9)
 	{
 		BossStatus.setBossStatus(mob, true);
-		super.doRenderLiving(mob, x, y, z, par8, par9);
+		super.doRender(mob, x, y, z, par8, par9);
 	}
 
 	public void doRender(Entity entity, double x, double y, double z, float par8, float par9)

tutoriel/client/RenderTable.java

@@ -37,7 +37,7 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b
 	}
 
 	@Override
-	public boolean shouldRender3DInInventory()
+	public boolean shouldRender3DInInventory(int modelId)
 	{
 		return true;
 	}

tutoriel/proxy/TESRInventoryRenderer.java → tutoriel/client/TESRInventoryRenderer.java

@@ -1,11 +1,11 @@
-package tutoriel.proxy;
+package tutoriel.client;
 
 import java.util.HashMap;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-import tutoriel.client.IInventoryRenderer;
+import tutoriel.proxy.TutoClientProxy;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 
 public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
@@ -58,7 +58,7 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b
 	}
 
 	@Override
-	public boolean shouldRender3DInInventory()
+	public boolean shouldRender3DInInventory(int modelId)
 	{
 		return true;
 	}

tutoriel/client/TextureEvent.java

@@ -1,18 +1,18 @@
 package tutoriel.client;
 
 import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.event.ForgeSubscribe;
 import tutoriel.common.ModTutoriel;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class TextureEvent
 {
-	@ForgeSubscribe
+	@SubscribeEvent
 	@SideOnly(Side.CLIENT)
 	public void onPostTextureStitch(TextureStitchEvent.Post event)
 	{
-		if(event.map.textureType == 0)
+		if(event.map.getTextureType() == 0)
 		{
 			ModTutoriel.fluidTutorial.setIcons(ModTutoriel.blockFluidTutorial.getBlockTextureFromSide(1), ModTutoriel.blockFluidTutorial.getBlockTextureFromSide(2));
 		}

tutoriel/client/TileEntityCupboardSpecialRender.java

@@ -1,6 +1,6 @@
 package tutoriel.client;
 
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
@@ -16,7 +16,7 @@ public class TileEntityCupboardSpecialRender extends TileEntitySpecialRenderer i
 
 	public TileEntityCupboardSpecialRender()
 	{
-		this.setTileEntityRenderer(TileEntityRenderer.instance);
+		this.func_147497_a(TileEntityRendererDispatcher.instance);
 	}
 
 	@Override

tutoriel/client/TileEntityMachineSpecialRender.java

@@ -1,6 +1,6 @@
 package tutoriel.client;
 
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
@@ -16,7 +16,7 @@ public class TileEntityMachineSpecialRender extends TileEntitySpecialRenderer im
 
 	public TileEntityMachineSpecialRender()
 	{
-		this.setTileEntityRenderer(TileEntityRenderer.instance);
+		this.func_147497_a(TileEntityRendererDispatcher.instance);
 	}
 
 	@Override

tutoriel/client/TileEntitySculptureSpecialRender.java

@@ -1,6 +1,6 @@
 package tutoriel.client;
 
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
@@ -15,7 +15,7 @@ public class TileEntitySculptureSpecialRender extends TileEntitySpecialRenderer
 	public static final ResourceLocation textureLocation = new ResourceLocation("modtutoriel", "textures/blocks/modelTutoriel.png");
 	public TileEntitySculptureSpecialRender()
 	{
-		this.setTileEntityRenderer(TileEntityRenderer.instance);
+		this.func_147497_a(TileEntityRendererDispatcher.instance);
 	}
 
 	@Override

tutoriel/common/BlockCakeTutorial.java

@@ -4,32 +4,33 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockCakeTutorial extends Block
 {
-	private Icon cakeTopIcon, cakeBottomIcon, cakeInnerIcon;
+	private IIcon cakeTopIcon, cakeBottomIcon, cakeInnerIcon;
 
-	public BlockCakeTutorial(int id)
+	public BlockCakeTutorial()
 	{
-		super(id, Material.cake);
+		super(Material.cake);
 		this.setTickRandomly(true);
 		this.setCreativeTab(ModTutoriel.TutorialCreativeTabs);
 	}
 
-	public Icon getIcon(int icon1, int icon2)
+	public IIcon getIcon(int icon1, int icon2)
 	{
 		return icon1 == 1 ? this.cakeTopIcon : (icon1 == 0 ? this.cakeBottomIcon : (icon2 > 0 && icon1 == 4 ? this.cakeInnerIcon : this.blockIcon));
 	}
 
-	public void registerIcons(IconRegister iconregister)
+	public void registerBlockIcons(IIconRegister iconregister)
 	{
 		this.blockIcon = iconregister.registerIcon("modtutoriel:caketuto_side");
 		this.cakeInnerIcon = iconregister.registerIcon("modtutoriel:caketuto_inner");
@@ -126,7 +127,7 @@ public void onNeighborBlockChange(World world, int x, int y, int z)
 
 	public boolean canBlockStay(World world, int x, int y, int z)
 	{
-		return world.getBlockMaterial(x, y - 1, z).isSolid();
+		return world.getBlock(x, y - 1, z).getMaterial().isSolid();
 	}
 
 	public int quantityDropped(Random random)
@@ -138,9 +139,10 @@ public int idDropped(int id, Random random, int par3)
 	{
 		return 0;
 	}
-
-	public int idPicked(World world, int x, int y, int z)
-	{
-		return ModTutoriel.ItemTutorialCake.itemID;
-	}
+
+    @SideOnly(Side.CLIENT)
+    public Item getItem(World world, int x, int y, int z)
+    {
+        return ModTutoriel.ItemTutorialCake;
+    }
 }

tutoriel/common/BlockFluidTutorial.java

@@ -1,36 +1,36 @@
 package tutoriel.common;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.util.Icon;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidClassic;
 import net.minecraftforge.fluids.Fluid;
 
 public class BlockFluidTutorial extends BlockFluidClassic
 {
-	private Icon stillIcon, flowingIcon;
+	private IIcon stillIcon, flowingIcon;
 
-	public BlockFluidTutorial(int id, Fluid fluid, Material material)
+	public BlockFluidTutorial(Fluid fluid, Material material)
 	{
-		super(id, fluid, material);
+		super(fluid, material);
 	}
 
-	public Icon getIcon(int side, int meta)
+	public IIcon getIcon(int side, int meta)
 	{
 		return (side == 0 || side == 1) ? stillIcon : flowingIcon;
 	}
 
-	public void registerIcons(IconRegister register)
+	public void registerBlockIcons(IIconRegister register)
 	{
 		stillIcon = register.registerIcon("modtutoriel:tuto_fluid_still");
 		flowingIcon = register.registerIcon("modtutoriel:tuto_fluid_flow");
 	}
 
 	public boolean canDisplace(IBlockAccess world, int x, int y, int z)
 	{
-		if(world.getBlockMaterial(x, y, z).isLiquid())
+		if(world.getBlock(x, y, z).getMaterial().isLiquid())
 		{
 			return false;
 		}
@@ -39,7 +39,7 @@ public boolean canDisplace(IBlockAccess world, int x, int y, int z)
 
 	public boolean displaceIfPossible(World world, int x, int y, int z)
 	{
-		if(world.getBlockMaterial(x, y, z).isLiquid())
+		if(world.getBlock(x, y, z).getMaterial().isLiquid())
 		{
 			return false;
 		}