Skip to content

Messy 1.9.4 port. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
synthetixa wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Messy 1.9.4 port. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b406dd8
1.9 Port
synthetixa Jun 23, 2016
3391522
1.9 Port
synthetixa Jun 23, 2016
6f86cf9
1.9 Port
synthetixa Jun 23, 2016
dfd469b
1.9 Port
synthetixa Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,24 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}


apply plugin: 'forge'
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.0.0"
ext.build = "0"
group = "fontbox"
archivesBaseName = "fontbox"

minecraft {
version = "1.7.10-10.13.0.1180"
version = "12.17.0.1969"
replace "@VERSION@", project.version
replace "@BUILD@", project.ext.build
mappings = "snapshot_20160609"
runDir = "run"
}

jar.version = "${minecraft.version}"
Expand All @@ -40,8 +42,8 @@ processResources {
include 'mcmod.info'
expand 'version':project.version + '-' + project.ext.build, 'mcversion':project.minecraft.version
}
from(sourceSets.main.resources.srcDirs) {

from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
8 changes: 6 additions & 2 deletions src/demo/java/net/afterlifelochie/demo/FontboxClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package net.afterlifelochie.demo;

import cpw.mods.fml.common.event.FMLInitializationEvent;
import net.afterlifelochie.fontbox.Fontbox;
import net.afterlifelochie.fontbox.api.PrintOutputTracer;
import net.afterlifelochie.fontbox.font.FontException;
import net.afterlifelochie.fontbox.font.GLFont;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;

public class FontboxClient extends FontboxServer {

Expand All @@ -20,6 +22,8 @@ public void init(FMLInitializationEvent e) {
} catch (FontException f0) {
f0.printStackTrace();
}
}

Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(FontboxServer.book, 0, new ModelResourceLocation("minecraft:book", "inventory"));
}

}
17 changes: 8 additions & 9 deletions src/demo/java/net/afterlifelochie/demo/FontboxDemoMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package net.afterlifelochie.demo;

import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;

@Mod(name = "fontbox-demo", modid = FontboxDemoMod.modid)
public class FontboxDemoMod {
Expand All @@ -15,17 +14,17 @@ public class FontboxDemoMod {
@SidedProxy(clientSide = "net.afterlifelochie.demo.FontboxClient", serverSide = "net.afterlifelochie.demo.FontboxServer")
public static FontboxServer proxy;

@EventHandler
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent e) {
proxy.preInit(e);
}

@EventHandler
@Mod.EventHandler
public void init(FMLInitializationEvent e) {
proxy.init(e);
}

@EventHandler
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent e) {
proxy.postInit(e);
}
Expand Down
12 changes: 6 additions & 6 deletions src/demo/java/net/afterlifelochie/demo/FontboxServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package net.afterlifelochie.demo;

import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;

