mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 11:59:14 +00:00
Weaponry booooooook
This commit is contained in:
1 parent
b291c2671c
commit
6cd7b497e8
7 files changed
+94
-85
No files matched your search
@@ -3,6 +3,7 @@ package tconstruct.client;
|
||||
import java.io.InputStream;
|
||||
import java.text.DecimalFormat;
|
||||
import javax.xml.parsers.*;
|
||||
|
||||
import mantle.client.SmallFontRenderer;
|
||||
import mantle.lib.client.MantleClientRegistry;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -17,8 +18,7 @@ import tconstruct.armor.player.TPlayerStats;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.tools.items.ManualInfo;
|
||||
|
||||
public class TProxyClient extends TProxyCommon
|
||||
{
|
||||
public class TProxyClient extends TProxyCommon {
|
||||
public static DecimalFormat df = new DecimalFormat("##.#");
|
||||
|
||||
/* TODO: Split this class up into its respective parts */
|
||||
@@ -27,15 +27,13 @@ public class TProxyClient extends TProxyCommon
|
||||
public static Minecraft mc;
|
||||
public static RenderItem itemRenderer = new RenderItem();
|
||||
|
||||
public void initialize ()
|
||||
{
|
||||
public void initialize() {
|
||||
registerRenderer();
|
||||
readManuals();
|
||||
}
|
||||
|
||||
/* Registers any rendering code. */
|
||||
public void registerRenderer ()
|
||||
{
|
||||
public void registerRenderer() {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false);
|
||||
}
|
||||
@@ -44,68 +42,45 @@ public class TProxyClient extends TProxyCommon
|
||||
public static Document volume1;
|
||||
public static Document volume2;
|
||||
public static Document smelter;
|
||||
public static Document weaponry;
|
||||
public static ManualInfo manualData;
|
||||
|
||||
public void readManuals ()
|
||||
{
|
||||
public void readManuals() {
|
||||
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
|
||||
String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
|
||||
|
||||
Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/diary.xml", dbFactory);
|
||||
Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory);
|
||||
Document volume2_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/materials.xml", dbFactory);
|
||||
Document smelter_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/smeltery.xml", dbFactory);
|
||||
|
||||
diary = readManual("/assets/tinker/manuals/en_US/diary.xml", dbFactory);
|
||||
volume1 = readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory);
|
||||
volume2 = readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory);
|
||||
smelter = readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory);
|
||||
|
||||
if(diary_cl != null)
|
||||
{
|
||||
diary = diary_cl;
|
||||
}
|
||||
|
||||
if(volume1_cl != null)
|
||||
{
|
||||
volume1 = volume1_cl;
|
||||
}
|
||||
|
||||
if(volume2_cl != null)
|
||||
{
|
||||
volume2 = volume2_cl;
|
||||
}
|
||||
|
||||
if(smelter_cl != null)
|
||||
{
|
||||
smelter = smelter_cl;
|
||||
}
|
||||
|
||||
initManualIcons();
|
||||
String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode();
|
||||
|
||||
Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/diary.xml", dbFactory);
|
||||
Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory);
|
||||
Document volume2_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/materials.xml", dbFactory);
|
||||
Document smelter_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/smeltery.xml", dbFactory);
|
||||
Document weaponry_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/weaponry.xml", dbFactory);
|
||||
|
||||
diary = diary_cl != null ? diary_cl : readManual("/assets/tinker/manuals/en_US/diary.xml", dbFactory);
|
||||
volume1 = volume1_cl != null ? volume1_cl : readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory);
|
||||
volume2 = volume2_cl != null ? volume2_cl : readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory);
|
||||
smelter = smelter_cl != null ? smelter_cl : readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory);
|
||||
weaponry = weaponry_cl != null ? weaponry_cl : readManual("/assets/tinker/manuals/en_US/weaponry.xml", dbFactory);
|
||||
|
||||
initManualIcons();
|
||||
initManualRecipes();
|
||||
initManualPages();
|
||||
manualData = new ManualInfo();
|
||||
}
|
||||
|
||||
Document readManual (String location, DocumentBuilderFactory dbFactory)
|
||||
{
|
||||
try
|
||||
{
|
||||
Document readManual(String location, DocumentBuilderFactory dbFactory) {
|
||||
try {
|
||||
InputStream stream = TConstruct.class.getResourceAsStream(location);
|
||||
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
|
||||
Document doc = dBuilder.parse(stream);
|
||||
doc.getDocumentElement().normalize();
|
||||
return doc;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void initManualIcons ()
|
||||
{
|
||||
public void initManualIcons() {
|
||||
MantleClientRegistry.registerManualIcon("torch", new ItemStack(Blocks.torch));
|
||||
MantleClientRegistry.registerManualIcon("sapling", new ItemStack(Blocks.sapling));
|
||||
MantleClientRegistry.registerManualIcon("workbench", new ItemStack(Blocks.crafting_table));
|
||||
@@ -121,34 +96,29 @@ public class TProxyClient extends TProxyCommon
|
||||
MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Blocks.netherrack));
|
||||
}
|
||||
|
||||
public void initManualRecipes ()
|
||||
{
|
||||
public void initManualRecipes() {
|
||||
}
|
||||
|
||||
void initManualPages ()
|
||||
{
|
||||
void initManualPages() {
|
||||
|
||||
}
|
||||
|
||||
public static Document getManualFromStack (ItemStack stack)
|
||||
{
|
||||
switch (stack.getItemDamage())
|
||||
{
|
||||
case 0:
|
||||
return volume1;
|
||||
case 1:
|
||||
return volume2;
|
||||
case 2:
|
||||
return smelter;
|
||||
case 3:
|
||||
return diary;
|
||||
public static Document getManualFromStack(ItemStack stack) {
|
||||
switch (stack.getItemDamage()) {
|
||||
case 0:
|
||||
return volume1;
|
||||
case 1:
|
||||
return volume2;
|
||||
case 2:
|
||||
return smelter;
|
||||
case 3:
|
||||
return diary;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public void recalculateHealth ()
|
||||
{
|
||||
public void recalculateHealth() {
|
||||
ArmorProxyClient.armorExtended.recalculateHealth(mc.thePlayer, TPlayerStats.get(mc.thePlayer));
|
||||
}
|
||||
|
||||
|
||||
@@ -101,8 +101,8 @@ public class ToolProxyClient extends ToolProxyCommon
|
||||
MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.frypanHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.signHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.chiselHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerWeaponry.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerWeaponry.fletching, 1, 0), ""));
|
||||
//MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerWeaponry.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), ""));
|
||||
//MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerWeaponry.fletching, 1, 0), ""));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hammerHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.largePlate, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), ""));
|
||||
|
||||
@@ -18,8 +18,8 @@ import tconstruct.library.TConstructRegistry;
|
||||
|
||||
public class Manual extends CraftingItem
|
||||
{
|
||||
static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" };
|
||||
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue" };
|
||||
static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary", "weaponry" };
|
||||
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue", "tinkerbook_green" };
|
||||
|
||||
public Manual()
|
||||
{
|
||||
@@ -50,6 +50,8 @@ public class Manual extends CraftingItem
|
||||
return TProxyClient.manualData.toolStation;
|
||||
case 2:
|
||||
return TProxyClient.manualData.smeltery;
|
||||
case 4:
|
||||
return TProxyClient.manualData.weaponry;
|
||||
default:
|
||||
return TProxyClient.manualData.diary;
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ public class ManualInfo
|
||||
BookData toolStation = new BookData();
|
||||
BookData smeltery = new BookData();
|
||||
BookData diary = new BookData();
|
||||
BookData weaponry = new BookData();
|
||||
|
||||
/* diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory);
|
||||
volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory);
|
||||
@@ -29,7 +30,7 @@ public class ManualInfo
|
||||
toolStation = initManual(toolStation, "tconstruct.manual.toolstation", "\u00a7o" + StatCollector.translateToLocal("manual2.tooltip"), side == Side.CLIENT ? TProxyClient.volume2 : null, "tinker:tinkerbook_toolstation");
|
||||
smeltery = initManual(smeltery, "tconstruct.manual.smeltery", "\u00a7o" + StatCollector.translateToLocal("manual3.tooltip"), side == Side.CLIENT ? TProxyClient.smelter : null, "tinker:tinkerbook_smeltery");
|
||||
diary = initManual(diary, "tconstruct.manual.diary", "\u00a7o" + StatCollector.translateToLocal("manual4.tooltip"), side == Side.CLIENT ? TProxyClient.diary : null, "tinker:tinkerbook_blue");
|
||||
|
||||
weaponry = initManual(weaponry, "tconstruct.manual.weaponry", "\u00a7o" + StatCollector.translateToLocal("manual5.tooltip"), side == Side.CLIENT ? TProxyClient.weaponry : null, "tinker:tinkerbook_green");
|
||||
}
|
||||
|
||||
public BookData initManual (BookData data, String unlocName, String toolTip, Document xmlDoc, String itemImage)
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package tconstruct.weaponry;
|
||||
|
||||
import mantle.lib.client.MantleClientRegistry;
|
||||
import net.minecraft.init.Items;
|
||||
import tconstruct.client.AmmoItemRenderer;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.entity.ProjectileBase;
|
||||
import tconstruct.weaponry.client.AmmoSlotHandler;
|
||||
import tconstruct.weaponry.client.CrosshairHandler;
|
||||
@@ -39,6 +42,7 @@ public class WeaponryClientProxy extends WeaponryCommonProxy {
|
||||
registerMaterialRendering();
|
||||
|
||||
buttons();
|
||||
registerManualIcons();
|
||||
}
|
||||
|
||||
private void registerRenderers()
|
||||
@@ -159,4 +163,15 @@ public class WeaponryClientProxy extends WeaponryCommonProxy {
|
||||
TConstructClientRegistry.addTierTwoButton(icons[i][0], icons[i][1], icons[i][2], coords[i*2], coords[i*2+1], tools[i].getLocalizedToolName(), locString, Reference.RESOURCE, tex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Manual Stuff */
|
||||
public void registerManualIcons ()
|
||||
{
|
||||
MantleClientRegistry.registerManualIcon("throwingknifeIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, TinkerTools.MaterialID.Iron), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.partBowLimb, 1, TinkerTools.MaterialID.Wood), new ItemStack(TinkerWeaponry.bowstring, 1, 0), new ItemStack(TinkerWeaponry.partBowLimb, 1, TinkerTools.MaterialID.Wood), ""));
|
||||
MantleClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TinkerWeaponry.arrowhead, 1, TinkerTools.MaterialID.Flint), new ItemStack(Items.stick), new ItemStack(TinkerWeaponry.fletching, 1, 0), ""));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("weaponrybook", new ItemStack(TinkerTools.manualBook, 1, 4));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user