maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2

Browse source
This commit is contained in:
modmuss50 2016-09-06 22:16:29 +01:00
commit aefe9f6a36
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/techreborn/init/ModRecipes.java
View file

@ -445,16 +445,18 @@ public class ModRecipes
ItemStack oreStack = getDictOreOrNull(oreDictionaryName, 1);
String[] data = getDictData(oreDictionaryName);
//High-level ores shouldn't grind here
if(data[0].equals("ore") && (
data[1].equals("tungsten") ||
data[1].equals("titanium") ||
data[1].equals("aluminium") ||
data[1].equals("iridium")))
data[1].equals("iridium") ||
data[1].equals("saltpeter")) ||
oreStack == null)
continue;
boolean ore = data[0].equals("ore");
Core.logHelper.info("Ore: " + data[1]);
ItemStack dust = getDictOreOrNull(joinDictName("dust", data[1]), ore ? 2 : 1);
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
}
@ -2046,7 +2048,7 @@ public class ModRecipes
ItemCells.getCellByName("nitrogen"), ItemCells.getCellByName("carbon"), null, null, 80, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("pyrite", 3), null,
ItemDusts.getDustByName("iron"), ItemDusts.getDustByName("sulfur"), null, null, 120, 128));
ItemDusts.getDustByName("iron"), ItemDusts.getDustByName("sulfur", 2), null, null, 120, 128));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("sphalerite", 2), null,
ItemDusts.getDustByName("zinc"), ItemDusts.getDustByName("sulfur"), null, null, 150, 100));
@ -3228,13 +3230,13 @@ public class ModRecipes
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("empty", 3), 400, 90));
RecipeHandler.addRecipe(
new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("ruby", 6), ItemCells.getCellByName("empty"),
new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("ruby", 9), ItemCells.getCellByName("empty"),
ItemDusts.getDustByName("aluminum", 2), ItemCells.getCellByName("empty", 1),
ItemDusts.getDustByName("chrome", 1), null, 140, 90));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("sapphire", 5),
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("sapphire", 8),
ItemCells.getCellByName("empty"), ItemDusts.getDustByName("aluminum", 2),
ItemCells.getCellByName("empty", 5), null, null, 100, 60));
ItemCells.getCellByName("empty"), null, null, 100, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sodiumSulfide", 2), null,
ItemCells.getCellByName("sodium", 1), ItemDusts.getDustByName("sulfur", 1), null,
@ -3242,7 +3244,7 @@ public class ModRecipes
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("peridot", 5),
ItemCells.getCellByName("empty"), ItemDusts.getDustByName("aluminum", 2),
ItemCells.getCellByName("empty", 5), null, null, 100, 60));
ItemCells.getCellByName("empty"), null, null, 100, 60));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("emerald", 29),
ItemCells.getCellByName("empty", 18), ItemCells.getCellByName("berylium", 3),
@ -3273,13 +3275,13 @@ public class ModRecipes
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("pyrope", 20),
ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),
ItemDusts.getDustByName("magnesium", 3), ItemCells.getCellByName("silicon", 3),
ItemCells.getCellByName("empty", 9), 400, 120));
ItemCells.getCellByName("empty", 6), 400, 120));
ItemStack sand = new ItemStack(Blocks.SAND);
sand.stackSize = 16;
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand, ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("silicon", 1), ItemCells.getCellByName("empty", 2), null, null, 1000, 25));
ItemCells.getCellByName("silicon", 1), ItemCells.getCellByName("empty"), null, null, 1000, 25));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("almandine", 20),
ItemCells.getCellByName("empty", 9), ItemDusts.getDustByName("aluminum", 2),

6
src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java
View file

@ -93,17 +93,17 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
return new int[] {0, 1, 2, 3};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
return index == 0 || index == 1;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
return index == 2 || index == 3;
}
public int getProgressScaled(int scale) {

2
src/main/java/techreborn/tiles/teir1/TileCompressor.java
View file

@ -98,7 +98,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side)
{
return slotIndex == 2;
return slotIndex == 1;
}
public int getProgressScaled(int scale)

2
src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
View file

@ -196,7 +196,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side)
{
return slotIndex == 2;
return slotIndex == 1;
}
@Override

3
src/main/resources/assets/techreborn/lang/zh_CN.lang
View file

@ -25,6 +25,7 @@ tile.techreborn.magicenergyconverter.name=魔法能源转化器
tile.techreborn.dieselgenerator.name=柴油发电机
tile.techreborn.industrialelectrolyzer.name=工业电解器
tile.techreborn.magicenergyabsorber.name=魔法能源吸收器
tile.techreborn.assemblingmachine.name=装配机
tile.techreborn.semifluidgenerator.name=半流质发电机
tile.techreborn.alloyfurnace.name=铁制合金冶炼炉
tile.techreborn.chemicalreactor.name=化学反应器
@ -1014,4 +1015,4 @@ entity.techreborn.nuke.name=核弹
tooltip.wip=未完品，即将到来
tooltip.upBroken=升级插件还没做完!
tooltip.ingredient=目前只完成了一部分
tooltip.ingredient=目前只完成了一部分