Fix thermal generator texture and adjust nanosaber speed

This commit is contained in:
TheDoctorSoda 2016-03-07 20:47:40 -08:00
parent b0fda3c4da
commit 29c43ddd99
3 changed files with 10 additions and 9 deletions

View file

@ -43,17 +43,17 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return isActive ? prefix + "thermal_generator_side_on" : prefix + "matter_fabricator_off"; return isActive ? prefix + "thermal_generator_side_on" : prefix + "thermal_generator_side_off";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return isActive ? prefix + "thermal_generator_side_on" : prefix + "matter_fabricator_off"; return isActive ? prefix + "thermal_generator_side_on" : prefix + "thermal_generator_side_off";
} }
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return isActive ? prefix + "thermal_generator_top_on" : prefix + "matter_fabricator_off"; return isActive ? prefix + "thermal_generator_top_on" : prefix + "thermal_generator_top_off";
} }
@Override @Override

View file

@ -54,13 +54,14 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITextur
@Override @Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if(stack.getItemDamage()==0){ ItemStack newStack = stack.copy();
stack.setItemDamage(1); if(newStack.getItemDamage()==0){
newStack.setItemDamage(1);
} }
if(stack.getItemDamage()==1){ if(newStack.getItemDamage()==1){
stack.setItemDamage(0); newStack.setItemDamage(0);
} }
return stack; return newStack;
} }
@Override @Override

View file

@ -1,5 +1,5 @@
{ {
"animation":{ "animation":{
"frametime":4 "frametime":2
} }
} }