diff --git a/build.gradle b/build.gradle index 1ba3020..dff8c9f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,27 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +<<<<<<< HEAD version = "1.0 (Advancement Update)" group = "com.NetherNoah.ParadiseMod" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "nnparadisemod" +======= +<<<<<<< HEAD +version = "1.0 (Advancement Update) Test 2" +group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "nnparadisemod" +======= +<<<<<<< HEAD +version = "1.0 (Advancement Update) Test 2" +group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "nnparadisemod" +======= +version = "1.0" +group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "modid" +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. compileJava { diff --git a/changelog.txt b/changelog.txt index 1fee185..c9c6a8f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -128,17 +128,38 @@ First 1.12.2 only version Changed Sugar Block texture (it looked exactly like the white concrete powder) The wooden and cactus crafting tables now have the recipe book interface +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab Started an advancement tree for the mod Added Ender Ruby Ore and Ender Pearl Ore Numbers should no longer spam your output log while exploring the end Added Ender Pearl Block Added elytra runways Added structure voids to the redstone creative tab +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab 1.0 Test 2: Added more advancements to the advancement tree Fixed a rendering glitch with the cactus and compressed cactus chests Increased the rarity of structures to prevent the minecraft world from looking trashed +<<<<<<< HEAD Optimized the registration of world generators The christmas tree leaves now properly displays its item Fixed a bug with planks (other than oak planks) outputting an oak button instead of the specified variant (this will cause some issues with the advancements!) @@ -152,3 +173,19 @@ The Silver Fence Gate finally has a display name! Added the vanilla mob spawner to the decorations creative tab (just like in MCBE) +======= + Optimized the registration of world generators4 + The christmas tree leaves now properly displays its item + Fixed a bug with planks (other than oak planks) outputting an oak button instead of the specified variant (this will cause some issues with the advancements!) + +<<<<<<< HEAD +======= +======= +<<<<<<< HEAD +======= +======= +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab diff --git a/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java b/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java index 4093f33..c7d4fe3 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/ParadiseMod.java @@ -5,8 +5,25 @@ import com.NetherNoah.ParadiseMod.handlers.CustomCraftBenchGuiHandler; import com.NetherNoah.ParadiseMod.handlers.Events; import com.NetherNoah.ParadiseMod.handlers.OreDictHandler; +import com.NetherNoah.ParadiseMod.handlers.Events; import com.NetherNoah.ParadiseMod.init.LiquidRedstone; import com.NetherNoah.ParadiseMod.init.ModBlocks; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +import com.NetherNoah.ParadiseMod.init.ModSmelting; +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab import com.NetherNoah.ParadiseMod.init.ModItems; import com.NetherNoah.ParadiseMod.init.ModSmelting; import com.NetherNoah.ParadiseMod.proxy.CommonProxy; @@ -29,8 +46,11 @@ import com.NetherNoah.ParadiseMod.world.worldgen.structures.Ocean; import com.NetherNoah.ParadiseMod.world.worldgen.structures.RoguePortal; import com.NetherNoah.ParadiseMod.world.worldgen.structures.Runway; +<<<<<<< HEAD import com.NetherNoah.ParadiseMod.world.worldgen.structures.SkyWheel; import com.NetherNoah.ParadiseMod.world.worldgen.structures.TreasureChest; +======= +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab import com.NetherNoah.ParadiseMod.world.worldgen.structures.WickerMan; import com.NetherNoah.ParadiseMod.world.worldgen.structures.AttieCat.JeffTank; import com.NetherNoah.ParadiseMod.world.worldgen.structures.AttieCat.Shrine; @@ -76,6 +96,7 @@ public void preInit(FMLPreInitializationEvent event) { //this should prevent monsters from spawing MinecraftForge.EVENT_BUS.register((this.AntiMobLampHandler = new AntiMobLampHandler())); MinecraftForge.EVENT_BUS.register(SaltLampRegistry.getLampRegistry()); + MinecraftForge.EVENT_BUS.register(Events.class); //other events MinecraftForge.EVENT_BUS.register(Events.class); @@ -85,13 +106,48 @@ public void preInit(FMLPreInitializationEvent event) { Blocks.REDSTONE_BLOCK.setResistance(2000F); Blocks.WOODEN_BUTTON.setUnlocalizedName("oak_button"); Blocks.STRUCTURE_BLOCK.setCreativeTab(CreativeTabs.REDSTONE); +<<<<<<< HEAD + Blocks.STRUCTURE_VOID.setCreativeTab(CreativeTabs.REDSTONE); +======= +<<<<<<< HEAD + Blocks.STRUCTURE_VOID.setCreativeTab(CreativeTabs.REDSTONE); +======= +<<<<<<< HEAD Blocks.STRUCTURE_VOID.setCreativeTab(CreativeTabs.REDSTONE); +======= +<<<<<<< HEAD + Blocks.STRUCTURE_VOID.setCreativeTab(CreativeTabs.REDSTONE); +======= +<<<<<<< HEAD + Blocks.STRUCTURE_VOID.setCreativeTab(CreativeTabs.REDSTONE); +======= +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab Blocks.COMMAND_BLOCK.setCreativeTab(CreativeTabs.REDSTONE); Blocks.REPEATING_COMMAND_BLOCK.setCreativeTab(CreativeTabs.REDSTONE); Blocks.CHAIN_COMMAND_BLOCK.setCreativeTab(CreativeTabs.REDSTONE); Blocks.BARRIER.setCreativeTab(CreativeTabs.BUILDING_BLOCKS); +<<<<<<< HEAD Blocks.MOB_SPAWNER.setCreativeTab(CreativeTabs.DECORATIONS); +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 + +======= +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab //liquids LiquidRedstone.register(); FluidRegistry.addBucketForFluid(LiquidRedstone.FluidLiquidRedstone.instance); @@ -106,6 +162,13 @@ public void preInit(FMLPreInitializationEvent event) { GameRegistry.registerTileEntity(TEAntiMobLamp.class,"salt_lamp"); System.out.println("Nether Noah's Paradise Mod: Successfully registered tile entities"); +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab //world generators IWorldGenerator[] generators = { //structures! @@ -117,9 +180,12 @@ public void preInit(FMLPreInitializationEvent event) { new RoguePortal(), new MesaTemple(), new Runway(), +<<<<<<< HEAD new TreasureChest(), new SkyWheel(), new MiniStronghold(), +======= +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab //created by AttieCat new Shrine(), @@ -135,11 +201,51 @@ public void preInit(FMLPreInitializationEvent event) { //dirt, gravel, sand, and clay on the ocean floors new DirtGen()}; +<<<<<<< HEAD for(int i=0;i<17;i++) { GameRegistry.registerWorldGenerator(generators[i],1); } System.out.println("Nether Noah's Paradise Mod: Successfully registered world generators"); +======= + for(int i=0;i<14;i++) { + GameRegistry.registerWorldGenerator(generators[i],1); + } + System.out.println("Nether Noah's Paradise Mod: Successfully registered world generators"); +<<<<<<< HEAD +======= +======= + //structures! + GameRegistry.registerWorldGenerator(new Home(),1); + GameRegistry.registerWorldGenerator(new WickerMan(),1); + GameRegistry.registerWorldGenerator(new Ocean(),1); + GameRegistry.registerWorldGenerator(new BrickPyramid(),1); + GameRegistry.registerWorldGenerator(new Minerbase(),1); + GameRegistry.registerWorldGenerator(new RoguePortal(),1); + GameRegistry.registerWorldGenerator(new MesaTemple(),1); + GameRegistry.registerWorldGenerator(new Runway(),1); + + //created by AttieCat + GameRegistry.registerWorldGenerator(new Shrine(),1); + GameRegistry.registerWorldGenerator(new JeffTank(),1); + + //overworld ore gen + GameRegistry.registerWorldGenerator(new OreGenOverworld(),1); + + + //nether ore gen + GameRegistry.registerWorldGenerator(new OreGenNether(),1); + + //end ore gen + GameRegistry.registerWorldGenerator(new OreGenEnd(),1); + + //dirt in the ocean + GameRegistry.registerWorldGenerator(new DirtGen(),1); + + System.out.println("Nether Noah's Paradise Mod: Successfully world generators"); +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab ModBlocks.initAndRegister(); System.out.println("Nether Noah's Paradise Mod: Successfully registered blocks"); ModItems.initAndRegister(); @@ -152,7 +258,19 @@ public void Init(FMLInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(instance, new CustomCraftBenchGuiHandler()); proxy.init(); ModSmelting.register(); +<<<<<<< HEAD + System.out.println("Nether Noah's Paradise Mod: Successfully registered smelting recipes"); +======= +<<<<<<< HEAD + System.out.println("Nether Noah's Paradise Mod: Successfully registered smelting recipes"); +======= +<<<<<<< HEAD System.out.println("Nether Noah's Paradise Mod: Successfully registered smelting recipes"); +======= + System.out.println("Nether Noah's Paradise Mod: Successfully registered crafting recipes"); +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab DimensionRegistry.MainRegistry(); System.out.println("Nether Noah's Paradise Mod: Successfully added the Deep Underground to Minecraft"); } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/Reference.java b/src/main/java/com/NetherNoah/ParadiseMod/Reference.java index 0dc5e8c..b1eacd1 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/Reference.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/Reference.java @@ -4,7 +4,19 @@ public class Reference { // Basic Mod Info public static final String MOD_ID = "nnparadisemod"; public static final String NAME = "Nether Noah's Paradise Mod"; +<<<<<<< HEAD public static final String VERSION = "1.0 (The Advancement Update)"; +======= +<<<<<<< HEAD + public static final String VERSION = "1.0 Test 2 (The Advancement Update)"; +======= +<<<<<<< HEAD + public static final String VERSION = "1.0 Test 2 (The Advancement Update)"; +======= + public static final String VERSION = "1.0 Test 1 (The Advancement Update)"; +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab public static final String ACCEPTED_VERSIONS = "1.12.2"; public static int GUI_CUSTOM_WORKBENCH = 0; diff --git a/src/main/java/com/NetherNoah/ParadiseMod/SaltLampRegistry.java b/src/main/java/com/NetherNoah/ParadiseMod/SaltLampRegistry.java index a736e08..abaa9e8 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/SaltLampRegistry.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/SaltLampRegistry.java @@ -41,6 +41,12 @@ public boolean isInRangeOfLamp(World world, BlockPos pos) double dx = Lamp.Position.getX() + 0.5 - pos.getX(); double dy = Math.abs(Lamp.Position.getY() + 0.5 - pos.getY()); double dz = Lamp.Position.getZ() + 0.5 - pos.getZ(); + /*/ + System.out.println(dx); + System.out.println(dy); + System.out.println(dz); + System.out.println(" "); + /*/ if((dx * dx + dz * dz) <= (this.LampRangeSq) && dy <= this.LampRange) return true; } diff --git a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java index 2638f6a..b5e6c81 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/blocks/misc/DUPortal.java @@ -94,8 +94,24 @@ public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random ra int i = pos.getY(); BlockPos blockpos; +<<<<<<< HEAD //for(blockpos = pos; !worldIn.getBlockState(blockpos).isFullCube() && blockpos.getY() > 0; blockpos = blockpos.down()) { //} +======= +<<<<<<< HEAD + //for(blockpos = pos; !worldIn.getBlockState(blockpos).isFullCube() && blockpos.getY() > 0; blockpos = blockpos.down()) { + //} +======= +<<<<<<< HEAD + //for(blockpos = pos; !worldIn.getBlockState(blockpos).isFullCube() && blockpos.getY() > 0; blockpos = blockpos.down()) { + //} +======= + for(blockpos = pos; !worldIn.getBlockState(blockpos).isFullCube() && blockpos.getY() > 0; blockpos = blockpos.down()) { + ; + } +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } public static int getMetaForAxis(EnumFacing.Axis axis) { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/handlers/CustomCraftBenchGuiHandler.java b/src/main/java/com/NetherNoah/ParadiseMod/handlers/CustomCraftBenchGuiHandler.java index 72386be..23a6865 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/handlers/CustomCraftBenchGuiHandler.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/handlers/CustomCraftBenchGuiHandler.java @@ -14,6 +14,10 @@ public class CustomCraftBenchGuiHandler implements IGuiHandler { public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { id=0; return new CustomCraftBenchGui(player.inventory, world); +<<<<<<< HEAD +======= + //, new BlockPos(x, y, z)); +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } @Override public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks.java index a919fa6..b63216e 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModBlocks.java @@ -223,6 +223,22 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraftforge.fml.common.registry.ForgeRegistries; +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +import net.minecraftforge.fml.common.registry.GameRegistry; +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab public class ModBlocks { public static SaltLamp getSaltLamp() @@ -665,13 +681,20 @@ public static void initAndRegister() { ForgeRegistries.BLOCKS.register(LitWhiteRSLamp = new LitWhiteRSLamp()); ForgeRegistries.BLOCKS.register(LitYellowRSLamp = new LitYellowRSLamp()); } - private static void regBlock(Block block) { ForgeRegistries.BLOCKS.register(block); ItemBlock item = new ItemBlock(block); item.setRegistryName(block.getRegistryName()); ForgeRegistries.ITEMS.register(item); } + //private static void regBlock(Block block) { + //boolean debug=false; + //GameRegistry.register(block); + //GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); + //if (debug) { + //System.out.println("Nether Noah's Paradise Mod: Registered " + block.getUnlocalizedName().substring(5)); + //} + //} public static void registerRenders() { // block render registry list diff --git a/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java b/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java index 02ec8b5..db6fae4 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/init/ModSmelting.java @@ -19,10 +19,37 @@ public static void register() { GameRegistry.addSmelting(ModBlocks.RubyOre, new ItemStack(ModItems.Ruby), 5F); GameRegistry.addSmelting(ModBlocks.SilverOre, new ItemStack(ModItems.SilverIngot), 5F); +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab //smelting recipes for end ores GameRegistry.addSmelting(ModBlocks.EndRubyOre, new ItemStack(ModItems.Ruby), 5F); GameRegistry.addSmelting(ModBlocks.EnderPearlOre, new ItemStack(Items.ENDER_PEARL), 5F); +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab //smelting recipes for nether ores GameRegistry.addSmelting(ModBlocks.SilverOreNether, new ItemStack(ModItems.SilverIngot), 5F); GameRegistry.addSmelting(ModBlocks.GoldOreNether, new ItemStack(Items.GOLD_INGOT), 5F); diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/ConcretePlateItem.java b/src/main/java/com/NetherNoah/ParadiseMod/items/ConcretePlateItem.java new file mode 100644 index 0000000..0cdb7b1 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/ConcretePlateItem.java @@ -0,0 +1,15 @@ +package com.NetherNoah.ParadiseMod.items; + +import com.NetherNoah.ParadiseMod.init.ModBlocks; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; + +public class ConcretePlateItem extends ItemBlock { + + public ConcretePlateItem(Block block) { + super(ModBlocks.concretePlate); + setUnlocalizedName("concrete_pressure_plate"); + } + +} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/IMetaBlockName.java b/src/main/java/com/NetherNoah/ParadiseMod/items/IMetaBlockName.java new file mode 100644 index 0000000..1fd6d4e --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/IMetaBlockName.java @@ -0,0 +1,7 @@ +package com.NetherNoah.ParadiseMod.items; + +import net.minecraft.item.ItemStack; + +public interface IMetaBlockName { + String getSpecialName(ItemStack stack); +} diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/ItemBlockColored.java b/src/main/java/com/NetherNoah/ParadiseMod/items/ItemBlockColored.java new file mode 100644 index 0000000..ee6bf84 --- /dev/null +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/ItemBlockColored.java @@ -0,0 +1,23 @@ +package com.NetherNoah.ParadiseMod.items; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemColored; +import net.minecraft.item.ItemStack; + +public class ItemBlockColored extends ItemBlock{ + public ItemBlockColored(Block block) { + super(block); + } + @Override + public int getMetadata(int damage) + { + return damage; + } + + @Override + public String getUnlocalizedName(ItemStack stack) + { + return super.getUnlocalizedName() + "." + ((IMetaBlockName) this.block).getSpecialName(stack); + } +} \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/cactus/cactusAxe.java b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/cactus/cactusAxe.java index 0c6d145..4a2fe53 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/cactus/cactusAxe.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/cactus/cactusAxe.java @@ -26,6 +26,10 @@ public cactusAxe(ToolMaterial material, String unlocalizedName) { public float getDestroySpeed(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); +<<<<<<< HEAD return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : efficiency; +======= + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : this.efficiency; +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/emerald/emeraldAxe.java b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/emerald/emeraldAxe.java index 7098cea..a9ee6e0 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/emerald/emeraldAxe.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/emerald/emeraldAxe.java @@ -26,6 +26,10 @@ public emeraldAxe(ToolMaterial material, String unlocalizedName) { public float getDestroySpeed(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); +<<<<<<< HEAD return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : efficiency; +======= + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : this.efficiency; +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/obsidian/obsidianAxe.java b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/obsidian/obsidianAxe.java index 1803577..9ceb8b0 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/obsidian/obsidianAxe.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/obsidian/obsidianAxe.java @@ -26,6 +26,10 @@ public obsidianAxe(ToolMaterial material, String unlocalizedName) { public float getDestroySpeed(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); +<<<<<<< HEAD return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : efficiency; +======= + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : this.efficiency; +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/redstone/redstoneAxe.java b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/redstone/redstoneAxe.java index c985257..d4b5f00 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/redstone/redstoneAxe.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/redstone/redstoneAxe.java @@ -26,6 +26,10 @@ public redstoneAxe(ToolMaterial material, String unlocalizedName) { public float getDestroySpeed(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); +<<<<<<< HEAD return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : efficiency; +======= + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : this.efficiency; +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/ruby/rubyAxe.java b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/ruby/rubyAxe.java index a6ddf0e..bcf50ff 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/ruby/rubyAxe.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/ruby/rubyAxe.java @@ -19,13 +19,22 @@ public class rubyAxe extends ItemTool { private static final float[] ATTACK_SPEEDS = new float[] { -3.2F, -3.2F, -3.1F, -3.0F, -3.0F}; public rubyAxe(ToolMaterial material, String unlocalizedName) { super(material, EFFECTIVE_ON); +<<<<<<< HEAD setUnlocalizedName(unlocalizedName); setRegistryName(new ResourceLocation(Reference.MOD_ID, unlocalizedName)); +======= + this.setUnlocalizedName(unlocalizedName); + this.setRegistryName(new ResourceLocation(Reference.MOD_ID, unlocalizedName)); +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } @Override public float getDestroySpeed(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); +<<<<<<< HEAD return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : efficiency; +======= + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : this.efficiency; +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/silver/silverAxe.java b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/silver/silverAxe.java index 25f9df1..1e3645b 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/items/tools/silver/silverAxe.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/items/tools/silver/silverAxe.java @@ -19,13 +19,22 @@ public class silverAxe extends ItemTool { private static final float[] ATTACK_SPEEDS = new float[] { -3.2F, -3.2F, -3.1F, -3.0F, -3.0F}; public silverAxe(ToolMaterial material, String unlocalizedName) { super(material, EFFECTIVE_ON); +<<<<<<< HEAD setUnlocalizedName(unlocalizedName); setRegistryName(new ResourceLocation(Reference.MOD_ID, unlocalizedName)); +======= + this.setUnlocalizedName(unlocalizedName); + this.setRegistryName(new ResourceLocation(Reference.MOD_ID, unlocalizedName)); +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } @Override public float getDestroySpeed(ItemStack stack, IBlockState state) { Material material = state.getMaterial(); +<<<<<<< HEAD return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : efficiency; +======= + return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE ? super.getDestroySpeed(stack, state) : this.efficiency; +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/RunwayGen.java b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/RunwayGen.java index d0d67f9..b497aac 100644 --- a/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/RunwayGen.java +++ b/src/main/java/com/NetherNoah/ParadiseMod/world/worldgen/structures/RunwayGen.java @@ -36,14 +36,38 @@ public boolean generate(World world, Random rand, BlockPos position) { } Biome biome = world.getBiomeForCoordsBody(position); if(RunwayGen.canSpawnHere(template, worldserver, position)) { +<<<<<<< HEAD if(rand.nextInt(599) == 0){ +======= +<<<<<<< HEAD + if(rand.nextInt(599) == 0){ +======= +<<<<<<< HEAD + if(rand.nextInt(599) == 0){ +======= + if(rand.nextInt(399) == 0){ +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab IBlockState iblockstate = world.getBlockState(position); world.notifyBlockUpdate(position, iblockstate, iblockstate, 3); PlacementSettings placementsettings = (new PlacementSettings()).setMirror(Mirror.NONE) .setRotation(Rotation.NONE).setIgnoreEntities(false).setChunk((ChunkPos) null) .setReplacedBlock((Block) null).setIgnoreStructureBlock(false); template.getDataBlocks(position, placementsettings); +<<<<<<< HEAD + template.addBlocksToWorld(world, position.add(0, -5, 0), placementsettings); +======= +<<<<<<< HEAD + template.addBlocksToWorld(world, position.add(0, -5, 0), placementsettings); +======= +<<<<<<< HEAD template.addBlocksToWorld(world, position.add(0, -5, 0), placementsettings); +======= + template.addBlocksToWorld(world, position.add(0, -6, 0), placementsettings); +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab return true; } } @@ -55,4 +79,18 @@ public static boolean canSpawnHere(Template template, World world, BlockPos posA int xwidth = template.getSize().getX(); return posAboveGround.getY() > 10; } +<<<<<<< HEAD +======= + public static int getGroundFromAbove(World world, int x, int z) + { + int y = 255; + boolean foundGround = false; + while(!foundGround) + { + Block blockAt = world.getBlockState(new BlockPos(x,y,z)).getBlock(); + foundGround = blockAt == Blocks.GRASS|| blockAt == Blocks.DIRT || blockAt == Blocks.SAND || blockAt == Blocks.SNOW ||blockAt == Blocks.MYCELIUM||blockAt==Blocks.STONE||blockAt==Blocks.WATER; + } + return y; + } +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/lang/en_US.lang b/src/main/resources/assets/nnparadisemod/lang/en_US.lang index 8ecd21b..70d07aa 100644 --- a/src/main/resources/assets/nnparadisemod/lang/en_US.lang +++ b/src/main/resources/assets/nnparadisemod/lang/en_US.lang @@ -1,4 +1,7 @@ +<<<<<<< HEAD tile.SilverFenceGate.name=Silver Fence Gate +======= +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab tile.endPearlBlock.name=Ender Pearl Block tile.EndRubyOre.name=Ender Ruby Ore tile.EndPearlOre.name=Ender Pearl Ore diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/acacia_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/acacia_button.json index 01896a6..67989a7 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/acacia_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/acacia_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:planks", "data": 4 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:acacia_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:planks", + "data": 4 + } + ], + "result": { + "item": "nnparadisemod:acacia_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/andesite_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/andesite_button.json index 0ffcae5..f281bd2 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/andesite_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/andesite_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:stone", "data": 5 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:andesite_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:stone", + "data": 5 + } + ], + "result": { + "item": "nnparadisemod:andesite_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/birch_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/birch_button.json index 94000e8..117ae05 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/birch_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/birch_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:planks", "data": 2 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:birch_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:planks", + "data": 2 + } + ], + "result": { + "item": "nnparadisemod:birch_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/dark_oak_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/dark_oak_button.json index e2cdd10..955af24 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/dark_oak_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/dark_oak_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:planks", "data": 5 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:dark_oak_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:planks", + "data": 5 + } + ], + "result": { + "item": "nnparadisemod:dark_oak_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/diorite_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/diorite_button.json index 77659fb..075fa81 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/diorite_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/diorite_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:stone", "data": 3 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:diorite_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:stone", + "data": 3 + } + ], + "result": { + "item": "nnparadisemod:diorite_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/granite_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/granite_button.json index 87f02fd..e4e9cf5 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/granite_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/granite_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:stone", "data": 1 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:granite_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:stone", + "data": 1 + } + ], + "result": { + "item": "nnparadisemod:granite_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/jungle_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/jungle_button.json index 2d470ac..8930f7b 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/jungle_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/jungle_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:planks", "data": 3 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:jungle_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:planks", + "data": 3 + } + ], + "result": { + "item": "nnparadisemod:jungle_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/buttons/spruce_button.json b/src/main/resources/assets/nnparadisemod/recipes/buttons/spruce_button.json index 828a009..23ec3a0 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/buttons/spruce_button.json +++ b/src/main/resources/assets/nnparadisemod/recipes/buttons/spruce_button.json @@ -3,9 +3,33 @@ "ingredients": [{ "item": "minecraft:planks", "data": 1 +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } ], "result": { "item": "nnparadisemod:spruce_button" +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + }, + { + "item": "minecraft:planks", + "data": 1 + } + ], + "result": { + "item": "nnparadisemod:spruce_button", + "count":2 +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/cactus_bookshelf.json b/src/main/resources/assets/nnparadisemod/recipes/cactus_bookshelf.json index 6b189df..7bc5caf 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/cactus_bookshelf.json +++ b/src/main/resources/assets/nnparadisemod/recipes/cactus_bookshelf.json @@ -16,6 +16,28 @@ } }, "result": { +<<<<<<< HEAD "item": "nnparadisemod:cactus_bookshelf" +======= +<<<<<<< HEAD + "item": "nnparadisemod:cactus_bookshelf" +======= +<<<<<<< HEAD + "item": "nnparadisemod:cactus_bookshelf" +======= +<<<<<<< HEAD + "item": "nnparadisemod:cactus_bookshelf" +======= +<<<<<<< HEAD + "item": "nnparadisemod:cactus_bookshelf" +======= + "item": "nnparadisemod:cactus_bookshelf", + "data": 15, + "count": 8 +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } diff --git a/src/main/resources/assets/nnparadisemod/recipes/christmas_sapling.json b/src/main/resources/assets/nnparadisemod/recipes/christmas_sapling.json index 27da503..50618d4 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/christmas_sapling.json +++ b/src/main/resources/assets/nnparadisemod/recipes/christmas_sapling.json @@ -17,6 +17,28 @@ } ], "result": { +<<<<<<< HEAD "item": "nnparadisemod:christmas_sapling" +======= +<<<<<<< HEAD + "item": "nnparadisemod:christmas_sapling" +======= +<<<<<<< HEAD + "item": "nnparadisemod:christmas_sapling" +======= +<<<<<<< HEAD + "item": "nnparadisemod:christmas_sapling" +======= +<<<<<<< HEAD + "item": "nnparadisemod:christmas_sapling" +======= + "item": "nnparadisemod:christmas_sapling", + "data": 13, + "count": 3 +>>>>>>> fe4e7c11df6ac2d36c62263cef3f6404ef024eec +>>>>>>> f3bb25d5ded4e2d0a84481ae1aae25c354a4f3ee +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } \ No newline at end of file diff --git a/src/main/resources/assets/nnparadisemod/recipes/emerald_shovel.json b/src/main/resources/assets/nnparadisemod/recipes/emerald_shovel.json new file mode 100644 index 0000000..c1e3aa5 --- /dev/null +++ b/src/main/resources/assets/nnparadisemod/recipes/emerald_shovel.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "#", + "#" + ], + "key": { + "#": { + "item": "minecraft:iron_ingot" + }, + "X": { + "item": "minecraft:emerald" + } + }, + "result": { + "item": "nnparadisemod:emerald_spade" + } +} diff --git a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_axe.json b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_axe.json index 338f014..d230b27 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_axe.json +++ b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_axe.json @@ -14,6 +14,13 @@ } }, "result": { +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab "item": "nnparadisemod:emerald_axe", "nbt": { "ench": [{ @@ -21,5 +28,14 @@ "lvl": 3 }] } +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + "item": "nnparadisemod:emerald_axe" +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } diff --git a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_hoe.json b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_hoe.json index 5a62c31..7ebd8a6 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_hoe.json +++ b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_hoe.json @@ -14,6 +14,13 @@ } }, "result": { +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab "item": "nnparadisemod:emerald_hoe", "nbt": { "ench": [{ @@ -21,5 +28,14 @@ "lvl": 3 }] } +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + "item": "nnparadisemod:emerald_hoe" +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } diff --git a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_pickaxe.json b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_pickaxe.json index a4c0188..7e94621 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_pickaxe.json +++ b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_pickaxe.json @@ -14,6 +14,13 @@ } }, "result": { +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab "item": "nnparadisemod:emerald_pickaxe", "nbt": { "ench": [{ @@ -21,5 +28,14 @@ "lvl": 3 }] } +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + "item": "nnparadisemod:emerald_pickaxe" +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } } diff --git a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_sword.json b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_sword.json index 19a2b66..0e71bd9 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_sword.json +++ b/src/main/resources/assets/nnparadisemod/recipes/tools/emerald_sword.json @@ -1,4 +1,11 @@ { +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab "type": "minecraft:crafting_shaped", "pattern": [ "X", @@ -22,4 +29,32 @@ }] } } -} \ No newline at end of file +<<<<<<< HEAD +} +======= +<<<<<<< HEAD +} +======= +} +======= + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "#" + ], + "key": { + "#": { + "item": "minecraft:iron_ingot" + }, + "X": { + "item": "minecraft:emerald" + } + }, + "result": { + "item": "nnparadisemod:emerald_sword" + } +} +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab diff --git a/src/main/resources/assets/nnparadisemod/recipes/tools/redstone_sword.json b/src/main/resources/assets/nnparadisemod/recipes/tools/redstone_sword.json index ba931cd..4bc77c0 100644 --- a/src/main/resources/assets/nnparadisemod/recipes/tools/redstone_sword.json +++ b/src/main/resources/assets/nnparadisemod/recipes/tools/redstone_sword.json @@ -15,6 +15,13 @@ }, "result": { "item": "nnparadisemod:redstone_sword", +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab "nbt": { "ench":[{ "id":20, @@ -22,4 +29,19 @@ }] } } +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +======= + "nbt": { + "ench":[{ + "id":20, + "lvl":2 + }] + } + } +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 38e6af5..189f4a6 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,19 @@ "modid": "nnparadisemod", "name": "Nether Noah's Paradise Mod", "description": "This Mod adds stuff that makes minecraft better!\nBest if used alongside Quark!", +<<<<<<< HEAD "version": "1.0 (The Advancement Update)", +======= +<<<<<<< HEAD + "version": "1.0 Test 2 (The Advancement Update)", +======= +<<<<<<< HEAD + "version": "1.0 Test 2 (The Advancement Update)", +======= + "version": "1.0 Test 1 (The Advancement Update)", +>>>>>>> b4f1ba2701a07a150105d9b8107884ea381af4e7 +>>>>>>> 2232dfc8ed202f64e08f79d5fc50cea9a6929969 +>>>>>>> ff63528162a376128514ecfa30cc4fc1154076ab "mcversion": "1.12.2", "logoFile": "", "url": "",