mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +00:00
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
This commit is contained in:
commit
035cc454a5
8 files changed
+42
-15
No files matched your search
@@ -5,6 +5,8 @@ import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -86,7 +88,7 @@ public class RecipeHandlerAlloying extends RecipeHandlerBase
|
||||
@Override
|
||||
public String getRecipeName ()
|
||||
{
|
||||
return "Smeltery Alloying";
|
||||
return StatCollector.translateToLocal("tconstruct.nei.alloying");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,6 +5,8 @@ import java.util.List;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.CastingRecipe;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
@@ -16,7 +18,7 @@ public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase
|
||||
@Override
|
||||
public String getRecipeName ()
|
||||
{
|
||||
return "Casting Basin";
|
||||
return StatCollector.translateToLocal("tconstruct.nei.castingbasin");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,6 +5,8 @@ import java.util.List;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.CastingRecipe;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
@@ -16,7 +18,7 @@ public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase
|
||||
@Override
|
||||
public String getRecipeName ()
|
||||
{
|
||||
return "Casting Table";
|
||||
return StatCollector.translateToLocal("tconstruct.nei.castingtable");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import tconstruct.library.crafting.DryingRackRecipes;
|
||||
import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe;
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
@@ -46,7 +48,7 @@ public class RecipeHandlerDryingRack extends RecipeHandlerBase
|
||||
@Override
|
||||
public String getRecipeName ()
|
||||
{
|
||||
return "Drying Rack";
|
||||
return StatCollector.translateToLocal("tconstruct.nei.dryingrack");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,6 +11,8 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import tconstruct.library.crafting.Smeltery;
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
import codechicken.nei.NEIServerUtils;
|
||||
@@ -59,7 +61,7 @@ public class RecipeHandlerMelting extends RecipeHandlerBase
|
||||
@Override
|
||||
public String getRecipeName ()
|
||||
{
|
||||
return "Smeltery Melting";
|
||||
return StatCollector.translateToLocal("tconstruct.nei.melting");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,6 +6,7 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -59,7 +60,7 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase
|
||||
@Override
|
||||
public String getRecipeName ()
|
||||
{
|
||||
return "Tool Materials";
|
||||
return StatCollector.translateToLocal("tconstruct.nei.toolmaterials");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -101,19 +102,19 @@ public class RecipeHandlerToolMaterials extends RecipeHandlerBase
|
||||
if (crecipe.material != null)
|
||||
{
|
||||
GuiDraw.drawString(EnumChatFormatting.BOLD + crecipe.material.localizedName(), 35, 10, 0x404040, false);
|
||||
GuiDraw.drawString("Base Durability: " + crecipe.material.durability, 35, 20, 0x404040, false);
|
||||
GuiDraw.drawString("Handle Modifier: " + crecipe.material.handleModifier + "x", 35, 30, 0x404040, false);
|
||||
GuiDraw.drawString("Full Durability: " + Math.round(crecipe.material.durability * crecipe.material.handleModifier), 35, 40, 0x404040, false);
|
||||
GuiDraw.drawString("Mining Speed: " + crecipe.material.miningspeed / 100F, 35, 50, 0x404040, false);
|
||||
GuiDraw.drawString("Mining Level: " + HarvestLevels.getHarvestLevelName(crecipe.material.harvestLevel), 35, 60, 0x404040, false);
|
||||
String heart = crecipe.material.attack == 2 ? " Heart" : " Hearts";
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter4") + crecipe.material.durability, 35, 20, 0x404040, false);
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter5") + crecipe.material.handleModifier + "x", 35, 30, 0x404040, false);
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter11") + Math.round(crecipe.material.durability * crecipe.material.handleModifier), 35, 40, 0x404040, false);
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter6") + crecipe.material.miningspeed / 100F, 35, 50, 0x404040, false);
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter7") + HarvestLevels.getHarvestLevelName(crecipe.material.harvestLevel), 35, 60, 0x404040, false);
|
||||
String heart = crecipe.material.attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9");
|
||||
if (crecipe.material.attack() % 2 == 0)
|
||||
{
|
||||
GuiDraw.drawString("Attack: " + crecipe.material.attack / 2 + heart, 35, 70, 0x404040, false);
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter10") + crecipe.material.attack / 2 + heart, 35, 70, 0x404040, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
GuiDraw.drawString("Attack: " + crecipe.material.attack / 2F + heart, 35, 70, 0x404040, false);
|
||||
GuiDraw.drawString(StatCollector.translateToLocal("gui.partcrafter11") + crecipe.material.attack / 2F + heart, 35, 70, 0x404040, false);
|
||||
}
|
||||
int abilityY = 85;
|
||||
if (crecipe.material.reinforced > 0)
|
||||
|
||||
Reference in new issue
Block a user