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

switch to standard of snake_case in ids and resource files

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-27 21:23:35 +01:00
parent 995600bd16
commit 0c16a1e2d6
19 changed files with 67 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/storagecraft/block/BlockExternalStorage.java Normal file → Executable file
View File

@@ -14,7 +14,7 @@ public class BlockExternalStorage extends BlockMachine
{
public BlockExternalStorage()
{
super("externalStorage");
super("external_storage");
}
@Override

2
src/main/java/storagecraft/block/BlockMachineCasing.java
View File

@@ -4,6 +4,6 @@ public class BlockMachineCasing extends BlockBase
{
public BlockMachineCasing()
{
super("machineCasing");
super("machine_casing");
}
}

2
src/main/java/storagecraft/block/BlockWirelessTransmitter.java
View File

@@ -15,7 +15,7 @@ public class BlockWirelessTransmitter extends BlockMachine
{
public BlockWirelessTransmitter()
{
super("wirelessTransmitter");
super("wireless_transmitter");
}
@Override

4
src/main/java/storagecraft/gui/GuiController.java Normal file → Executable file
View File

@@ -49,11 +49,11 @@ public class GuiController extends GuiBase
drawString(7, 7, t("gui.storagecraft:controller"));
drawString(7, 87, t("container.inventory"));
drawString(31, 20, t("misc.storagecraft:energyUsage", controller.getEnergyUsage()));
drawString(31, 20, t("misc.storagecraft:energy_usage", controller.getEnergyUsage()));
if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY))
{
drawTooltip(mouseX, mouseY, t("misc.storagecraft:energyStored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
drawTooltip(mouseX, mouseY, t("misc.storagecraft:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
}
}
}

4
src/main/java/storagecraft/gui/GuiExternalStorage.java Normal file → Executable file
View File

@@ -29,7 +29,7 @@ public class GuiExternalStorage extends GuiBase
@Override
public void drawBackground(int x, int y, int mouseX, int mouseY)
{
bindTexture("gui/externalStorage.png");
bindTexture("gui/external_storage.png");
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
}
@@ -37,7 +37,7 @@ public class GuiExternalStorage extends GuiBase
@Override
public void drawForeground(int mouseX, int mouseY)
{
drawString(7, 7, t("gui.storagecraft:externalStorage"));
drawString(7, 7, t("gui.storagecraft:external_storage"));
drawString(7, 39, t("container.inventory"));
}
}

2
src/main/java/storagecraft/gui/GuiGrid.java Normal file → Executable file
View File

@@ -131,7 +131,7 @@ public class GuiGrid extends GuiBase
{
if (grid.getType() == EnumGridType.CRAFTING)
{
bindTexture("gui/craftingGrid.png");
bindTexture("gui/crafting_grid.png");
}
else
{

4
src/main/java/storagecraft/gui/GuiWirelessTransmitter.java
View File

@@ -29,7 +29,7 @@ public class GuiWirelessTransmitter extends GuiBase
@Override
public void drawBackground(int x, int y, int mouseX, int mouseY)
{
bindTexture("gui/wirelessTransmitter.png");
bindTexture("gui/wireless_transmitter.png");
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
@@ -44,7 +44,7 @@ public class GuiWirelessTransmitter extends GuiBase
@Override
public void drawForeground(int mouseX, int mouseY)
{
drawString(7, 7, t("gui.storagecraft:wirelessTransmitter"));
drawString(7, 7, t("gui.storagecraft:wireless_transmitter"));
drawString(7, 43, t("container.inventory"));
}
}

4
src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java
View File

@@ -22,9 +22,9 @@ public class SideButtonRedstoneMode extends SideButton
{
StringBuilder builder = new StringBuilder();
builder.append(EnumChatFormatting.RED).append(gui.t("sidebutton.storagecraft:redstoneMode")).append(EnumChatFormatting.RESET).append("\n");
builder.append(EnumChatFormatting.RED).append(gui.t("sidebutton.storagecraft:redstone_mode")).append(EnumChatFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.storagecraft:redstoneMode." + setting.getRedstoneMode().id));
builder.append(gui.t("sidebutton.storagecraft:redstone_mode." + setting.getRedstoneMode().id));
return builder.toString();
}

2
src/main/java/storagecraft/item/ItemQuartzEnrichedIron.java
View File

@@ -4,6 +4,6 @@ public class ItemQuartzEnrichedIron extends ItemBase
{
public ItemQuartzEnrichedIron()
{
super("quartzEnrichedIron");
super("quartz_enriched_iron");
}
}

6
src/main/java/storagecraft/item/ItemStorageCell.java Normal file → Executable file
View File

@@ -21,7 +21,7 @@ public class ItemStorageCell extends ItemBase
public ItemStorageCell()
{
super("storageCell");
super("storage_cell");
setMaxStackSize(1);
setHasSubtypes(true);
@@ -42,11 +42,11 @@ public class ItemStorageCell extends ItemBase
{
if (getCapacity(cell) == -1)
{
list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storageCellStored"), getStored(cell)));
list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage_cell_stored"), getStored(cell)));
}
else
{
list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storageCellStoredWithCapacity"), getStored(cell), getCapacity(cell)));
list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage_cell_stored_capacity"), getStored(cell), getCapacity(cell)));
}
}

2
src/main/java/storagecraft/item/ItemStoragePart.java
View File

@@ -14,7 +14,7 @@ public class ItemStoragePart extends ItemBase
public ItemStoragePart()
{
super("storagePart");
super("storage_part");
setHasSubtypes(true);
setMaxDamage(0);

14
src/main/java/storagecraft/item/ItemWirelessGrid.java
View File

@@ -24,7 +24,7 @@ public class ItemWirelessGrid extends ItemBase
public ItemWirelessGrid()
{
super("wirelessGrid");
super("wireless_grid");
setMaxStackSize(1);
setHasSubtypes(true);
@@ -45,7 +45,7 @@ public class ItemWirelessGrid extends ItemBase
{
if (isValid(stack))
{
list.add(StatCollector.translateToLocalFormatted("misc.storagecraft:wirelessGrid.tooltip", getX(stack), getY(stack), getZ(stack)));
list.add(StatCollector.translateToLocalFormatted("misc.storagecraft:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack)));
}
}
@@ -74,7 +74,7 @@ public class ItemWirelessGrid extends ItemBase
if (grid == null)
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wirelessGrid.noGrid." + stack.getItemDamage())));
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage())));
}
else
{
@@ -83,22 +83,22 @@ public class ItemWirelessGrid extends ItemBase
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wirelessGrid.notWorking")));
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_working")));
}
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wirelessGrid.notFound")));
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_found")));
}
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wirelessGrid.outOfRange")));
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.out_of_range")));
}
}
else
{
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wirelessGrid.notSet." + stack.getItemDamage())));
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage())));
}
}