public class FontboxServer {

public ItemDemoBook book;
public static ItemDemoBook book;

public void preInit(FMLPreInitializationEvent e) {
}

public void init(FMLInitializationEvent e) {
book = new ItemDemoBook();
GameRegistry.registerItem(book, "demo-book");
GameRegistry.register(book);
}

public void postInit(FMLPostInitializationEvent e) {
Expand Down
37 changes: 15 additions & 22 deletions src/demo/java/net/afterlifelochie/demo/GuiDemoBook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
package net.afterlifelochie.demo;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.EnumSet;

import org.lwjgl.opengl.GL11;

import net.afterlifelochie.fontbox.Fontbox;
import net.afterlifelochie.fontbox.data.FormattedString;
import net.afterlifelochie.fontbox.document.CompilerHint;
import net.afterlifelochie.fontbox.document.*;
import net.afterlifelochie.fontbox.document.CompilerHint.HintType;
import net.afterlifelochie.fontbox.document.Document;
import net.afterlifelochie.fontbox.document.Heading;
import net.afterlifelochie.fontbox.document.Image;
import net.afterlifelochie.fontbox.document.ImageItemStack;
import net.afterlifelochie.fontbox.document.Paragraph;
import net.afterlifelochie.fontbox.document.formatting.ColorFormat;
import net.afterlifelochie.fontbox.document.formatting.DecorationStyle;
import net.afterlifelochie.fontbox.document.formatting.TextFormat;
Expand All @@ -26,7 +12,6 @@
import net.afterlifelochie.fontbox.font.GLFont;
import net.afterlifelochie.fontbox.layout.DocumentProcessor;
import net.afterlifelochie.fontbox.layout.LayoutException;
import net.afterlifelochie.fontbox.layout.PageIndex;
import net.afterlifelochie.fontbox.layout.PageWriter;
import net.afterlifelochie.fontbox.layout.components.PageProperties;
import net.afterlifelochie.fontbox.render.BookGUI;
Expand All @@ -37,6 +22,14 @@
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.EnumSet;

public class GuiDemoBook extends BookGUI {

Expand Down Expand Up @@ -76,7 +69,7 @@ public GuiDemoBook() {
document.push(new Heading("author", new FormattedString("Written by Aesop")));

document.push(new CompilerHint(HintType.FLOATBREAK));
document.push(new ImageItemStack(new ItemStack(Items.diamond, 1), 32, 32, AlignmentMode.CENTER));
document.push(new ImageItemStack(new ItemStack(Items.DIAMOND, 1), 32, 32, AlignmentMode.CENTER));
document.push(new Paragraph(new FormattedString("The classic fable demonstration book thingy.")
.applyFormat(new TextFormat(notethis, EnumSet.of(DecorationStyle.BOLD), new ColorFormat(128, 128,
255)), 0)));
Expand All @@ -88,16 +81,16 @@ public GuiDemoBook() {
if (para.trim().length() > 0)
reallines.add(para.trim());

document.push(new ImageItemStack(new ItemStack(Blocks.anvil, 1), 32, 32, FloatMode.LEFT));
document.push(new ImageItemStack(new ItemStack(Blocks.ANVIL, 1), 32, 32, FloatMode.LEFT));
document.push(new Paragraph(new FormattedString(reallines.get(0))));
document.push(new ImageItemStack(new ItemStack(Items.diamond, 1), 32, 32, AlignmentMode.CENTER));
document.push(new ImageItemStack(new ItemStack(Items.apple, 1), 32, 32, FloatMode.LEFT));
document.push(new ImageItemStack(new ItemStack(Items.DIAMOND, 1), 32, 32, AlignmentMode.CENTER));
document.push(new ImageItemStack(new ItemStack(Items.APPLE, 1), 32, 32, FloatMode.LEFT));
document.push(new Paragraph(new FormattedString(reallines.get(1))));
document.push(new CompilerHint(HintType.PAGEBREAK));

document.push(new Heading("ending", new FormattedString("The Finish")));
document.push(new ImageItemStack(new ItemStack(Items.diamond, 1), 32, 32, AlignmentMode.CENTER));
document.push(new ImageItemStack(new ItemStack(Items.gold_ingot, 1), 32, 32, FloatMode.LEFT));
document.push(new ImageItemStack(new ItemStack(Items.DIAMOND, 1), 32, 32, AlignmentMode.CENTER));
document.push(new ImageItemStack(new ItemStack(Items.GOLD_INGOT, 1), 32, 32, FloatMode.LEFT));
document.push(new Paragraph(new FormattedString(reallines.get(2))));

/* Actually generate some pages */
Expand Down
22 changes: 13 additions & 9 deletions src/demo/java/net/afterlifelochie/demo/ItemDemoBook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
package net.afterlifelochie.demo;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

public class ItemDemoBook extends Item {

public ItemDemoBook() {
super();
setTextureName("book_normal");
setCreativeTab(CreativeTabs.tabMisc);
}
this.setUnlocalizedName("demobook");
this.setRegistryName("demobook");
this.setCreativeTab(CreativeTabs.MISC);
}

@Override
@SideOnly(Side.CLIENT)
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
if (par2World.isRemote)
public ActionResult<ItemStack> onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, EnumHand hand) {
if (par2World.isRemote)
Minecraft.getMinecraft().displayGuiScreen(new GuiDemoBook());
return par1ItemStack;
}
return new ActionResult(EnumActionResult.PASS, par1ItemStack);
}
}
8 changes: 3 additions & 5 deletions src/main/java/net/afterlifelochie/fontbox/document/ImageItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
import net.afterlifelochie.fontbox.render.BookGUI;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.RenderItem;
import net.minecraft.item.ItemStack;

import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;

Expand All @@ -19,7 +18,7 @@
*/
public class ImageItemStack extends Image {

private static RenderItem renderer = new RenderItem();
private static RenderItem renderer = Minecraft.getMinecraft().getRenderItem();

/** The item stack */
public ItemStack stack;
Expand Down Expand Up @@ -101,8 +100,7 @@ public void render(BookGUI gui, int mx, int my, float frame) {
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glTranslatef(bounds().x * 0.44f, bounds().y * 0.44f, 0);
GL11.glScalef(bounds().width * 0.44f / 16.0f, bounds().height * 0.44f / 16.0f, 1.0f);
renderer.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft()
.getTextureManager(), stack, 0, 0);
renderer.renderItemAndEffectIntoGUI(stack, 0, 0);
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glDisable(GL11.GL_COLOR_MATERIAL);
GL11.glDisable(GL11.GL_LIGHTING);
Expand Down
Loading