dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix key bindings localization

Browse Source
This commit is contained in:
raoulvdberge
2017-04-01 16:37:30 +02:00
parent 8dd7aa38f9
commit fd700912f5
25 changed files with 70 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java
View File

@@ -6,9 +6,7 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
import org.lwjgl.input.Keyboard;
public final class RSKeyBindings {
private static final String categoryName = RS.ID;
public static final KeyBinding focusSearchBar = new KeyBinding("key.rs.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, categoryName);
public static final KeyBinding focusSearchBar = new KeyBinding("key.refinedstorage.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, "Refined Storage");
public static void init() {
ClientRegistry.registerKeyBinding(focusSearchBar);

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
View File

@@ -26,6 +26,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nullable;
public abstract class BlockBase extends Block {
private final String name;
@@ -189,6 +191,7 @@ public abstract class BlockBase extends Block {
return super.canEntityDestroy(state, world, pos, entity);
}
@Nullable
public Direction getDirection() {
return Direction.HORIZONTAL;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
View File

@@ -21,6 +21,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -226,6 +227,7 @@ public class BlockCable extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -92,6 +93,7 @@ public class BlockConstructor extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java
View File

@@ -10,6 +10,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockCrafter extends BlockNode {
public BlockCrafter() {
super("crafter");
@@ -30,6 +32,7 @@ public class BlockCrafter extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY_FACE_PLAYER;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.List;
public class BlockDestructor extends BlockCable {
@@ -48,6 +49,7 @@ public class BlockDestructor extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
View File

@@ -15,6 +15,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockDetector extends BlockNode {
private static final AxisAlignedBB AABB_DETECTOR = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 5D / 16D, 1.0D);
@@ -87,6 +89,7 @@ public class BlockDetector extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -98,6 +99,7 @@ public class BlockExporter extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java
View File

@@ -14,6 +14,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -96,6 +97,7 @@ public class BlockExternalStorage extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java
View File

@@ -11,6 +11,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockFluidInterface extends BlockNode {
public BlockFluidInterface() {
super("fluid_interface");
@@ -36,6 +38,7 @@ public class BlockFluidInterface extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
View File

@@ -22,6 +22,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -112,6 +113,7 @@ public class BlockFluidStorage extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -98,6 +99,7 @@ public class BlockImporter extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java
View File

@@ -11,6 +11,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockInterface extends BlockNode {
public BlockInterface() {
super("interface");
@@ -36,6 +38,7 @@ public class BlockInterface extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java
View File

@@ -1,11 +1,14 @@
package com.raoulvdberge.refinedstorage.block;
import javax.annotation.Nullable;
public class BlockMachineCasing extends BlockBase {
public BlockMachineCasing() {
super("machine_casing");
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java
View File

@@ -5,6 +5,8 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockNetworkReceiver extends BlockNode {
public BlockNetworkReceiver() {
super("network_receiver");
@@ -16,6 +18,7 @@ public class BlockNetworkReceiver extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java
View File

@@ -10,6 +10,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockNetworkTransmitter extends BlockNode {
public BlockNetworkTransmitter() {
super("network_transmitter");
@@ -30,6 +32,7 @@ public class BlockNetworkTransmitter extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java
View File

@@ -14,6 +14,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.List;
public class BlockProcessingPatternEncoder extends BlockBase {
@@ -49,6 +50,7 @@ public class BlockProcessingPatternEncoder extends BlockBase {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java
View File

@@ -1,11 +1,14 @@
package com.raoulvdberge.refinedstorage.block;
import javax.annotation.Nullable;
public class BlockQuartzEnrichedIron extends BlockBase {
public BlockQuartzEnrichedIron() {
super("quartz_enriched_iron_block");
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java
View File

@@ -15,6 +15,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.List;
public class BlockReader extends BlockCable {
@@ -70,6 +71,7 @@ public class BlockReader extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY_FACE_PLAYER;
}

3
src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java
View File

@@ -10,6 +10,8 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nullable;
public class BlockRelay extends BlockNode {
public BlockRelay() {
super("relay");
@@ -30,6 +32,7 @@ public class BlockRelay extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
View File

@@ -22,6 +22,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@@ -112,6 +113,7 @@ public class BlockStorage extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java
View File

@@ -17,6 +17,7 @@ import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.List;
public class BlockWirelessTransmitter extends BlockNode {
@@ -85,6 +86,7 @@ public class BlockWirelessTransmitter extends BlockNode {
}
@Override
@Nullable
public Direction getDirection() {
return null;
}

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java
View File

@@ -16,6 +16,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nullable;
import java.util.List;
public class BlockWriter extends BlockCable {
@@ -91,6 +92,7 @@ public class BlockWriter extends BlockCable {
}
@Override
@Nullable
public Direction getDirection() {
return Direction.ANY_FACE_PLAYER;
}

26
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -73,16 +73,16 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
private int slotNumber;
private Deque<Integer> konami = new ArrayDeque<>(Arrays.asList(
Keyboard.KEY_UP,
Keyboard.KEY_UP,
Keyboard.KEY_DOWN,
Keyboard.KEY_DOWN,
Keyboard.KEY_LEFT,
Keyboard.KEY_RIGHT,
Keyboard.KEY_LEFT,
Keyboard.KEY_RIGHT,
Keyboard.KEY_B,
Keyboard.KEY_A
Keyboard.KEY_UP,
Keyboard.KEY_UP,
Keyboard.KEY_DOWN,
Keyboard.KEY_DOWN,
Keyboard.KEY_LEFT,
Keyboard.KEY_RIGHT,
Keyboard.KEY_LEFT,
Keyboard.KEY_RIGHT,
Keyboard.KEY_B,
Keyboard.KEY_A
));
private int[] konamiOffsetsX;
@@ -170,9 +170,9 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
stacks.addAll(grid.getType() == GridType.FLUID ? FLUIDS.values() : ITEMS.values());
List<Predicate<IGridStack>> filters = GridFilterParser.getFilters(
grid,
searchField.getText(),
(grid.getTabSelected() >= 0 && grid.getTabSelected() < grid.getTabs().size()) ? grid.getTabs().get(grid.getTabSelected()).getFilters() : grid.getFilters()
grid,
searchField.getText(),
(grid.getTabSelected() >= 0 && grid.getTabSelected() < grid.getTabs().size()) ? grid.getTabs().get(grid.getTabSelected()).getFilters() : grid.getFilters()
);
Iterator<IGridStack> t = stacks.iterator();

2
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -1,5 +1,7 @@
itemGroup.refinedstorage=Refined Storage
key.refinedstorage.focusSearchBar=Grid Search Bar Focus
gui.refinedstorage:controller.0=Controller
gui.refinedstorage:controller.1=Creative Controller
gui.refinedstorage:grid=Grid