2
src/main/java/storagecraft/item/ItemWirelessGridPlate.java
View File

@@ -4,7 +4,7 @@ public class ItemWirelessGridPlate extends ItemBase
{
public ItemWirelessGridPlate()
{
super("wirelessGridPlate");
super("wireless_grid_plate");
setMaxStackSize(1);
}

16
src/main/java/storagecraft/proxy/CommonProxy.java
View File

@@ -69,12 +69,12 @@ public class CommonProxy
GameRegistry.registerTileEntity(TileCable.class, "cable");
GameRegistry.registerTileEntity(TileGrid.class, "grid");
GameRegistry.registerTileEntity(TileDrive.class, "drive");
GameRegistry.registerTileEntity(TileExternalStorage.class, "externalStorage");
GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage");
GameRegistry.registerTileEntity(TileImporter.class, "importer");
GameRegistry.registerTileEntity(TileExporter.class, "exporter");
GameRegistry.registerTileEntity(TileDetector.class, "detector");
GameRegistry.registerTileEntity(TileSolderer.class, "solderer");
GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wirelessTransmitter");
GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter");
GameRegistry.registerTileEntity(TileDestructor.class, "destructor");
GameRegistry.registerTileEntity(TileConstructor.class, "constructor");
@@ -82,24 +82,24 @@ public class CommonProxy
GameRegistry.registerBlock(StorageCraftBlocks.CABLE, ItemBlockCable.class, "cable");
GameRegistry.registerBlock(StorageCraftBlocks.GRID, ItemBlockGrid.class, "grid");
GameRegistry.registerBlock(StorageCraftBlocks.DRIVE, "drive");
GameRegistry.registerBlock(StorageCraftBlocks.EXTERNAL_STORAGE, "externalStorage");
GameRegistry.registerBlock(StorageCraftBlocks.EXTERNAL_STORAGE, "external_storage");
GameRegistry.registerBlock(StorageCraftBlocks.IMPORTER, "importer");
GameRegistry.registerBlock(StorageCraftBlocks.EXPORTER, "exporter");
GameRegistry.registerBlock(StorageCraftBlocks.DETECTOR, "detector");
GameRegistry.registerBlock(StorageCraftBlocks.MACHINE_CASING, "machineCasing");
GameRegistry.registerBlock(StorageCraftBlocks.MACHINE_CASING, "machine_casing");
GameRegistry.registerBlock(StorageCraftBlocks.SOLDERER, "solderer");
GameRegistry.registerBlock(StorageCraftBlocks.WIRELESS_TRANSMITTER, "wirelessTransmitter");
GameRegistry.registerBlock(StorageCraftBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter");
GameRegistry.registerBlock(StorageCraftBlocks.DESTRUCTOR, "destructor");
GameRegistry.registerBlock(StorageCraftBlocks.CONSTRUCTOR, "constructor");
GameRegistry.registerItem(StorageCraftItems.STORAGE_CELL, "storageCell");
GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID, "wirelessGrid");
GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID_PLATE, "wirelessGridPlate");
GameRegistry.registerItem(StorageCraftItems.QUARTZ_ENRICHED_IRON, "quartzEnrichedIron");
GameRegistry.registerItem(StorageCraftItems.WIRELESS_GRID_PLATE, "wireless_grid_plate");
GameRegistry.registerItem(StorageCraftItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron");
GameRegistry.registerItem(StorageCraftItems.CORE, "core");
GameRegistry.registerItem(StorageCraftItems.SILICON, "silicon");
GameRegistry.registerItem(StorageCraftItems.PROCESSOR, "processor");
GameRegistry.registerItem(StorageCraftItems.STORAGE_PART, "storagePart");
GameRegistry.registerItem(StorageCraftItems.STORAGE_PART, "storage_part");
// Processors
SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC));