diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-29 18:45:40 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-29 18:45:40 +1000 |
| commit | 0828168a736692402bd621b984c2d35590ed9730 (patch) | |
| tree | fb9da5ea4836544b6278364db449ed5cebf52696 /src/Java/gtPlusPlus/core/util | |
| parent | 33a1703896cbc37b9986c71038e20c659edb7814 (diff) | |
| download | GT5-Unofficial-0828168a736692402bd621b984c2d35590ed9730.tar.gz GT5-Unofficial-0828168a736692402bd621b984c2d35590ed9730.tar.bz2 GT5-Unofficial-0828168a736692402bd621b984c2d35590ed9730.zip | |
+ Added Trinium Titanium Cable/wires.
+ Redid material components to better use GT texture assets.
% Gave all 32 ore types new TextureSets.
% Doubled capacity of all fluid pipes.
% Moved Item/Block creation from init() to preInit().
$ Fixed Sludge fluid texture.
$ Moved Darkworld from being a child mod into it's own mod, Renamed to Toxic Everglades.
$ Bundled SegmentHelper.java, for future development ease.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java | 7 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java | 23 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java index b4a3e23997..8a99edac5f 100644 --- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java +++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java @@ -442,14 +442,17 @@ public class FluidUtils { ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - GT_Values.RA.addFluidExtractionRecipe( + //Disable this, not sure why it exists //TODO + /*GT_Values.RA.addFluidExtractionRecipe( ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1), //Input null, //Input 2 FluidUtils.getFluidStack(gtFluid, 144), //Fluid Output 0, //Chance 1*20, //Duration 16 //Eu Tick - ); + );*/ + + return gtFluid; } Logger.INFO("FLUID GENERATION FAILED FOR "+localizedName); diff --git a/src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java b/src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java new file mode 100644 index 0000000000..3b5dc3b5d8 --- /dev/null +++ b/src/Java/gtPlusPlus/core/util/input/KeyboardUtils.java @@ -0,0 +1,23 @@ +package gtPlusPlus.core.util.input; + +import org.lwjgl.input.Keyboard; + +import net.minecraft.client.Minecraft; + +public class KeyboardUtils { + + public static boolean isCtrlKeyDown(){ + // prioritize CONTROL, but allow OPTION as well on Mac (note: GuiScreen's isCtrlKeyDown only checks for the OPTION key on Mac) + boolean isCtrlKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL); + if (!isCtrlKeyDown && Minecraft.isRunningOnMac) + isCtrlKeyDown = Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA); + + return isCtrlKeyDown; + } + + public static boolean isShiftKeyDown(){ + return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); + + } + +} |