Merge pull request #352 from ProfessorProspector/1.8.9
Fixed mining speeds, machine sides, rubber plank recipe, lang update, and wrench textures
This commit is contained in:
commit
a41e787ced
11 changed files with 19 additions and 9 deletions
|
@ -52,7 +52,7 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
|
|||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "diesel_generator_top_off";
|
||||
return prefix + "machine_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -51,11 +51,11 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur
|
|||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "machine_side";
|
||||
return prefix + "machine_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + "machine_side";
|
||||
return prefix + "machine_bottom";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,12 +36,12 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture
|
|||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
return prefix + "machine_side";
|
||||
return prefix + "extractor_front_off";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOn() {
|
||||
return prefix + "machine_side";
|
||||
return prefix + "extractor_front_on";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -51,11 +51,11 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture
|
|||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + "machine_side";
|
||||
return prefix + "machine_top";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + "machine_side";
|
||||
return prefix + "machine_bottom";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -297,6 +297,8 @@ public class
|
|||
|
||||
}
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog);
|
||||
|
||||
for (String name : ItemDustsSmall.types) {
|
||||
GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name));
|
||||
GameRegistry.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name));
|
||||
|
|
|
@ -49,7 +49,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured
|
|||
|
||||
@Override
|
||||
public boolean canHarvestBlock(Block block, ItemStack stack) {
|
||||
return Items.iron_pickaxe.canHarvestBlock(block, stack) || Items.iron_pickaxe.canHarvestBlock(block, stack);
|
||||
return Items.iron_pickaxe.canHarvestBlock(block, stack) || Items.iron_shovel.canHarvestBlock(block, stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -53,14 +53,17 @@ tile.techreborn.chargebench.name=Charge Bench
|
|||
tile.techreborn.playerDetector.all.name=Player Detector (All)
|
||||
tile.techreborn.playerDetector.others.name=Player Detector (Others)
|
||||
tile.techreborn.playerDetector.you.name=Player Detector (You)
|
||||
tile.techreborn.generator.name=Generator
|
||||
tile.techreborn.extractor.name=Extractor
|
||||
tile.techreborn.grinder.name=Grinder
|
||||
tile.techreborn.compressor.name=Compressor
|
||||
tile.techreborn.electricfurnace.name=Electric Furnace
|
||||
tile.techreborn.machineFrame.advancedMachine.name=Advanced Machine Block
|
||||
tile.techreborn.machineFrame.machine.name=Machine Block
|
||||
|
||||
#Blocks
|
||||
tile.techreborn.rubberlog.name=Rubber log
|
||||
tile.techreborn.rubberlog.name=Rubber Wood
|
||||
tile.techreborn.rubberplank.name=Rubber Wood Planks
|
||||
tile.techreborn.rubberleaves.name=Rubber Leaves
|
||||
tile.techreborn.rubbersapling.name=Rubber Sapling
|
||||
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 666 B |
Binary file not shown.
After Width: | Height: | Size: 1.2 KiB |
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"animation":{
|
||||
"frametime":2
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 362 B |
Binary file not shown.
After Width: | Height: | Size: 492 B |
Loading…
Add table
Reference in a new issue