From 6f28e76e9b8bc21629fd060a293a4421375ade3f Mon Sep 17 00:00:00 2001 From: Mysaa Date: Mon, 24 May 2021 01:58:24 +0200 Subject: [PATCH] =?UTF-8?q?OUps,=20j'ai=20fait=20les=20commits=20=C3=A0=20?= =?UTF-8?q?l'envers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 26 ++- build.gradle | 152 ++++++++++-------- .../luckyWaking/LuckyWakingMod.java | 57 ++++--- .../samsoule63/luckyWaking/References.java | 15 +- .../luckyWaking/blocks/StarBlock.java | 11 +- .../luckyWaking/event/OnPlayerSleep.java | 11 -- .../luckyWaking/event/OnPlayerWakeUp.java | 29 ---- .../luckyWaking/init/LuckyWakingBlocks.java | 42 +++-- .../luckyWaking/init/LuckyWakingItems.java | 68 +++++--- .../luckyWaking/init/LuckyWakingRecipies.java | 24 +++ .../items/armors/UselessArmor.java | 29 ++++ .../tools/LuckyWakingToolsMaterials.java | 9 ++ .../items/tools/UselessPickaxe.java | 14 ++ .../luckyWaking/items/tools/UselessSword.java | 12 ++ .../luckyWaking/proxy/ClientProxy.java | 13 ++ .../luckyWaking/proxy/CommonProxy.java | 9 ++ .../luckyWaking/proxy/ProxyClient.java | 15 -- .../luckyWaking/proxy/ProxyCommon.java | 11 -- .../entity/player/PlayerSleepInBedEvent.java | 35 ---- .../entity/player/PlayerWakeUpEvent.java | 40 ----- .../assets/luckyW/blockstates/starBlock.json | 7 - .../resources/assets/luckyW/lang/fr_FR.lang | 3 - .../luckyW/textures/items/itemBasic.png | Bin 1207 -> 0 bytes .../luckywaking/blockstates/starBlock.json | 5 + .../assets/luckywaking/lang/fr_FR.lang | 5 + .../models/block/starBlock.json | 2 +- .../models/item/starBlock.json | 2 +- .../models/item/theUselessItem.json} | 2 +- .../luckywaking/models/item/uselessBoots.json | 18 +++ .../models/item/uselessChestplate.json | 18 +++ .../models/item/uselessHelmet.json | 18 +++ .../models/item/uselessLeggins.json | 18 +++ .../models/item/uselessPickaxe.json | 18 +++ .../luckywaking/models/item/uselessSword.json | 18 +++ .../textures/blocks/starBlock.png | Bin .../textures/items/theUselessItem.png | Bin 0 -> 1223 bytes .../textures/items/uselessBoots.png | Bin 0 -> 216 bytes .../textures/items/uselessChestplate.png | Bin 0 -> 226 bytes .../textures/items/uselessHelmet.png | Bin 0 -> 204 bytes .../textures/items/uselessLeggins.png | Bin 0 -> 197 bytes .../textures/items/uselessPickaxe.png | Bin 0 -> 320 bytes .../textures/items/uselessSword.png | Bin 0 -> 355 bytes .../models/armor/uselessArmor_layer_1.png | Bin 0 -> 479 bytes .../models/armor/uselessArmor_layer_2.png | Bin 0 -> 253 bytes src/main/resources/mcmod.info | 10 +- 45 files changed, 445 insertions(+), 321 deletions(-) delete mode 100644 src/main/java/com/samsoule63/luckyWaking/event/OnPlayerSleep.java delete mode 100644 src/main/java/com/samsoule63/luckyWaking/event/OnPlayerWakeUp.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/init/LuckyWakingRecipies.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/items/armors/UselessArmor.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/items/tools/LuckyWakingToolsMaterials.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/items/tools/UselessPickaxe.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/items/tools/UselessSword.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/proxy/ClientProxy.java create mode 100644 src/main/java/com/samsoule63/luckyWaking/proxy/CommonProxy.java delete mode 100644 src/main/java/com/samsoule63/luckyWaking/proxy/ProxyClient.java delete mode 100644 src/main/java/com/samsoule63/luckyWaking/proxy/ProxyCommon.java delete mode 100644 src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java delete mode 100644 src/main/java/net/minecraftforge/event/entity/player/PlayerWakeUpEvent.java delete mode 100644 src/main/resources/assets/luckyW/blockstates/starBlock.json delete mode 100644 src/main/resources/assets/luckyW/lang/fr_FR.lang delete mode 100644 src/main/resources/assets/luckyW/textures/items/itemBasic.png create mode 100644 src/main/resources/assets/luckywaking/blockstates/starBlock.json create mode 100644 src/main/resources/assets/luckywaking/lang/fr_FR.lang rename src/main/resources/assets/{luckyW => luckywaking}/models/block/starBlock.json (53%) rename src/main/resources/assets/{luckyW => luckywaking}/models/item/starBlock.json (78%) rename src/main/resources/assets/{luckyW/models/item/itemBasic.json => luckywaking/models/item/theUselessItem.json} (84%) create mode 100644 src/main/resources/assets/luckywaking/models/item/uselessBoots.json create mode 100644 src/main/resources/assets/luckywaking/models/item/uselessChestplate.json create mode 100644 src/main/resources/assets/luckywaking/models/item/uselessHelmet.json create mode 100644 src/main/resources/assets/luckywaking/models/item/uselessLeggins.json create mode 100644 src/main/resources/assets/luckywaking/models/item/uselessPickaxe.json create mode 100644 src/main/resources/assets/luckywaking/models/item/uselessSword.json rename src/main/resources/assets/{luckyW => luckywaking}/textures/blocks/starBlock.png (100%) create mode 100644 src/main/resources/assets/luckywaking/textures/items/theUselessItem.png create mode 100644 src/main/resources/assets/luckywaking/textures/items/uselessBoots.png create mode 100644 src/main/resources/assets/luckywaking/textures/items/uselessChestplate.png create mode 100644 src/main/resources/assets/luckywaking/textures/items/uselessHelmet.png create mode 100644 src/main/resources/assets/luckywaking/textures/items/uselessLeggins.png create mode 100644 src/main/resources/assets/luckywaking/textures/items/uselessPickaxe.png create mode 100644 src/main/resources/assets/luckywaking/textures/items/uselessSword.png create mode 100644 src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_1.png create mode 100644 src/main/resources/assets/luckywaking/textures/models/armor/uselessArmor_layer_2.png 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 7f5189fa2f1ca0929c3b7412bf20fe6fac6a9e11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1207 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rl|a5HePSl~5_ zfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&&kOzD#|w@Cz*kPK{hiaqQp5rH#aq} zgaHJci&7IyQd1PlGfOfQ+&z5*QuI>U85mfkJzX3_ECd+^Sl<6;{Qv(yNG$`y&YkiM z!NJddfBk9<68OWwzzCv|F$)93|3BZpJ>%r$1ZjE+&?CL7S*wtmoWMCk|z`(G9fq`Km3)p6PdH?^sygH0pTG9+^ zYJZq--2&+YDFTHMi2ae7fkB+n%}tU~M#k{}uV1{3Y@lFc*vG;kB=qQ-Z{{P{_KN!u-eluukeg604$(x_*>WnPE z&CFz&qoXe}2nw?Pzi@$%>Cq!eP#iHZFz_)jFfc<6_{+q=!1jOBrceJE7#=g)*nIlC zd-nyF-Mgh2e=#svFf%Z?GB7acFfuTxGB7X*Gcqu6GcYhPfkFyo04Oy7Gcf#PU|{&l zz`*eK9|Obf{|pRQe={)bW?^DrkY`|EkYI$Q2o44Y1`uXqz>Ecu7)TC;1sE9^#Mu}a zW=KSdbAE1aYF-Hg2sjs|CYGe8D3oWGWGJ|M`Ua%vrLr?Hut+Mpw@QvI&M685#fG_|L!y z;%k6O5Q~AK>Hm5V10-StQuF`+eVHqafogI|1*61&+uR3f7Ac<{~7*+ z*x$fxus8$A(GZt|O=_6I`2PmTkswnTzA^k~_{Pxue;fJ#6rVc85rg;1~5E=_z-Lf2V?X_#_0?b|7S3y zGTi*n#Q^vB|8ERgv2|!BU~;eAx&Sure^v}6+K`n@TinFJz@Wsyz~Ic#Pz!>S9_<#B4`3y~7 z>lt1M9c2JHU5=5H;n9Cds6uBby%%f&lmn*LFG&W6!M`T2^^CQf0vWOsFv9|@5=wwv z2U5qt@{NJ7*A#)mf`u6Bwn9?o|Ns9XArCSDhPhelLFR+=04N`T zq7Q~a(FjiI3=IEZ>OnLpSD;`91_n^l{wK+B{l6^34={#l1j&IkA>+6?PHU1He;xt3 N&(qb zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns~;=MfeWR5Oy^lg+@ukm~8;7-DhyZqP>F z0|p$M7spK${_$VT?}YTbDOxTnL02`uW*lJ3c~DWHrt(sAQcR)jb(=eP7#XhWaFoYQ za+~<+Yl}T+5C5HoJK4ie&3@>kV!Ln_>weFoZKf=lF`C@oVw+;`C+=WeddOnGL!svk Q1_lNOPgg&ebxsLQ0Hv`-NB{r; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a646db23d75a33d7518be849b22c91c0f59db357 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^OD+TxGbL(xVi> zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns~;=Mfg+6JIxf(|HC4hI~&K#}JFtXM=9@ zHYf;WpY?sn@y4E8c}Lqnj-6A4Jyb5%9SmHzm;HnF9P_lt&o~(hp2WOYi9Bb=$ME#* z6oV$Ni2fDply3Ay@qe+Mp_}Z#@>@c+wdt!BZhCuu39;W-PuQ}_zxKkf!z^{N(xyN6 bu!#TV5BnWc`*b4%0|SGntDnm{r-UW|j|xry literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ff2877ede7088de3aa79ada111eee9729bffea09 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^OD+TxGbL(xVi> zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns~;=Mfg+H%)qSD2suCA=1;uF~s6@a)QLC z2Eo}6{{R2~KRNWwiH?QySZ6;=zrN1!fsw>r0kih>w8>4lpp>Wz(B{{(9Jd1_lNOPgg&ebxsLQ E0Ig<3dH?_b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..68abb5476e897f6944a95911719e1cfb6f4149da GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^OD+TxGbL(xVi> zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns~;=MfeWP>#;3T*|<}5aj9N7-DfcIYA=h zK!@Ik|NsC0uP`+*TJ$2(@%o=Pw@mk#{rms_zx^gfpD9(1+t@rZGYvg5Gbg4uOqnLe wtSs`tIAucnK@P(P!Fam{)ySAfA&d;%%Ox_G)m1AqFfcH9y85}Sb4q9e0INejiU0rr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ac7e4071d9243d84ccde40d7e9f569534c6f918b GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Q~#v@*1w&uV|n zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns~;=iwJpXJuD9@sojp;jE{NV~EA+{<8KMEGz0@~vP0bN)2{zp=7^ z!80EFo&TkZ?)>+kQ|UZQabDV@|JIkU{?9&9_`kjKtvxgI9R@Y0Sx;3h4FA+@-zvJU zjdOk)yR%{&v-rIvmKkN2v;VL?*d)nTS2NdP&wNf-LuIqs8!cx)xu7O_;L*%?I|Ui6 YGD->szp0*KU|?YIboFyt=akR{0GGjr;s5{u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..30d8a1eae611d95e6ca62e199fd15f1ffa48fd9b GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^JY`{xh(x+o83b zfq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS#w&%-aIYX0}|@81jz3?DpQ978Nl&z-n8 zi^);u$a9Ch)+|7Sqa|RzPmoG!?gqDy_$?R*sSMxmP_Rwg#;Im;y-gTe~ HDWM4fx$}$b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1803dce1bb7cbd667ee0c0812e4adcdd86e85ace GIT binary patch literal 479 zcmeAS@N?(olHy`uVBq!ia0y~yU~phyU{K&-V_;xdG`FsWfq{W7$=lt9;VHvahN~$( zN&yTE44efXk;M!Qd?NMQuI%@Dghd#PswKSH7#J9HJY5_^GVZ;N zu=PJ|AW)mm$~Gh7H?u=mLh>W_562}F*M{4vY&vjdl_>Ape$Ai_IWp#EeUta-estYg z{q62vNdx>D_fpkH95n$!3O4LJ3^!ESLH2dU5`3e$H;&45nL*Kb|Z(X;$jXd5`tiB1IQ_N#2($ zyC3ZT8)GlIbNl(1Tnn#Qi{F~Bv$Q}pbwi%ltRu{8~D>R$8xm{_}gA4{Tg=!)3zRd+fPiSDh}OAGx$+=K77#np`6v<^A@H*FWD7 zWU+fs)2;V~5o%&-{`qGJurBAkdnq?Dvr4UHvr6rfi?^TqhkZkH!D;-PNV^nV&O&z=6yq^9+o&xm=!{XZ&$3 zC9E{^YX{#4na0EY4OgV!#U*@hsCj+nd*4oGjs^yf1_m=xH*twtxBYc#smIvfsT(c} z>B;{3-TdonW{$=75qBByFj}(<1XtavasA69{w~|T*Z$>CMvy(8u6{1-oD!M