Localisation, icon, fixes.
This commit is contained in:
parent
2e8edb281c
commit
83e41478e5
7 changed files with 12 additions and 2 deletions
|
@ -113,6 +113,7 @@ public class MekanismItems
|
||||||
GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade");
|
GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade");
|
||||||
GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade");
|
GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade");
|
||||||
GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade");
|
GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade");
|
||||||
|
GameRegistry.registerItem(GasUpgrade, "GasUpgrade");
|
||||||
GameRegistry.registerItem(Robit, "Robit");
|
GameRegistry.registerItem(Robit, "Robit");
|
||||||
GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler");
|
GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler");
|
||||||
GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy");
|
GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy");
|
||||||
|
|
|
@ -299,7 +299,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||||
|
|
||||||
if(tileEntity instanceof TileEntityFactory)
|
if(tileEntity instanceof TileEntityFactory)
|
||||||
{
|
{
|
||||||
((TileEntityFactory)tileEntity).recipeType = RecipeType.values()[getRecipeType(stack)];
|
RecipeType recipeType = RecipeType.values()[getRecipeType(stack)];
|
||||||
|
((TileEntityFactory)tileEntity).recipeType = recipeType;
|
||||||
|
((TileEntityFactory)tileEntity).upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
|
||||||
world.notifyBlocksOfNeighborChange(x, y, z, tileEntity.getBlockType());
|
world.notifyBlocksOfNeighborChange(x, y, z, tileEntity.getBlockType());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -131,6 +131,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
|
||||||
factory.ejectorComponent.tileEntity = factory;
|
factory.ejectorComponent.tileEntity = factory;
|
||||||
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
||||||
factory.recipeType = type;
|
factory.recipeType = type;
|
||||||
|
factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades());
|
||||||
|
|
||||||
//Advanced Machine
|
//Advanced Machine
|
||||||
factory.gasTank.setGas(gasTank.getGas());
|
factory.gasTank.setGas(gasTank.getGas());
|
||||||
|
|
|
@ -100,7 +100,8 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
|
||||||
factory.ejectorComponent.tileEntity = factory;
|
factory.ejectorComponent.tileEntity = factory;
|
||||||
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
|
||||||
factory.recipeType = type;
|
factory.recipeType = type;
|
||||||
|
factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades());
|
||||||
|
|
||||||
factory.inventory[5] = inventory[0];
|
factory.inventory[5] = inventory[0];
|
||||||
factory.inventory[1] = inventory[1];
|
factory.inventory[1] = inventory[1];
|
||||||
factory.inventory[5+3] = inventory[2];
|
factory.inventory[5+3] = inventory[2];
|
||||||
|
|
|
@ -669,6 +669,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||||
clientActive = dataStream.readBoolean();
|
clientActive = dataStream.readBoolean();
|
||||||
RecipeType oldRecipe = recipeType;
|
RecipeType oldRecipe = recipeType;
|
||||||
recipeType = RecipeType.values()[dataStream.readInt()];
|
recipeType = RecipeType.values()[dataStream.readInt()];
|
||||||
|
upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
|
||||||
|
|
||||||
if(recipeType != oldRecipe)
|
if(recipeType != oldRecipe)
|
||||||
{
|
{
|
||||||
|
@ -716,6 +717,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||||
clientActive = isActive = nbtTags.getBoolean("isActive");
|
clientActive = isActive = nbtTags.getBoolean("isActive");
|
||||||
RecipeType oldRecipe = recipeType;
|
RecipeType oldRecipe = recipeType;
|
||||||
recipeType = RecipeType.values()[nbtTags.getInteger("recipeType")];
|
recipeType = RecipeType.values()[nbtTags.getInteger("recipeType")];
|
||||||
|
upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
|
||||||
|
|
||||||
if(recipeType != oldRecipe)
|
if(recipeType != oldRecipe)
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,6 +11,7 @@ item.EnergyTablet.name=Energy Tablet
|
||||||
item.SpeedUpgrade.name=Speed Upgrade
|
item.SpeedUpgrade.name=Speed Upgrade
|
||||||
item.EnergyUpgrade.name=Energy Upgrade
|
item.EnergyUpgrade.name=Energy Upgrade
|
||||||
item.FilterUpgrade.name=Filter Upgrade
|
item.FilterUpgrade.name=Filter Upgrade
|
||||||
|
item.GasUpgrade.name=Gas Upgrade
|
||||||
item.Robit.name=Robit
|
item.Robit.name=Robit
|
||||||
item.AtomicDisassembler.name=Atomic Disassembler
|
item.AtomicDisassembler.name=Atomic Disassembler
|
||||||
item.ElectricBow.name=Electric Bow
|
item.ElectricBow.name=Electric Bow
|
||||||
|
@ -339,6 +340,8 @@ upgrade.speed=Speed
|
||||||
upgrade.speed.desc=Increases speed of machinery.
|
upgrade.speed.desc=Increases speed of machinery.
|
||||||
upgrade.filter=Filter
|
upgrade.filter=Filter
|
||||||
upgrade.filter.desc=A filter that separates !nheavy water from regular water.
|
upgrade.filter.desc=A filter that separates !nheavy water from regular water.
|
||||||
|
upgrade.gas=Gas
|
||||||
|
upgrade.gas.desc=Increases the efficiency !nof gas-using machinery.
|
||||||
|
|
||||||
//Key description text
|
//Key description text
|
||||||
key.mode=Mode Switch
|
key.mode=Mode Switch
|
||||||
|
|
BIN
src/main/resources/assets/mekanism/textures/items/GasUpgrade.png
Normal file
BIN
src/main/resources/assets/mekanism/textures/items/GasUpgrade.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 613 B |
Loading…
Reference in a new issue