fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed translations for items and blocks.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-01 16:08:27 +02:00
parent 7cdbe431e5
commit 84ac312ba9
18 changed files with 1693 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/decorative/solid/BlockSkyStone.java
-16
View File
@@ -98,22 +98,6 @@ public class BlockSkyStone extends AEBaseBlock
}
}
@Override
public String getUnlocalizedName( final ItemStack is )
{
switch( this.type )
{
case BLOCK:
return this.getUnlocalizedName() + ".Block";
case BRICK:
return this.getUnlocalizedName() + ".Brick";
case SMALL_BRICK:
return this.getUnlocalizedName() + ".SmallBrick";
default:
return this.getUnlocalizedName();
}
}
public enum SkystoneType
{
STONE, BLOCK, BRICK, SMALL_BRICK
src/main/java/appeng/items/materials/ItemMultiItem.java
+1 -1
View File
@@ -253,7 +253,7 @@ public final class ItemMultiItem extends AEBaseItem implements IStorageComponent
@Override
public String getUnlocalizedName( final ItemStack is )
{
return "item.appliedenergistics2." + this.nameOf( is );
return "item.appliedenergistics2.multi_material." + this.nameOf( is );
}
@Override
src/main/java/appeng/items/parts/ItemMultiPart.java
+2 -11
View File
@@ -178,7 +178,8 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
@Override
public String getUnlocalizedName( final ItemStack is )
{
return "item.appliedenergistics2." + this.getName( is );
Preconditions.checkNotNull( is );
return "item.appliedenergistics2.multi_part." + getTypeByStack( is ).getUnlocalizedName();
}
@Override
@@ -218,16 +219,6 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG
}
}
private String getName( final ItemStack is )
{
Preconditions.checkNotNull( is );
final PartType stackType = this.getTypeByStack( is );
final String typeName = stackType.name();
return typeName;
}
@Nonnull
public PartType getTypeByStack( final ItemStack is )
{
src/main/java/appeng/items/parts/PartType.java
+39 -5
View File
@@ -183,13 +183,37 @@ public enum PartType
Interface( 440, "interface" , EnumSet.of( AEFeature.Core ), EnumSet.noneOf( IntegrationType.class ), PartInterface.class ),
P2PTunnelME( 460, "p2p_tunnel_me" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ),
P2PTunnelME( 460, "p2p_tunnel_me" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelME ), EnumSet.noneOf( IntegrationType.class ), PartP2PTunnelME.class, GuiText.METunnel ) {
@Override
String getUnlocalizedName()
{
return "P2PTunnel";
}
},
P2PTunnelRedstone( 461, "p2p_tunnel_redstone" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ),
P2PTunnelRedstone( 461, "p2p_tunnel_redstone" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRedstone ), EnumSet.noneOf( IntegrationType.class ), PartP2PRedstone.class, GuiText.RedstoneTunnel ) {
@Override
String getUnlocalizedName()
{
return "P2PTunnel";
}
},
P2PTunnelItems( 462, "p2p_tunnel_items" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ),
P2PTunnelItems( 462, "p2p_tunnel_items" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelItems ), EnumSet.noneOf( IntegrationType.class ), PartP2PItems.class, GuiText.ItemTunnel ) {
@Override
String getUnlocalizedName()
{
return "P2PTunnel";
}
},
P2PTunnelLiquids( 463, "p2p_tunnel_liquids" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ),
P2PTunnelLiquids( 463, "p2p_tunnel_liquids" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLiquids ), EnumSet.noneOf( IntegrationType.class ), PartP2PLiquids.class, GuiText.FluidTunnel ) {
@Override
String getUnlocalizedName()
{
return "P2PTunnel";
}
},
// P2PTunnelEU( 465, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelEU ), EnumSet.of( IntegrationType.IC2 ),
// PartP2PIC2Power.class, GuiText.EUTunnel ),
@@ -197,7 +221,13 @@ public enum PartType
// P2PTunnelRF( 466, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelRF ), EnumSet.of( IntegrationType.RF ),
// PartP2PRFPower.class, GuiText.RFTunnel ),
P2PTunnelLight( 467, "p2p_tunnel_light" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ),
P2PTunnelLight( 467, "p2p_tunnel_light" , EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelLight ), EnumSet.noneOf( IntegrationType.class ), PartP2PLight.class, GuiText.LightTunnel ) {
@Override
String getUnlocalizedName()
{
return "P2PTunnel";
}
},
// P2PTunnelOpenComputers( 468, EnumSet.of( AEFeature.P2PTunnel, AEFeature.P2PTunnelOpenComputers ), EnumSet.of(
// IntegrationType.OpenComputers ), PartP2POpenComputers.class, GuiText.OCTunnel ),
@@ -274,6 +304,10 @@ public enum PartType
return this.myPart;
}
String getUnlocalizedName() {
return name();
}
GuiText getExtraName()
{
return this.extraName;