diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-25 04:34:06 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-01-25 04:34:06 +0000 |
| commit | 499411aa21ac4a742b6d51ef3ce9c4046d0a22c1 (patch) | |
| tree | 98b94f327948b00e962ea0c7146dbd0034b4ede3 /src/Java/gtPlusPlus/core/item/base | |
| parent | 86bf45662a877c8ce9ca9551b41c789c098dc698 (diff) | |
| download | GT5-Unofficial-499411aa21ac4a742b6d51ef3ce9c4046d0a22c1.tar.gz GT5-Unofficial-499411aa21ac4a742b6d51ef3ce9c4046d0a22c1.tar.bz2 GT5-Unofficial-499411aa21ac4a742b6d51ef3ce9c4046d0a22c1.zip | |
+ Added recipes to obtain Astral Titanium, Celestial Tungsten Advanced Nitinol and Chromatic Glass.
+ Added Particle Physics, so some basic extent.
+ Added new textures for some Meta items.
+ Added new textures for all particles and ions.
+ Added Custom Debug NBT to error ingots, in the event one is obtained by a player.
+ Added more information to the tooltip of Control Cores.
+ Added more uniform ways to obtain tiered item components to CI.
- Hard disable of GC Fuel tweaks for the moment.
% Hopefully greatly improved the cape handler. Cape list is now stored on Overmind's site, meaning it can be updated outside of the mod.
% Cape Handler now will store the cape data locally in a .dat for offline use, this can be updated anytime by removing it, or once a week if outdated)
% Tweaked Cyclotron Recipe map to support new changes to functionality.
% Tweaked RTG fuel pellet production time in Cyclotron to be 100x.
% Adjusted requirements for Quicklime to generate (It may vanish after this commit, May be worth rolling back if an issue.).
% Adjusted code to use checkForInvalidItems instead of direct item comparisons in several places.
% Renamed Buffer Cores to Energy Cores.
% Adjusted recipes for Energy Cores and Energy Buffers, they now require 6 slot assembly.
$ Fixed Multiblock handling during structure checks, they'd accidentally detect the controller as an invalid block.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java index 89cd1e55ae..b7bbc84757 100644 --- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java +++ b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java @@ -30,7 +30,10 @@ public abstract class BaseItemParticle extends CoreItem { public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { return aColourMap.get(stack.getItemDamage()); } - + + public int getColorFromParentClass(ItemStack stack, int aaa) { + return super.getColorFromItemStack(stack, aaa); + } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override |
