diff --git a/.gitignore b/.gitignore index b9cf89b..447f511 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata .classpath -.gradle/ .project -.settings/ -bin/ -eclipse/ -gradle/ + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle +gradle gradlew gradlew.bat + +# other +eclipse +run diff --git a/build.gradle b/build.gradle index af30b15..8d70e9e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,70 +1,82 @@ -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - -apply plugin: 'forge' - -version = "1.0" -group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "modid" - -minecraft { - version = "1.8-11.14.3.1450" - runDir = "eclipse" - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not allways work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20141130" -} - -dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - -} - -processResources -{ - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} +/* +// For those who want the bleeding edge +buildscript { + repositories { + jcenter() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' + } +} +apply plugin: 'net.minecraftforge.gradle.forge' +*/ + +// for people who want stable +plugins { + id "net.minecraftforge.gradle.forge" version "2.0.2" +} + +version = "1.0" +group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "modid" + +minecraft { + version = "1.8-11.14.4.1563" + runDir = "run" + + // the mappings can be changed at any time, and must be in the following format. + // snapshot_YYYYMMDD snapshot are built nightly. + // stable_# stables are built at the discretion of the MCP team. + // Use non-default mappings at your own risk. they may not allways work. + // simply re-run your setup task after changing the mappings to update your workspace. + mappings = "snapshot_20141130" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. +} + +dependencies { + // you may put jars on which you depend on in ./libs + // or you may define them like so.. + //compile "some.group:artifact:version:classifier" + //compile "some.group:artifact:version" + + // real examples + //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, + // except that these dependencies get remapped to your current MCP mappings + //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' + //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // for more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + +} + +processResources +{ + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} diff --git a/src/main/java/com/samsoule63/luckyWaking/LuckyWakingMod.java b/src/main/java/com/samsoule63/luckyWaking/LuckyWakingMod.java index 7118959..a40fada 100644 --- a/src/main/java/com/samsoule63/luckyWaking/LuckyWakingMod.java +++ b/src/main/java/com/samsoule63/luckyWaking/LuckyWakingMod.java @@ -1,9 +1,5 @@ package com.samsoule63.luckyWaking; -import com.samsoule63.luckyWaking.init.LuckyWakingBlocks; -import com.samsoule63.luckyWaking.init.LuckyWakingItems; -import com.samsoule63.luckyWaking.proxy.ProxyCommon; - import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.SidedProxy; @@ -11,31 +7,34 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = References.MODID, name = References.MODNAME, version = References.VERSION) -public class LuckyWakingMod -{ - @SidedProxy(clientSide = References.CLIENT_PROXY, serverSide = References.COMMON_PROXY) - public static ProxyCommon proxy; - - @EventHandler - public void preInit(FMLPreInitializationEvent event) - { - LuckyWakingItems.init(); - LuckyWakingItems.register(); - LuckyWakingBlocks.init(); - LuckyWakingBlocks.register(); - } +import com.samsoule63.luckyWaking.init.LuckyWakingBlocks; +import com.samsoule63.luckyWaking.init.LuckyWakingItems; +import com.samsoule63.luckyWaking.init.LuckyWakingRecipies; +import com.samsoule63.luckyWaking.proxy.CommonProxy; - @EventHandler - public void init(FMLInitializationEvent event) - { - proxy.registerRenders(); - } - - @EventHandler - public void postInit(FMLPostInitializationEvent event) - { - - } +@Mod(modid=References.MOD_ID,name = References.MOD_NAME,version = References.VERSION) +public class LuckyWakingMod { + @SidedProxy(clientSide = References.CLIENT_PROXY , serverSide = References.COMMON_PROXY) + public static CommonProxy proxy; + + @EventHandler + public void preInit(FMLPreInitializationEvent event){ + LuckyWakingItems.init(); + LuckyWakingItems.register(); + LuckyWakingBlocks.init(); + LuckyWakingBlocks.register(); + LuckyWakingRecipies.registerCrafts(); + } + @EventHandler + public void init(FMLInitializationEvent event){ + + proxy.registerRenders(); + + } + @EventHandler + public void postInit(FMLPostInitializationEvent event){ + + } + } diff --git a/src/main/java/com/samsoule63/luckyWaking/References.java b/src/main/java/com/samsoule63/luckyWaking/References.java index 799013d..b50e75b 100644 --- a/src/main/java/com/samsoule63/luckyWaking/References.java +++ b/src/main/java/com/samsoule63/luckyWaking/References.java @@ -1,10 +1,11 @@ package com.samsoule63.luckyWaking; -public class References -{ - public static final String MODID = "luckyW"; - public static final String MODNAME = "Lucky Waking"; - public static final String VERSION = "1.0"; - public static final String CLIENT_PROXY = "com.samsoule63.luckyWaking.proxy.ProxyClient"; - public static final String COMMON_PROXY = "com.samsoule63.luckyWaking.proxy.ProxyCommon"; +public class References { + + public static final String MOD_ID = "luckywaking"; + public static final String MOD_NAME = "Lucky Waking ?"; + public static final String VERSION = "1.0"; + public static final String CLIENT_PROXY = "com.samsoule63.luckyWaking.proxy.ClientProxy"; + public static final String COMMON_PROXY = "com.samsoule63.luckyWaking.proxy.CommonProxy"; + } diff --git a/src/main/java/com/samsoule63/luckyWaking/blocks/StarBlock.java b/src/main/java/com/samsoule63/luckyWaking/blocks/StarBlock.java index 0062965..d2e8e9d 100644 --- a/src/main/java/com/samsoule63/luckyWaking/blocks/StarBlock.java +++ b/src/main/java/com/samsoule63/luckyWaking/blocks/StarBlock.java @@ -3,13 +3,10 @@ package com.samsoule63.luckyWaking.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -public class StarBlock extends Block -{ +public class StarBlock extends Block{ - public StarBlock(Material materialIn) - { - super(materialIn); - // TODO Auto-generated constructor stub - } + public StarBlock(Material materialIn) { + super(materialIn); + } } diff --git a/src/main/java/com/samsoule63/luckyWaking/event/OnPlayerSleep.java b/src/main/java/com/samsoule63/luckyWaking/event/OnPlayerSleep.java deleted file mode 100644 index 4638fd7..0000000 --- a/src/main/java/com/samsoule63/luckyWaking/event/OnPlayerSleep.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.samsoule63.luckyWaking.event; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; - -public class OnPlayerSleep -{ - public static void onPlayerSleep(EntityPlayer player, BlockPos pos){ - System.out.println("!!!!****µµµµ$$$$££££"+player.toString()+"sleep in "+pos.toString()); - } -} diff --git a/src/main/java/com/samsoule63/luckyWaking/event/OnPlayerWakeUp.java b/src/main/java/com/samsoule63/luckyWaking/event/OnPlayerWakeUp.java deleted file mode 100644 index 178ed8a..0000000 --- a/src/main/java/com/samsoule63/luckyWaking/event/OnPlayerWakeUp.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.samsoule63.luckyWaking.event; - -import tv.twitch.chat.ChatMessageToken; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - -public class OnPlayerWakeUp -{ - public static void playerWakeUp(EntityPlayer player, boolean wakeImmediatly, boolean updateWorld, boolean setSpawn) - { - int z = (int)(Math.random() * 2); - switch(z) - { - case 0: - player.addChatComponentMessage(new ChatComponentText("Ca te dit une barre de vie en plus ?"));; - player.setAbsorptionAmount(player.getAbsorptionAmount() + 20); - break; - case 1: - player.addChatComponentMessage(new ChatComponentText("Ca te dit 100 niveaux en plus ?"));; - player.addExperienceLevel(100); - break; - default: - player.addChatComponentMessage(new ChatComponentText("Rien aujourdhui ..."));; - - break; - } - } -} diff --git a/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingBlocks.java b/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingBlocks.java index b085478..568a8cd 100644 --- a/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingBlocks.java +++ b/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingBlocks.java @@ -1,8 +1,5 @@ package com.samsoule63.luckyWaking.init; -import com.samsoule63.luckyWaking.References; -import com.samsoule63.luckyWaking.blocks.StarBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -11,28 +8,27 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; -public class LuckyWakingBlocks -{ - public static Block starBlock; +import com.samsoule63.luckyWaking.References; +import com.samsoule63.luckyWaking.blocks.StarBlock; - public static void init() - { - starBlock = new StarBlock(Material.ground).setUnlocalizedName("starBlock").setCreativeTab(CreativeTabs.tabBlock); - } +public class LuckyWakingBlocks { - public static void register() - { - GameRegistry.registerBlock(starBlock,starBlock.getUnlocalizedName().substring(5)); - } + public static Block starBlock; - public static void registerRenders() - { - registerRender(starBlock); - } + public static void init() { + starBlock = new StarBlock(Material.ice).setUnlocalizedName("starBlock").setCreativeTab(CreativeTabs.tabBlock); + } - public static void registerRender(Block block) - { - Item item = Item.getItemFromBlock(block); - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(References.MODID + ":" + item.getUnlocalizedName().substring(5), "inventory")); - } + public static void register() { + GameRegistry.registerBlock(starBlock, starBlock.getUnlocalizedName().substring(5)); + } + + public static void registerRenders() { + registerRender(starBlock); + } + + public static void registerRender(Block block) { + Item item = Item.getItemFromBlock(block); + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(References.MOD_ID + ":" + item.getUnlocalizedName().substring(5), "inventory")); + } } diff --git a/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingItems.java b/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingItems.java index ba82295..4d4dc35 100644 --- a/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingItems.java +++ b/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingItems.java @@ -1,34 +1,60 @@ package com.samsoule63.luckyWaking.init; -import com.samsoule63.luckyWaking.References; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; -public class LuckyWakingItems -{ - public static Item itemBasic; +import com.samsoule63.luckyWaking.References; +import com.samsoule63.luckyWaking.items.armors.UselessArmor; +import com.samsoule63.luckyWaking.items.tools.LuckyWakingToolsMaterials; +import com.samsoule63.luckyWaking.items.tools.UselessPickaxe; +import com.samsoule63.luckyWaking.items.tools.UselessSword; - public static void init() - { - itemBasic = new Item().setUnlocalizedName("itemBasic").setCreativeTab(CreativeTabs.tabMisc); - } +public class LuckyWakingItems { - public static void register() - { - GameRegistry.registerItem(itemBasic, "itemBasic"); - } + public static Item theUselessItem; + public static Item uselessPickaxe; + public static Item uselessSword; + public static Item uselessHelmet; + public static Item uselessChestplate; + public static Item uselessLeggins; + public static Item uselessBoots; - public static void registerRenders() - { - registerRender(itemBasic); - } + public static void init() { + theUselessItem = new Item().setUnlocalizedName("theUselessItem").setCreativeTab(CreativeTabs.tabMisc); + uselessPickaxe = new UselessPickaxe(LuckyWakingToolsMaterials.uselessTool).setUnlocalizedName("uselessPickaxe").setCreativeTab(CreativeTabs.tabTools); + uselessSword = new UselessSword(LuckyWakingToolsMaterials.uselessTool).setUnlocalizedName("uselessSword").setCreativeTab(CreativeTabs.tabCombat); + uselessHelmet = new UselessArmor(UselessArmor.uselessArmor,0).setUnlocalizedName("uselessHelmet"); + uselessChestplate = new UselessArmor(UselessArmor.uselessArmor, 1).setUnlocalizedName("uselessChestplate"); + uselessLeggins = new UselessArmor(UselessArmor.uselessArmor, 2).setUnlocalizedName("uselessLeggins"); + uselessBoots = new UselessArmor(UselessArmor.uselessArmor, 3).setUnlocalizedName("uselessBoots"); + } + + public static void register() { + GameRegistry.registerItem(theUselessItem, theUselessItem.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(uselessPickaxe, uselessPickaxe.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(uselessSword, uselessSword.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(uselessHelmet, uselessHelmet.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(uselessChestplate, uselessChestplate.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(uselessLeggins, uselessLeggins.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(uselessBoots, uselessBoots.getUnlocalizedName().substring(5)); + + } + + public static void registerRenders() { + registerRender(theUselessItem); + registerRender(uselessPickaxe); + registerRender(uselessSword); + registerRender(uselessHelmet); + registerRender(uselessChestplate); + registerRender(uselessLeggins); + registerRender(uselessBoots); + } + + public static void registerRender(Item item) { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(References.MOD_ID + ":" + item.getUnlocalizedName().substring(5), "inventory")); + } - public static void registerRender(Item item) - { - Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(References.MODID + ":" + item.getUnlocalizedName().substring(5), "inventory")); - } } diff --git a/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingRecipies.java b/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingRecipies.java new file mode 100644 index 0000000..70fb4ca --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingRecipies.java @@ -0,0 +1,24 @@ +package com.samsoule63.luckyWaking.init; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; + +public class LuckyWakingRecipies { + + public static void registerCrafts() { + GameRegistry.addRecipe(new ItemStack(LuckyWakingItems.theUselessItem, 4), new Object[]{"FFR", "S R", "SPP", 'S', Items.flint, 'P', Items.feather, 'R', Items.dye, 'F', Blocks.leaves}); + GameRegistry.addSmelting(Blocks.carpet, new ItemStack(LuckyWakingItems.theUselessItem, 16), 2f); + + GameRegistry.addRecipe(new ItemStack(LuckyWakingBlocks.starBlock,4),new Object[]{ + " S ", + "SWS", + " S ", + 'S',Items.snowball, + 'W',new ItemStack(Blocks.wool, 4, 15) + }); + } + +} diff --git a/src/main/java/com/samsoule63/luckyWaking/items/armors/UselessArmor.java b/src/main/java/com/samsoule63/luckyWaking/items/armors/UselessArmor.java new file mode 100644 index 0000000..6863e3b --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/items/armors/UselessArmor.java @@ -0,0 +1,29 @@ +package com.samsoule63.luckyWaking.items.armors; + +import com.samsoule63.luckyWaking.References; +import com.samsoule63.luckyWaking.init.LuckyWakingItems; + +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.EnumHelper; + +public class UselessArmor extends ItemArmor { + + public static ArmorMaterial uselessArmor = EnumHelper.addArmorMaterial("uselessArmor", "uselessArmor", 2, new int[]{1, 2, 1, 1}, 100); + + public UselessArmor(ArmorMaterial material, int armorType) { + super(material, 0, armorType); + } + public String getRenderTexture(ItemStack stack, Entity entity, int slot, String type) { + if (stack.getItem() == LuckyWakingItems.uselessLeggins) { + return References.MOD_ID + ":textures/models/armor/uselessArmor_layer_2.png"; + } else if (stack.getItem() == LuckyWakingItems.uselessHelmet + || stack.getItem() == LuckyWakingItems.uselessChestplate + || stack.getItem() == LuckyWakingItems.uselessBoots) { + return References.MOD_ID+":textures/models/armor/uselessArmor_layer_1.png"; + } else { + return null; + } + } +} diff --git a/src/main/java/com/samsoule63/luckyWaking/items/tools/LuckyWakingToolsMaterials.java b/src/main/java/com/samsoule63/luckyWaking/items/tools/LuckyWakingToolsMaterials.java new file mode 100644 index 0000000..ee5cf6f --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/items/tools/LuckyWakingToolsMaterials.java @@ -0,0 +1,9 @@ +package com.samsoule63.luckyWaking.items.tools; + +import net.minecraft.item.Item.ToolMaterial; +import net.minecraftforge.common.util.EnumHelper; + +public class LuckyWakingToolsMaterials { + public static ToolMaterial uselessTool = EnumHelper.addToolMaterial("useless",3, 10, 24.0F, 1.0F,100); + +} diff --git a/src/main/java/com/samsoule63/luckyWaking/items/tools/UselessPickaxe.java b/src/main/java/com/samsoule63/luckyWaking/items/tools/UselessPickaxe.java new file mode 100644 index 0000000..8fb3425 --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/items/tools/UselessPickaxe.java @@ -0,0 +1,14 @@ +package com.samsoule63.luckyWaking.items.tools; + +import net.minecraft.item.ItemPickaxe; +import net.minecraftforge.common.util.EnumHelper; + +public class UselessPickaxe extends ItemPickaxe{ + + + public UselessPickaxe(ToolMaterial material) { + super(material); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/samsoule63/luckyWaking/items/tools/UselessSword.java b/src/main/java/com/samsoule63/luckyWaking/items/tools/UselessSword.java new file mode 100644 index 0000000..c33e41d --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/items/tools/UselessSword.java @@ -0,0 +1,12 @@ +package com.samsoule63.luckyWaking.items.tools; + +import net.minecraft.item.ItemSword; + +public class UselessSword extends ItemSword{ + + public UselessSword(ToolMaterial material) { + super(material); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/com/samsoule63/luckyWaking/proxy/ClientProxy.java b/src/main/java/com/samsoule63/luckyWaking/proxy/ClientProxy.java new file mode 100644 index 0000000..702e0f6 --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/proxy/ClientProxy.java @@ -0,0 +1,13 @@ +package com.samsoule63.luckyWaking.proxy; + +import com.samsoule63.luckyWaking.init.LuckyWakingBlocks; +import com.samsoule63.luckyWaking.init.LuckyWakingItems; + +public class ClientProxy extends CommonProxy{ + + @Override + public void registerRenders(){ + LuckyWakingItems.registerRenders(); + LuckyWakingBlocks.registerRenders(); + } +} diff --git a/src/main/java/com/samsoule63/luckyWaking/proxy/CommonProxy.java b/src/main/java/com/samsoule63/luckyWaking/proxy/CommonProxy.java new file mode 100644 index 0000000..05925a1 --- /dev/null +++ b/src/main/java/com/samsoule63/luckyWaking/proxy/CommonProxy.java @@ -0,0 +1,9 @@ +package com.samsoule63.luckyWaking.proxy; + +public class CommonProxy { + + public void registerRenders() { + + } + +} diff --git a/src/main/java/com/samsoule63/luckyWaking/proxy/ProxyClient.java b/src/main/java/com/samsoule63/luckyWaking/proxy/ProxyClient.java deleted file mode 100644 index e1ee05d..0000000 --- a/src/main/java/com/samsoule63/luckyWaking/proxy/ProxyClient.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.samsoule63.luckyWaking.proxy; - -import com.samsoule63.luckyWaking.init.LuckyWakingBlocks; -import com.samsoule63.luckyWaking.init.LuckyWakingItems; - -public class ProxyClient extends ProxyCommon -{ - @Override - public void registerRenders() - { - LuckyWakingItems.registerRenders(); - LuckyWakingBlocks.registerRenders(); - } - -} diff --git a/src/main/java/com/samsoule63/luckyWaking/proxy/ProxyCommon.java b/src/main/java/com/samsoule63/luckyWaking/proxy/ProxyCommon.java deleted file mode 100644 index 08c9f07..0000000 --- a/src/main/java/com/samsoule63/luckyWaking/proxy/ProxyCommon.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.samsoule63.luckyWaking.proxy; - -public class ProxyCommon -{ - - public void registerRenders() - { - - } - -} diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java deleted file mode 100644 index 0bc3da2..0000000 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.minecraftforge.event.entity.player; - -import com.samsoule63.luckyWaking.event.OnPlayerSleep; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayer.EnumStatus; -import net.minecraft.util.BlockPos; -import net.minecraft.entity.player.EntityPlayer.EnumStatus; -/** - * PlayerSleepInBedEvent is fired when a player sleeps in a bed. - *
- * This event is fired whenever a player sleeps in a bed in - * EntityPlayer#sleepInBedAt(BlockPos).
- *
- * {@link #result} contains whether the player is able to sleep.
- *
- * This event is not {@link Cancelable}. - *
- * This event does not have a result. {@link HasResult} - *
- * This event is fired on the {@link MinecraftForge#EVENT_BUS}. - **/ -public class PlayerSleepInBedEvent extends PlayerEvent -{ - public EnumStatus result = null; - public final BlockPos pos; - - public PlayerSleepInBedEvent(EntityPlayer player, BlockPos pos) - { - super(player); - OnPlayerSleep.onPlayerSleep(player, pos); - this.pos = pos; - } - -} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerWakeUpEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerWakeUpEvent.java deleted file mode 100644 index aa1c5a0..0000000 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerWakeUpEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.minecraftforge.event.entity.player; - -import com.samsoule63.luckyWaking.event.OnPlayerWakeUp; - -import net.minecraft.entity.player.EntityPlayer; - -/** - * This event is fired when the player is waking up.
- * This is merely for purposes of listening for this to happen.
- * There is nothing that can be manipulated with this event. - */ -public class PlayerWakeUpEvent extends PlayerEvent -{ - /** - * Used for the 'wake up animation'. - * This is false if the player is considered 'sleepy' and the overlay should slowly fade away. - */ - public final boolean wakeImmediatly; - - /** - * Indicates if the server should be notified of sleeping changes. - * This will only be false if the server is considered 'up to date' already, because, for example, it initiated the call. - */ - public final boolean updateWorld; - - /** - * Indicates if the player's sleep was considered successful. - * In vanilla, this is used to determine if the spawn chunk is to be set to the bed's position. - */ - public final boolean setSpawn; - - public PlayerWakeUpEvent(EntityPlayer player, boolean wakeImmediatly, boolean updateWorld, boolean setSpawn) - { - super(player); - this.wakeImmediatly = wakeImmediatly; - this.updateWorld = updateWorld; - this.setSpawn = setSpawn; - OnPlayerWakeUp.playerWakeUp(player, wakeImmediatly, updateWorld, setSpawn); - } -} \ No newline at end of file diff --git a/src/main/resources/assets/luckyW/blockstates/starBlock.json b/src/main/resources/assets/luckyW/blockstates/starBlock.json deleted file mode 100644 index 4059b03..0000000 --- a/src/main/resources/assets/luckyW/blockstates/starBlock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "normal": [ - { "model": "luckyW:starBlock" }, - ] - } -} diff --git a/src/main/resources/assets/luckyW/lang/fr_FR.lang b/src/main/resources/assets/luckyW/lang/fr_FR.lang deleted file mode 100644 index 2cc35ec..0000000 --- a/src/main/resources/assets/luckyW/lang/fr_FR.lang +++ /dev/null @@ -1,3 +0,0 @@ -item.itemBasic.name=Item Basique - -tile.starBlock.name=Bloc étoile \ No newline at end of file diff --git a/src/main/resources/assets/luckyW/textures/items/itemBasic.png b/src/main/resources/assets/luckyW/textures/items/itemBasic.png deleted file mode 100644 index 7f5189f..0000000 Binary files a/src/main/resources/assets/luckyW/textures/items/itemBasic.png and /dev/null differ diff --git a/src/main/resources/assets/luckywaking/blockstates/starBlock.json b/src/main/resources/assets/luckywaking/blockstates/starBlock.json new file mode 100644 index 0000000..c357b31 --- /dev/null +++ b/src/main/resources/assets/luckywaking/blockstates/starBlock.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "luckywaking:starBlock" } + } +} diff --git a/src/main/resources/assets/luckywaking/lang/fr_FR.lang b/src/main/resources/assets/luckywaking/lang/fr_FR.lang new file mode 100644 index 0000000..9d54923 --- /dev/null +++ b/src/main/resources/assets/luckywaking/lang/fr_FR.lang @@ -0,0 +1,5 @@ +item.theUselessItem.name=The Useless Item +item.uselessPickaxe.name=La pioche de l'inutilit? +item.uselessSword.name=L'?p?e de l'inutilit? + +tile.starBlock.name=§8Star block !!! \ No newline at end of file diff --git a/src/main/resources/assets/luckyW/models/block/starBlock.json b/src/main/resources/assets/luckywaking/models/block/starBlock.json similarity index 53% rename from src/main/resources/assets/luckyW/models/block/starBlock.json rename to src/main/resources/assets/luckywaking/models/block/starBlock.json index eddebba..e764417 100644 --- a/src/main/resources/assets/luckyW/models/block/starBlock.json +++ b/src/main/resources/assets/luckywaking/models/block/starBlock.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "luckyw:item/starBlock" + "all": "luckywaking:blocks/starBlock" } } diff --git a/src/main/resources/assets/luckyW/models/item/starBlock.json b/src/main/resources/assets/luckywaking/models/item/starBlock.json similarity index 78% rename from src/main/resources/assets/luckyW/models/item/starBlock.json rename to src/main/resources/assets/luckywaking/models/item/starBlock.json index 4995087..1763a84 100644 --- a/src/main/resources/assets/luckyW/models/item/starBlock.json +++ b/src/main/resources/assets/luckywaking/models/item/starBlock.json @@ -1,5 +1,5 @@ { - "parent": "luckyW:block/starBlock", + "parent": "luckywaking:block/starBlock", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/luckyW/models/item/itemBasic.json b/src/main/resources/assets/luckywaking/models/item/theUselessItem.json similarity index 84% rename from src/main/resources/assets/luckyW/models/item/itemBasic.json rename to src/main/resources/assets/luckywaking/models/item/theUselessItem.json index 3230f3b..edefd20 100644 --- a/src/main/resources/assets/luckyW/models/item/itemBasic.json +++ b/src/main/resources/assets/luckywaking/models/item/theUselessItem.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "luckyW:items/itemBasic" + "layer0": "luckywaking:items/theUselessItem" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/luckywaking/models/item/uselessBoots.json b/src/main/resources/assets/luckywaking/models/item/uselessBoots.json new file mode 100644 index 0000000..11fe027 --- /dev/null +++ b/src/main/resources/assets/luckywaking/models/item/uselessBoots.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "luckyWaking:items/uselessBoots" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -2.5 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/luckywaking/models/item/uselessChestplate.json b/src/main/resources/assets/luckywaking/models/item/uselessChestplate.json new file mode 100644 index 0000000..6c416b2 --- /dev/null +++ b/src/main/resources/assets/luckywaking/models/item/uselessChestplate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "luckyWaking:items/uselessChestplate" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/luckywaking/models/item/uselessHelmet.json b/src/main/resources/assets/luckywaking/models/item/uselessHelmet.json new file mode 100644 index 0000000..4505caa --- /dev/null +++ b/src/main/resources/assets/luckywaking/models/item/uselessHelmet.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "luckyWaking:items/uselessHelmet" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -2.25 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/luckywaking/models/item/uselessLeggins.json b/src/main/resources/assets/luckywaking/models/item/uselessLeggins.json new file mode 100644 index 0000000..5b42592 --- /dev/null +++ b/src/main/resources/assets/luckywaking/models/item/uselessLeggins.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "luckyWaking:items/uselessLeggins" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/luckywaking/models/item/uselessPickaxe.json b/src/main/resources/assets/luckywaking/models/item/uselessPickaxe.json new file mode 100644 index 0000000..1ce3d34 --- /dev/null +++ b/src/main/resources/assets/luckywaking/models/item/uselessPickaxe.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "luckyWaking:items/uselessPickaxe" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/luckywaking/models/item/uselessSword.json b/src/main/resources/assets/luckywaking/models/item/uselessSword.json new file mode 100644 index 0000000..406cbbb --- /dev/null +++ b/src/main/resources/assets/luckywaking/models/item/uselessSword.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "luckyWaking:items/uselessSword" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/luckyW/textures/blocks/starBlock.png b/src/main/resources/assets/luckywaking/textures/blocks/starBlock.png similarity index 100% rename from src/main/resources/assets/luckyW/textures/blocks/starBlock.png rename to src/main/resources/assets/luckywaking/textures/blocks/starBlock.png diff --git a/src/main/resources/assets/luckywaking/textures/items/theUselessItem.png b/src/main/resources/assets/luckywaking/textures/items/theUselessItem.png new file mode 100644 index 0000000..0f4fda5 Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/theUselessItem.png differ diff --git a/src/main/resources/assets/luckywaking/textures/items/uselessBoots.png b/src/main/resources/assets/luckywaking/textures/items/uselessBoots.png new file mode 100644 index 0000000..41a8e61 Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/uselessBoots.png differ diff --git a/src/main/resources/assets/luckywaking/textures/items/uselessChestplate.png b/src/main/resources/assets/luckywaking/textures/items/uselessChestplate.png new file mode 100644 index 0000000..a646db2 Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/uselessChestplate.png differ diff --git a/src/main/resources/assets/luckywaking/textures/items/uselessHelmet.png b/src/main/resources/assets/luckywaking/textures/items/uselessHelmet.png new file mode 100644 index 0000000..ff2877e Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/uselessHelmet.png differ diff --git a/src/main/resources/assets/luckywaking/textures/items/uselessLeggins.png b/src/main/resources/assets/luckywaking/textures/items/uselessLeggins.png new file mode 100644 index 0000000..68abb54 Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/uselessLeggins.png differ diff --git a/src/main/resources/assets/luckywaking/textures/items/uselessPickaxe.png b/src/main/resources/assets/luckywaking/textures/items/uselessPickaxe.png new file mode 100644 index 0000000..ac7e407 Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/uselessPickaxe.png differ diff --git a/src/main/resources/assets/luckywaking/textures/items/uselessSword.png b/src/main/resources/assets/luckywaking/textures/items/uselessSword.png new file mode 100644 index 0000000..30d8a1e Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/items/uselessSword.png differ diff --git a/src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_1.png b/src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_1.png new file mode 100644 index 0000000..1803dce Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_1.png differ diff --git a/src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_2.png b/src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_2.png new file mode 100644 index 0000000..efd0748 Binary files /dev/null and b/src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_2.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9c2e716..784fa92 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,14 +1,14 @@ [ { - "modid": "luckyW", - "name": "Lucky Waking", - "description": "Ton réveil sera-t-il chanceux ?", + "modid": "luckyWaking", + "name": "Lucky waking ?", + "description": "I wish you a good waking ... or not.", "version": "${version}", "mcversion": "${mcversion}", - "url": "", + "url": "www.samsite.olympe.in", "updateUrl": "", "authorList": ["Samsoule63"], - "credits": "... I don't know", + "credits": "Thanks for ... everybody who has download my mod !", "logoFile": "", "screenshots": [], "dependencies": []