aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/materials
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-29 05:09:01 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-29 05:09:01 +0000
commit6205a2088bbbc31a09d0a2a3d460add1a7622801 (patch)
tree497380cea05b2a394fe303e8fcc2d688bed6f6d1 /src/Java/gtPlusPlus/core/item/materials
parent7f2c38ccc6fb2734ac6655b9dd7003c4b6dee4a3 (diff)
downloadGT5-Unofficial-6205a2088bbbc31a09d0a2a3d460add1a7622801.tar.gz
GT5-Unofficial-6205a2088bbbc31a09d0a2a3d460add1a7622801.tar.bz2
GT5-Unofficial-6205a2088bbbc31a09d0a2a3d460add1a7622801.zip
+ Added recipe for heating Titanium Ingots, required for Krypton processing.
+ Added custom GT TextureSets. $ Lots of small fixes to Material, Material Generation & Recipe Generation. $ Lots of small fixes to Fluids, Fluid Generation and Fluid Cell Generation. $ Fixed Creative Tabs. $ Possibly fixed issue where tickable items would instantly tick to 0. $ Fixed display names of Throwable Potions. $ Fixed NPE in removeCrudeTurbineRotors(). % Adjusted lots of textures. % Adjusted handling of Thermal Foundation Fluids. % Moved Furnace/EBF and Maceration recipes out of BaseItemDust.java. % Made Tooltips of GT++ Material Blocks, Frames and ores more informational. % Made Bromine a Fluid Material, this will remove all Bromine solid material items from the world. (Ingots, Blocks, etc.) % Increased cost of GT++ Ores in processing. - Broke lots of recipes. > EBF/ABS & All Table Crafting. TBA~
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/materials')
-rw-r--r--src/Java/gtPlusPlus/core/item/materials/DustDecayable.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
index 8e19896b92..aa3b044802 100644
--- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
+++ b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java
@@ -30,9 +30,9 @@ public class DustDecayable extends BaseItemTickable {
@Override
public void registerIcons(IIconRegister reg) {
- String gt = "gregtech" + ":" + "materialicons/"+"METALLIC"+"/" + "dust";
+ String gt = "gregtech" + ":" + "materialicons/"+"SHINY"+"/" + "dust";
this.mIcon[0] = reg.registerIcon(gt);
- String gt2 = "gregtech" + ":" + "materialicons/"+"METALLIC"+"/" + "dust" + "_OVERLAY";
+ String gt2 = "gregtech" + ":" + "materialicons/"+"SHINY"+"/" + "dust" + "_OVERLAY";
this.mIcon[1] = reg.registerIcon(gt2);
}
@@ -57,15 +57,16 @@ public class DustDecayable extends BaseItemTickable {
}
}
- if (!tickItemTag(world, iStack)) {
+ if (!tickItemTag(world, iStack) && !this.getIsActive(world, iStack)) {
if (entityHolding instanceof EntityPlayer){
ItemStack replacement = ItemUtils.getSimpleStack(turnsIntoItem);
//Logger.INFO("Replacing "+iStack.getDisplayName()+" with "+replacement.getDisplayName()+".");
final ItemStack tempTransform = replacement;
- if (iStack.stackSize == 64){
- tempTransform.stackSize=64;
+ if (iStack.stackSize > 1){
+ int u = iStack.stackSize;
+ tempTransform.stackSize = u;
((EntityPlayer) entityHolding).inventory.addItemStackToInventory((tempTransform));
- for (int l=0;l<64;l++){
+ for (int l=0;l<u;l++){
((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this);
}