mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-22 12:59:49 +00:00
Fixed book crashes
The rest is up to you @Zach
This commit is contained in:
1 parent
98f463fc6a
commit
0a67a827e4
5 files changed
+59
-31
No files matched your search
+30
-18
@@ -1,26 +1,31 @@
|
||||
package mantle;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.core.config.LoggerConfig;
|
||||
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.SidedProxy;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
import static mantle.lib.CoreRepo.*;
|
||||
import static mantle.lib.CoreRepo.logger;
|
||||
import static mantle.lib.CoreRepo.modId;
|
||||
import static mantle.lib.CoreRepo.modName;
|
||||
import static mantle.lib.CoreRepo.modVersion;
|
||||
import mantle.books.BookData;
|
||||
import mantle.books.BookDataStore;
|
||||
import mantle.common.MProxyCommon;
|
||||
import mantle.items.Manual;
|
||||
import mantle.lib.CoreConfig;
|
||||
import mantle.lib.CoreRepo;
|
||||
import mantle.lib.environment.EnvironmentChecks;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.core.config.LoggerConfig;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
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 cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
/**
|
||||
* Mantle
|
||||
@@ -64,8 +69,15 @@ public class Mantle
|
||||
proxy.registerRenderer();
|
||||
proxy.readManuals();
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
|
||||
mantleBook = new Manual();
|
||||
mantleBook = new Manual().setUnlocalizedName("mantle.manual");
|
||||
GameRegistry.registerItem(mantleBook, "mantleBook");
|
||||
|
||||
BookData data = new BookData();
|
||||
data.unlocalizedName = "item.mantle.manual";
|
||||
data.toolTip = "Test Book";
|
||||
data.modID = CoreRepo.modId;
|
||||
|
||||
BookDataStore.addBook(data);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -7,15 +7,15 @@ import org.w3c.dom.Document;
|
||||
|
||||
public class BookData
|
||||
{
|
||||
public final String unlocalizedName = new String();
|
||||
public final String toolTip = new String();
|
||||
public final String modID = new String();
|
||||
public final ResourceLocation leftImage = new ResourceLocation("mantle", "textures/gui/bookleft.png");
|
||||
public final ResourceLocation rightImage = new ResourceLocation("mantle", "textures/gui/bookright.png");
|
||||
private final Document doc = ManualReader.readManual("/assets/mantle/manuals/test.xml");
|
||||
public String unlocalizedName = new String();
|
||||
public String toolTip = new String();
|
||||
public String modID = new String();
|
||||
public ResourceLocation leftImage = new ResourceLocation("mantle", "textures/gui/bookleft.png");
|
||||
public ResourceLocation rightImage = new ResourceLocation("mantle", "textures/gui/bookright.png");
|
||||
public Document doc = ManualReader.readManual("/assets/mantle/manuals/test.xml");
|
||||
//font can be left null if so, the default from mantle will be used
|
||||
public SmallFontRenderer font;
|
||||
public final Boolean isTranslatable = false;
|
||||
public Boolean isTranslatable = false;
|
||||
|
||||
public Document getDoc ()
|
||||
{
|
||||
|
||||
@@ -4,10 +4,10 @@ import com.google.common.collect.HashBiMap;
|
||||
|
||||
public class BookDataStore
|
||||
{
|
||||
private static HashBiMap<String, BookData> data;
|
||||
private static HashBiMap<Integer, String> intMap;
|
||||
private static HashBiMap<String, BookData> data = HashBiMap.create();
|
||||
private static HashBiMap<Integer, String> intMap = HashBiMap.create();
|
||||
|
||||
public void addBook (BookData bd)
|
||||
public static void addBook (BookData bd)
|
||||
{
|
||||
int insertOrder = data.size();
|
||||
data.put(bd.getFullUnlocalizedName(), bd);
|
||||
|
||||
@@ -68,6 +68,7 @@ public class MProxyClient extends MProxyCommon
|
||||
|
||||
private static BookData getBookDataFromStack (ItemStack stack)
|
||||
{
|
||||
System.out.println(stack.getItem().getUnlocalizedName());
|
||||
return BookDataStore.getBookFromName(stack.getItem().getUnlocalizedName());
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import java.util.List;
|
||||
import mantle.Mantle;
|
||||
import mantle.books.BookDataStore;
|
||||
import mantle.items.abstracts.CraftingItem;
|
||||
import mantle.lib.CoreRepo;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -15,18 +16,20 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Manual extends CraftingItem
|
||||
{
|
||||
|
||||
public final String modID;
|
||||
static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" };
|
||||
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue" };
|
||||
|
||||
public Manual()
|
||||
{
|
||||
super(name, textureName, "", "mantle", CreativeTabs.tabMisc);
|
||||
setUnlocalizedName("mantle.manual");
|
||||
modID = CoreRepo.modId;
|
||||
}
|
||||
public Manual(String[] name, String[] textureName, String folder, String modTexturePrefix, CreativeTabs tab)
|
||||
public Manual(String[] name, String[] textureName, String folder, String modTexturePrefix, CreativeTabs tab, String modID)
|
||||
{
|
||||
super(name, textureName, "", "mantle", tab);
|
||||
setUnlocalizedName("mantle.manual");
|
||||
this.modID = modID;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -39,10 +42,22 @@ public class Manual extends CraftingItem
|
||||
FMLClientHandler.instance().displayGuiScreen(player, new GuiManual(player.getCurrentEquippedItem(), getManualFromStack(stack)));*/
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
list.add("\u00a7o" + StatCollector.translateToLocal(BookDataStore.getBookfromID(stack.getItemDamage()).toolTip));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(){
|
||||
return modID + ":" + super.getUnlocalizedName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack){
|
||||
return modID + ":" + super.getUnlocalizedName(par1ItemStack);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user