Revert "Disabling unstable things."

This reverts commit aa075eb.
PC-Logix · Jul 30, 2014 · 5f26270 · 5f26270
1 parent aa075eb
commit 5f26270
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/src/main/java/pcl/lc/base/render/font/WrittenFontRenderer.java b/src/main/java/pcl/lc/base/render/font/WrittenFontRenderer.java
@@ -26,14 +26,18 @@ public class WrittenFontRenderer {
 	 *            The origin y coord for the draw.
 	 * @param z
 	 *            The z-depth of the draw.
+	 * @param debug
+	 *            If the draw is debug enabled.
 	 */
-	public void renderPages(FontMetric metric, FontRenderBuffer buffer, PageBox page, float ox, float oy, float z) {
+	public void renderPages(FontMetric metric, FontRenderBuffer buffer, PageBox page, float ox, float oy, float z,
+			boolean debug) {
 		float x = 0, y = 0;
 		Minecraft.getMinecraft().getTextureManager().bindTexture(metric.fontImageName);
 		GL11.glPushMatrix();
 		GL11.glTranslatef(ox, oy, z);
 		GL11.glEnable(GL11.GL_BLEND);
 		GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
+
 		// Translate to the draw dest
 		for (LineBox line : page.lines) {
 			x = 0; // carriage return

diff --git a/src/main/java/pcl/lc/module/ModuleCore.java b/src/main/java/pcl/lc/module/ModuleCore.java
@@ -103,13 +103,15 @@ public void init(FMLInitializationEvent event) {
 				CreativeTabHelper.getTab("LanteaCraft"));
 		Items.lanteaOreIngot = RegistrationHelper.registerItem(ItemLanteaOreIngot.class, "lanteaOreIngot",
 				CreativeTabHelper.getTab("LanteaCraft"));
-		Items.jacksonNotebook = RegistrationHelper.registerItem(ItemJacksonNotebook.class, "jacksonNotebook",
-				CreativeTabHelper.getTab("LanteaCraft"));
+		if (false)
+			Items.jacksonNotebook = RegistrationHelper.registerItem(ItemJacksonNotebook.class, "jacksonNotebook",
+					CreativeTabHelper.getTab("LanteaCraft"));
 		Blocks.lanteaOreAsBlock = RegistrationHelper.registerBlock(BlockOfLanteaOre.class, ItemBlockOfLanteaOre.class,
 				"lanteaOreIngotBlock", CreativeTabHelper.getTab("LanteaCraft"));
 
-		Items.tokraSpawnEgg = RegistrationHelper.registerItem(ItemTokraSpawnEgg.class, "tokraSpawnEgg",
-				CreativeTabHelper.getTab("LanteaCraft"));
+		if (false)
+			Items.tokraSpawnEgg = RegistrationHelper.registerItem(ItemTokraSpawnEgg.class, "tokraSpawnEgg",
+					CreativeTabHelper.getTab("LanteaCraft"));
 
 		RegistrationHelper.newShapelessRecipe(new ItemStack(Items.lanteaOreIngot, 1), new ItemStack(
 				Items.lanteaOreItem, 1), net.minecraft.init.Items.iron_ingot);

diff --git a/src/main/java/pcl/lc/module/ModuleStargates.java b/src/main/java/pcl/lc/module/ModuleStargates.java
@@ -113,20 +113,25 @@ public void init(FMLInitializationEvent event) {
 		Blocks.stargateControllerBlock = RegistrationHelper.registerBlock(BlockStargateDHD.class, ItemBlock.class,
 				"stargateDHD", CreativeTabHelper.getTab("LanteaCraft: Stargates"));
 
-		Blocks.transporterRing = RegistrationHelper.registerBlock(BlockTransporterRing.class,
-				ItemTransporterRing.class, "ringPlatform", CreativeTabHelper.getTab("LanteaCraft: Stargates"));
+		if (false)
+			Blocks.transporterRing = RegistrationHelper.registerBlock(BlockTransporterRing.class,
+					ItemTransporterRing.class, "ringPlatform", CreativeTabHelper.getTab("LanteaCraft: Stargates"));
 
 		GameRegistry.registerTileEntity(TileStargateBase.class, "tileEntityStargateBase");
 		GameRegistry.registerTileEntity(TileStargateRing.class, "tileEntityStargateRing");
 		GameRegistry.registerTileEntity(TileStargateDHD.class, "tileEntityStargateDHD");
 		GameRegistry.registerTileEntity(TileTransporterRing.class, "tileEntityRingPlatform");
-		Items.iris = RegistrationHelper.registerItem(ItemIris.class, "iris",
-				CreativeTabHelper.getTab("LanteaCraft: Stargates"));
-		Items.gdo = RegistrationHelper.registerItem(ItemGDO.class, "gdo",
-				CreativeTabHelper.getTab("LanteaCraft: Stargates"));
 
-		Items.transportRingActivator = RegistrationHelper.registerItem(ItemTransportRingActivator.class,
-				"transportRingActivator", CreativeTabHelper.getTab("LanteaCraft: Stargates"));
+		if (false)
+			Items.iris = RegistrationHelper.registerItem(ItemIris.class, "iris",
+					CreativeTabHelper.getTab("LanteaCraft: Stargates"));
+		if (false)
+			Items.gdo = RegistrationHelper.registerItem(ItemGDO.class, "gdo",
+					CreativeTabHelper.getTab("LanteaCraft: Stargates"));
+
+		if (false)
+			Items.transportRingActivator = RegistrationHelper.registerItem(ItemTransportRingActivator.class,
+					"transportRingActivator", CreativeTabHelper.getTab("LanteaCraft: Stargates"));
 
 		RegistrationHelper.newRecipe(new ItemStack(Blocks.stargateRingBlock, 1), "ICI", "NNN", "III", 'I',
 				net.minecraft.init.Items.iron_ingot, 'N', new ItemStack(ModuleCore.Items.lanteaOreIngot), 'C',

diff --git a/src/main/java/pcl/lc/module/core/gui/GuiJacksonNotebook.java b/src/main/java/pcl/lc/module/core/gui/GuiJacksonNotebook.java
@@ -79,7 +79,7 @@ public void drawScreen(int par1, int par2, float par3) {
 			GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 			if (this.pages.length > currentPage) {
 				Render.fontRenderer.renderPages(Render.danielFont, Render.danielFontBuffer, this.pages[currentPage],
-						18, 12, zLevel);
+						18, 12, zLevel, true);
 				GL11.glPushMatrix();
 				GL11.glTranslatef(90.0f, 200.0f, 0.0f);
 				GL11.glScalef(0.5f, 0.5f, 1.0f);
@@ -88,7 +88,7 @@ public void drawScreen(int par1, int par2, float par3) {
 			}
 			if (this.pages.length > currentPage + 1) {
 				Render.fontRenderer.renderPages(Render.danielFont, Render.danielFontBuffer,
-						this.pages[currentPage + 1], 204, 12, zLevel);
+						this.pages[currentPage + 1], 204, 12, zLevel, true);
 				GL11.glPushMatrix();
 				GL11.glTranslatef(290.0f, 200.0f, 0.0f);
 				GL11.glScalef(0.5f, 0.5f, 1.0f);