Merge branch '1.12.2' of https://github.com/NoahJelen/nnparadisemod i…

…nto 1.12.2

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 {

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

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");
 	}

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;
 

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;
 		}

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) {

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) {

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